浏览代码

Update DeleteAccountPipeline

Daniel Supernault 2 年之前
父节点
当前提交
492b92140a
共有 2 个文件被更改,包括 6 次插入7 次删除
  1. 5 6
      app/Jobs/DeletePipeline/DeleteAccountPipeline.php
  2. 1 1
      app/Services/StatusService.php

+ 5 - 6
app/Jobs/DeletePipeline/DeleteAccountPipeline.php

@@ -78,6 +78,11 @@ class DeleteAccountPipeline implements ShouldQueue
 		$user = $this->user;
         $profile = $user->profile;
 		$id = $user->profile_id;
+		Status::whereProfileId($id)->chunk(50, function($statuses) {
+            foreach($statuses as $status) {
+                StatusDelete::dispatchNow($status);
+            }
+        });
 		$this->deleteUserColumns($user);
 		AccountService::del($user->profile_id);
 
@@ -169,12 +174,6 @@ class DeleteAccountPipeline implements ShouldQueue
 		DB::table('oauth_auth_codes')->whereUserId($user->id)->delete();
 		ProfileSponsor::whereProfileId($id)->delete();
 
-		Status::whereProfileId($id)->chunk(50, function($statuses) {
-            foreach($statuses as $status) {
-                StatusDelete::dispatch($status)->onQueue('high');
-            }
-        });
-
 		Report::whereUserId($user->id)->forceDelete();
 		PublicTimelineService::warmCache(true, 400);
 		Profile::whereUserId($user->id)->delete();

+ 1 - 1
app/Services/StatusService.php

@@ -137,9 +137,9 @@ class StatusService
 
 	public static function del($id, $purge = false)
 	{
-		$status = self::get($id);
 
 		if($purge) {
+			$status = self::get($id);
 			if($status && isset($status['account']) && isset($status['account']['id'])) {
 				Cache::forget('profile:embed:' . $status['account']['id']);
 			}