mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 14:31:26 +00:00
Merge branch 'staging' of github.com:mbliznikova/pixelfed into staging
This commit is contained in:
commit
3269481148
3 changed files with 6 additions and 7 deletions
|
@ -1271,7 +1271,7 @@ class ApiV1Controller extends Controller
|
|||
Status::findOrFail($status['id'])->update([
|
||||
'likes_count' => ($status['favourites_count'] ?? 0) + 1
|
||||
]);
|
||||
LikePipeline::dispatch($like);
|
||||
LikePipeline::dispatch($like)->onQueue('feed');
|
||||
}
|
||||
|
||||
$status['favourited'] = true;
|
||||
|
@ -1308,7 +1308,7 @@ class ApiV1Controller extends Controller
|
|||
|
||||
if($like) {
|
||||
$like->forceDelete();
|
||||
$status->likes_count = $status->likes()->count();
|
||||
$status->likes_count = $status->likes_count > 1 ? $status->likes_count - 1 : 0;
|
||||
$status->save();
|
||||
}
|
||||
|
||||
|
|
|
@ -25,8 +25,7 @@ class LikeController extends Controller
|
|||
'item' => 'required|integer|min:1',
|
||||
]);
|
||||
|
||||
// API deprecated
|
||||
return;
|
||||
abort(422, 'Deprecated API Endpoint');
|
||||
|
||||
$user = Auth::user();
|
||||
$profile = $user->profile;
|
||||
|
@ -34,7 +33,7 @@ class LikeController extends Controller
|
|||
|
||||
if (Like::whereStatusId($status->id)->whereProfileId($profile->id)->exists()) {
|
||||
$like = Like::whereProfileId($profile->id)->whereStatusId($status->id)->firstOrFail();
|
||||
UnlikePipeline::dispatch($like);
|
||||
UnlikePipeline::dispatch($like)->onQueue('feed');
|
||||
} else {
|
||||
abort_if(
|
||||
Like::whereProfileId($user->profile_id)
|
||||
|
@ -60,7 +59,7 @@ class LikeController extends Controller
|
|||
]) == false;
|
||||
$like->save();
|
||||
$status->save();
|
||||
LikePipeline::dispatch($like);
|
||||
LikePipeline::dispatch($like)->onQueue('feed');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue
|
|||
$status = $this->status;
|
||||
|
||||
if(AccountService::get($status->profile_id, true)) {
|
||||
DecrementPostCount::dispatch($status->profile_id)->onQueue('feed');
|
||||
DecrementPostCount::dispatch($status->profile_id)->onQueue('low');
|
||||
}
|
||||
|
||||
NetworkTimelineService::del($status->id);
|
||||
|
|
Loading…
Reference in a new issue