chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update DeleteAccountPipeline job, add db transactions to prevent race conditions

This commit is contained in:
Daniel Supernault 2018-12-20 23:15:20 -07:00
parent 51c3be37d3
commit 868a83cb65
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 63 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
app/Jobs/DeletePipeline/DeleteAccountPipeline.php
View File

@ -7,6 +7,7 @@ use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use DB;
use App\{ use App\{
AccountLog, AccountLog,
Activity, Activity,
@ -57,27 +58,7 @@ class DeleteAccountPipeline implements ShouldQueue
public function handle() public function handle()
{ {
$user = $this->user; $user = $this->user;
$this->deleteAccountLogs($user); DB::transaction(function() use ($user) {
$this->deleteActivities($user);
$this->deleteAvatar($user);
$this->deleteBookmarks($user);
$this->deleteEmailVerification($user);
$this->deleteFollowRequests($user);
$this->deleteFollowers($user);
$this->deleteLikes($user);
$this->deleteMedia($user);
$this->deleteMentions($user);
$this->deleteNotifications($user);
$this->deleteStatuses($user);
$this->deleteReports($user);
$this->deleteProfile($user);
$this->deleteUser($user);
// TODO: send Delete to every known instance sharedInbox
}
public function deleteAccountLogs($user)
{
AccountLog::chunk(200, function($logs) use ($user) { AccountLog::chunk(200, function($logs) use ($user) {
foreach($logs as $log) { foreach($logs as $log) {
if($log->user_id == $user->id) { if($log->user_id == $user->id) {
@ -85,15 +66,8 @@ class DeleteAccountPipeline implements ShouldQueue
} }
} }
}); });
}
public function deleteActivities($user) if($user->profile) {
{
// deprecated, removed inbox activity logger
}
public function deleteAvatar($user)
{
$avatar = $user->profile->avatar; $avatar = $user->profile->avatar;
if(is_file($avatar->media_path)) { if(is_file($avatar->media_path)) {
@ -103,40 +77,20 @@ class DeleteAccountPipeline implements ShouldQueue
if(is_file($avatar->thumb_path)) { if(is_file($avatar->thumb_path)) {
unlink($avatar->thumb_path); unlink($avatar->thumb_path);
} }
$avatar->forceDelete(); $avatar->forceDelete();
} }
public function deleteBookmarks($user)
{
Bookmark::whereProfileId($user->profile->id)->forceDelete(); Bookmark::whereProfileId($user->profile->id)->forceDelete();
}
public function deleteEmailVerification($user)
{
EmailVerification::whereUserId($user->id)->forceDelete(); EmailVerification::whereUserId($user->id)->forceDelete();
}
public function deleteFollowRequests($user)
{
$id = $user->profile->id; $id = $user->profile->id;
FollowRequest::whereFollowingId($id)->orWhere('follower_id', $id)->forceDelete(); FollowRequest::whereFollowingId($id)->orWhere('follower_id', $id)->forceDelete();
}
public function deleteFollowers($user)
{
$id = $user->profile->id;
Follower::whereProfileId($id)->orWhere('following_id', $id)->forceDelete(); Follower::whereProfileId($id)->orWhere('following_id', $id)->forceDelete();
}
public function deleteLikes($user)
{
$id = $user->profile->id;
Like::whereProfileId($id)->forceDelete(); Like::whereProfileId($id)->forceDelete();
}
public function deleteMedia($user)
{
$medias = Media::whereUserId($user->id)->get(); $medias = Media::whereUserId($user->id)->get();
foreach($medias as $media) { foreach($medias as $media) {
$path = $media->media_path; $path = $media->media_path;
@ -149,34 +103,31 @@ class DeleteAccountPipeline implements ShouldQueue
} }
$media->forceDelete(); $media->forceDelete();
} }
}
public function deleteMentions($user)
{
Mention::whereProfileId($user->profile->id)->forceDelete(); Mention::whereProfileId($user->profile->id)->forceDelete();
}
public function deleteNotifications($user)
{
$id = $user->profile->id;
Notification::whereProfileId($id)->orWhere('actor_id', $id)->forceDelete(); Notification::whereProfileId($id)->orWhere('actor_id', $id)->forceDelete();
}
public function deleteStatuses($user) {
Status::whereProfileId($user->profile->id)->forceDelete(); Status::whereProfileId($user->profile->id)->forceDelete();
Report::whereUserId($user->id)->forceDelete();
$this->deleteProfile($user);
});
} }
public function deleteProfile($user) { public function deleteProfile($user) {
DB::transaction(function() use ($user) {
Profile::whereUserId($user->id)->delete(); Profile::whereUserId($user->id)->delete();
} $this->deleteUser($user);
});
public function deleteReports($user) {
Report::whereUserId($user->id)->forceDelete();
} }
public function deleteUser($user) { public function deleteUser($user) {
UserFilter::find($user->id)->forceDelete();
UserSetting::find($user->id)->forceDelete(); DB::transaction(function() use ($user) {
User::find($user->id)->forceDelete(); UserFilter::whereUserId($user->id)->forceDelete();
UserSetting::whereUserId($user->id)->forceDelete();
$user->forceDelete();
});
} }
} }