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

Update ApiController, fix notification bug

This commit is contained in:
Daniel Supernault 2021-07-21 02:16:20 -06:00
parent aa5b090af8
commit f39f32c866
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -1289,13 +1289,17 @@ class ApiV1Controller extends Controller
if($max) {
$res = NotificationService::getMax($pid, $max, $limit);
$ids = NotificationService::getRankedMaxId($pid, $max, $limit);
$maxId = max($ids);
$minId = min($ids);
if(!empty($ids)) {
$maxId = max($ids);
$minId = min($ids);
}
} else {
$res = NotificationService::getMin($pid, $min ?? $since, $limit);
$ids = NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
$maxId = max($ids);
$minId = min($ids);
if(!empty($ids)) {
$maxId = max($ids);
$minId = min($ids);
}
}
$baseUrl = config('app.url') . '/api/v1/notifications?';

4
app/Http/Controllers/PublicApiController.php
View File

@ -402,8 +402,8 @@ class PublicApiController extends Controller
}
$filtered = $user ? UserFilterService::filters($user->profile_id) : [];
$textOnlyPosts = Redis::zscore('pf:tl:top', $pid) !== false;
$textOnlyReplies = Redis::zscore('pf:tl:replies', $pid) !== false;
$textOnlyPosts = (bool) Redis::zscore('pf:tl:top', $pid);
$textOnlyReplies = (bool) Redis::zscore('pf:tl:replies', $pid);
$types = $textOnlyPosts ?
['text', 'photo', 'photo:album', 'video', 'video:album', 'photo:video:album'] :
['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];

4
app/Http/Controllers/SettingsController.php
View File

@ -241,13 +241,13 @@ class SettingsController extends Controller
if($top) {
Redis::zadd('pf:tl:top', $pid, $pid);
} else {
Redis::zrem('pf:tl:top', $pid, $pid);
Redis::zrem('pf:tl:top', $pid);
}
if($replies) {
Redis::zadd('pf:tl:replies', $pid, $pid);
} else {
Redis::zrem('pf:tl:replies', $pid, $pid);
Redis::zrem('pf:tl:replies', $pid);
}
return redirect(route('settings.timeline'));
}