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

Update StatusHashtagService, use more efficient cached count

Browse source
This commit is contained in:
Daniel Supernault 2024-03-07 02:37:35 -07:00
parent e68fe64ffc
commit 592c84125c
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 78 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/Services/StatusHashtagService.php
View file

@ -2,22 +2,20 @@
namespace App\Services; namespace App\Services;
use Cache; use App\Hashtag;
use Illuminate\Support\Facades\Redis; use App\Status;
use App\{Status, StatusHashtag}; use App\StatusHashtag;
use App\Transformer\Api\StatusHashtagTransformer;
use App\Transformer\Api\HashtagTransformer; use App\Transformer\Api\HashtagTransformer;
use League\Fractal; use League\Fractal;
use League\Fractal\Serializer\ArraySerializer; use League\Fractal\Serializer\ArraySerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
class StatusHashtagService {
class StatusHashtagService
{
const CACHE_KEY = 'pf:services:status-hashtag:collection:'; const CACHE_KEY = 'pf:services:status-hashtag:collection:';
public static function get($id, $page = 1, $stop = 9) public static function get($id, $page = 1, $stop = 9)
{ {
if($page > 20) { if ($page > 20) {
return []; return [];
} }
@ -33,11 +31,11 @@ class StatusHashtagService {
->map(function ($i, $k) use ($id) { ->map(function ($i, $k) use ($id) {
return self::getStatus($i, $id); return self::getStatus($i, $id);
}) })
->filter(function ($i) use($filtered) { ->filter(function ($i) use ($filtered) {
return isset($i['status']) && return isset($i['status']) &&
!empty($i['status']) && !in_array($i['status']['account']['id'], $filtered) && ! empty($i['status']) && ! in_array($i['status']['account']['id'], $filtered) &&
isset($i['status']['media_attachments']) && isset($i['status']['media_attachments']) &&
!empty($i['status']['media_attachments']); ! empty($i['status']['media_attachments']);
}) })
->values(); ->values();
} }
@ -52,9 +50,10 @@ class StatusHashtagService {
->skip($start) ->skip($start)
->take($stop) ->take($stop)
->pluck('status_id'); ->pluck('status_id');
foreach($ids as $key) { foreach ($ids as $key) {
self::set($id, $key); self::set($id, $key);
} }
return $ids; return $ids;
} }
@ -70,11 +69,12 @@ class StatusHashtagService {
public static function count($id) public static function count($id)
{ {
$key = 'pf:services:status-hashtag:count:' . $id; $cc = Hashtag::find($id);
$ttl = now()->addMinutes(5); if (! $cc) {
return Cache::remember($key, $ttl, function() use($id) { return 0;
return StatusHashtag::whereHashtagId($id)->has('media')->count(); }
});
return $cc->cached_count ?? 0;
} }
public static function getStatus($statusId, $hashtagId) public static function getStatus($statusId, $hashtagId)
@ -85,13 +85,14 @@ class StatusHashtagService {
public static function statusTags($statusId) public static function statusTags($statusId)
{ {
$status = Status::with('hashtags')->find($statusId); $status = Status::with('hashtags')->find($statusId);
if(!$status) { if (! $status) {
return []; return [];
} }
$fractal = new Fractal\Manager(); $fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer()); $fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer()); $resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer());
return $fractal->createData($resource)->toArray(); return $fractal->createData($resource)->toArray();
} }
} }