UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2864 from pixelfed/staging

Browse source 
Update ApiController, fix notification bug
This commit is contained in:
daniel 2021-07-21 02:17:05 -06:00 committed by GitHub
commit 87a6f2cd6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1289,14 +1289,18 @@ class ApiV1Controller extends Controller
if($max) { if($max) {
$res = NotificationService::getMax($pid, $max, $limit); $res = NotificationService::getMax($pid, $max, $limit);
$ids = NotificationService::getRankedMaxId($pid, $max, $limit); $ids = NotificationService::getRankedMaxId($pid, $max, $limit);
if(!empty($ids)) {
$maxId = max($ids); $maxId = max($ids);
$minId = min($ids); $minId = min($ids);
}
} else { } else {
$res = NotificationService::getMin($pid, $min ?? $since, $limit); $res = NotificationService::getMin($pid, $min ?? $since, $limit);
$ids = NotificationService::getRankedMinId($pid, $min ?? $since, $limit); $ids = NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
if(!empty($ids)) {
$maxId = max($ids); $maxId = max($ids);
$minId = min($ids); $minId = min($ids);
} }
}
$baseUrl = config('app.url') . '/api/v1/notifications?'; $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) : []; $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
$textOnlyPosts = Redis::zscore('pf:tl:top', $pid) !== false; $textOnlyPosts = (bool) Redis::zscore('pf:tl:top', $pid);
$textOnlyReplies = Redis::zscore('pf:tl:replies', $pid) !== false; $textOnlyReplies = (bool) Redis::zscore('pf:tl:replies', $pid);
$types = $textOnlyPosts ? $types = $textOnlyPosts ?
['text', 'photo', 'photo:album', 'video', 'video:album', 'photo:video:album'] : ['text', 'photo', 'photo:album', 'video', 'video:album', 'photo:video:album'] :
['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) { if($top) {
Redis::zadd('pf:tl:top', $pid, $pid); Redis::zadd('pf:tl:top', $pid, $pid);
} else { } else {
Redis::zrem('pf:tl:top', $pid, $pid); Redis::zrem('pf:tl:top', $pid);
} }
if($replies) { if($replies) {
Redis::zadd('pf:tl:replies', $pid, $pid); Redis::zadd('pf:tl:replies', $pid, $pid);
} else { } else {
Redis::zrem('pf:tl:replies', $pid, $pid); Redis::zrem('pf:tl:replies', $pid);
} }
return redirect(route('settings.timeline')); return redirect(route('settings.timeline'));
} }