mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1600 from pixelfed/frontend-ui-refactor 

Frontend ui refactor
This commit is contained in:
daniel 2019-08-12 19:29:35 -06:00 committed by GitHub
parent 2fa01c9350 92c2fcaca7
commit 2018234817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/StatusPipeline/StatusDelete.php
View File

@ -104,7 +104,7 @@ class StatusDelete implements ShouldQueue
Report::whereObjectType('App\Status') Report::whereObjectType('App\Status')
->whereObjectId($status->id) ->whereObjectId($status->id)
->delete(); ->delete();
$status->delete(); $status->forceDelete();
}); });
return true; return true;

8
app/Util/ActivityPub/Inbox.php
View File

@ -274,10 +274,10 @@ class Inbox
return; return;
} }
$follower = new Follower(); $follower = Follower::firstOrCreate([
$follower->profile_id = $actor->id; 'profile_id' => $actor->id,
$follower->following_id = $target->id; 'following_id' => $target->id,
$follower->save(); ]);
FollowPipeline::dispatch($follower); FollowPipeline::dispatch($follower);
$request->delete(); $request->delete();