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

Update ApiV1Controller, fix empty public timeline bug

Browse source
This commit is contained in:
Daniel Supernault 2021-09-07 21:07:20 -06:00
parent 00c32360ae
commit 0584f9ee95
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1486,9 +1486,11 @@ class ApiV1Controller extends Controller
$limit = $request->input('limit') ?? 3; $limit = $request->input('limit') ?? 3;
$user = $request->user(); $user = $request->user();
Cache::remember('api:v1:timelines:public:cache_check', 3600, function() {
if(PublicTimelineService::count() == 0) { if(PublicTimelineService::count() == 0) {
PublicTimelineService::warmCache(true, 400); PublicTimelineService::warmCache(true, 400);
} }
});
if ($max) { if ($max) {
$feed = PublicTimelineService::getRankedMaxId($max, $limit); $feed = PublicTimelineService::getRankedMaxId($max, $limit);

6
app/Services/PublicTimelineService.php
View file

@ -48,11 +48,11 @@ class PublicTimelineService {
public static function add($val) public static function add($val)
{ {
return; if(self::count() > 400) {
if(config('database.redis.client') === 'phpredis') {
if(config('database.redis.client') === 'phpredis' && self::count() > 400) {
Redis::zpopmin(self::CACHE_KEY); Redis::zpopmin(self::CACHE_KEY);
} }
}
return Redis::zadd(self::CACHE_KEY, $val, $val); return Redis::zadd(self::CACHE_KEY, $val, $val);
} }