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

Update StatusHashtagService

Browse source
This commit is contained in:
Daniel Supernault 2019-07-04 20:05:28 -06:00
parent 8a47b03a1b
commit eab5fceb9f
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/Services/StatusHashtagService.php
View file

@ -13,24 +13,18 @@ class StatusHashtagService {
const CACHE_KEY = 'pf:services:status-hashtag:collection:';
public static function get($id, $start = 0, $stop = 100)
public static function get($id, $page = 1, $stop = 9)
{
$res = collect([]);
$key = self::CACHE_KEY . $id;
$stop = $stop > 2000 ? 2000 : $stop;
$ids = Redis::zrevrangebyscore($key, $start, $stop);
if(empty($ids)) {
if(self::count($id) == 0) {
$ids = self::coldGet($id, 0, 2000);
$ids = $ids->splice($start, $stop);
} else {
$ids = self::coldGet($id, $start, $stop);
}
}
foreach($ids as $statusId) {
$res->push(self::getStatus($statusId, $id));
}
return $res;
return StatusHashtag::whereHashtagId($id)
->whereHas('media')
->skip($stop)
->latest()
->take(9)
->pluck('status_id')
->map(function ($i, $k) use ($id) {
return self::getStatus($i, $id);
})
->all();
}
public static function coldGet($id, $start = 0, $stop = 2000)
@ -60,7 +54,11 @@ class StatusHashtagService {
public static function count($id)
{
return Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf');
$count = Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf');
if(empty($count)) {
$count = StatusHashtag::whereHashtagId($id)->count();
}
return $count;
}
public static function getStatus($statusId, $hashtagId)