UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-30 10:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3136 from pixelfed/staging

Browse source 
Update CommentPipeline
This commit is contained in:
daniel 2022-01-08 05:02:26 -07:00 committed by GitHub
commit 94df59ed1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -2516,7 +2516,7 @@ class ApiV1Controller extends Controller
$sortBy = $request->input('sort', 'all'); $sortBy = $request->input('sort', 'all');
if($sortBy == 'all' && !$request->has('cursor')) { if($sortBy == 'all' && !$request->has('cursor')) {
$ids = Cache::remember('status:replies:all:' . $id, 900, function() use($id) { $ids = Cache::remember('status:replies:all:' . $id, 86400, function() use($id) {
return DB::table('statuses') return DB::table('statuses')
->where('in_reply_to_id', $id) ->where('in_reply_to_id', $id)
->orderBy('id') ->orderBy('id')

2
app/Http/Controllers/PublicApiController.php
View file

@ -691,7 +691,7 @@ class PublicApiController extends Controller
public function accountFollowing(Request $request, $id) public function accountFollowing(Request $request, $id)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$account = AccountService::get($id); $account = AccountService::get($id);
abort_if(!$account, 404); abort_if(!$account, 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;

9
app/Jobs/CommentPipeline/CommentPipeline.php
View file

@ -93,5 +93,14 @@ class CommentPipeline implements ShouldQueue
NotificationService::set($notification->profile_id, $notification->id); NotificationService::set($notification->profile_id, $notification->id);
StatusService::del($comment->id); StatusService::del($comment->id);
}); });
if($exists = Cache::get('status:replies:all:' . $status->id)) {
if($exists && $exists->count() == 3) {
} else {
Cache::forget('status:replies:all:' . $status->id);
}
} else {
Cache::forget('status:replies:all:' . $status->id);
}
} }
} }