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

Merge pull request #4656 from pixelfed/staging 

Update NotificationService, fix order bug
This commit is contained in:
daniel 2023-09-18 00:25:28 -06:00 committed by GitHub
parent 19015f18b0 0210f8aa2a
commit 5a9a159708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/NotificationService.php
View File

@ -58,6 +58,7 @@ class NotificationService {
$stop = $stop > 400 ? 400 : $stop; $stop = $stop > 400 ? 400 : $stop;
$ids = Notification::where('id', '>', self::getEpochId()) $ids = Notification::where('id', '>', self::getEpochId())
->where('profile_id', $id) ->where('profile_id', $id)
->orderByDesc('id')
->skip($start) ->skip($start)
->take($stop) ->take($stop)
->pluck('id'); ->pluck('id');
@ -281,6 +282,7 @@ class NotificationService {
if(self::count($id) == 0 || $force == true) { if(self::count($id) == 0 || $force == true) {
$ids = Notification::where('profile_id', $id) $ids = Notification::where('profile_id', $id)
->where('id', '>', self::getEpochId()) ->where('id', '>', self::getEpochId())
->orderByDesc('id')
->limit($stop) ->limit($stop)
->pluck('id'); ->pluck('id');
foreach($ids as $key) { foreach($ids as $key) {