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

Update LikeService, improve caching logic and add profile id to likedBy method to fix #3271

Browse source
This commit is contained in:
Daniel Supernault 2022-02-26 22:41:57 -07:00
parent d06f513b36
commit 6af842eb3e
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/Services/LikeService.php
View file

@ -14,22 +14,23 @@ class LikeService {
public static function add($profileId, $statusId) public static function add($profileId, $statusId)
{ {
$key = self::CACHE_KEY . $profileId . ':' . $statusId; $key = self::CACHE_KEY . $profileId . ':' . $statusId;
$ttl = now()->addHours(2); Cache::increment('pf:services:likes:count:'.$statusId);
return Cache::put($key, true, $ttl); Cache::forget('pf:services:likes:liked_by:'.$statusId);
return Cache::put($key, true, 86400);
} }
public static function remove($profileId, $statusId) public static function remove($profileId, $statusId)
{ {
$key = self::CACHE_KEY . $profileId . ':' . $statusId; $key = self::CACHE_KEY . $profileId . ':' . $statusId;
$ttl = now()->addHours(2); Cache::decrement('pf:services:likes:count:'.$statusId);
return Cache::put($key, false, $ttl); Cache::forget('pf:services:likes:liked_by:'.$statusId);
return Cache::put($key, false, 86400);
} }
public static function liked($profileId, $statusId) public static function liked($profileId, $statusId)
{ {
$key = self::CACHE_KEY . $profileId . ':' . $statusId; $key = self::CACHE_KEY . $profileId . ':' . $statusId;
$ttl = now()->addMinutes(30); return Cache::remember($key, 86400, function() use($profileId, $statusId) {
return Cache::remember($key, $ttl, function() use($profileId, $statusId) {
return Like::whereProfileId($profileId)->whereStatusId($statusId)->exists(); return Like::whereProfileId($profileId)->whereStatusId($statusId)->exists();
}); });
} }
@ -45,44 +46,36 @@ class LikeService {
return $empty; return $empty;
} }
if(!$status->likes_count) { $res = Cache::remember('pf:services:likes:liked_by:' . $status->id, 86400, function() use($status, $empty) {
return $empty; $like = Like::whereStatusId($status->id)->first();
}
$user = request()->user();
if($user) {
$like = Like::whereStatusId($status->id)
->where('profile_id', '!=', $user->profile_id)
->first();
} else {
$like = Like::whereStatusId($status->id)
->first();
}
if(!$like) { if(!$like) {
return $empty; return $empty;
} }
$id = $like->profile_id; $id = $like->profile_id;
$profile = ProfileService::get($id); $profile = ProfileService::get($id);
$profileUrl = $profile['local'] ? $profile['url'] : '/i/web/profile/_/' . $profile['id']; $profileUrl = "/i/web/profile/{$profile['id']}";
$res = [ $res = [
'id' => (string) $profile['id'],
'username' => $profile['username'], 'username' => $profile['username'],
'url' => $profileUrl, 'url' => $profileUrl,
'others' => $status->likes_count >= 3, 'others' => $status->likes_count >= 3,
]; ];
return $res;
});
if(!isset($res['id']) || !isset($res['url'])) {
return $empty;
}
if(request()->user() && request()->user()->profile_id == $status->profile_id) {
$res['total_count'] = ($status->likes_count - 1); $res['total_count'] = ($status->likes_count - 1);
$res['total_count_pretty'] = number_format($res['total_count']); $res['total_count_pretty'] = number_format($res['total_count']);
}
return $res; return $res;
} }
public static function count($id) public static function count($id)
{ {
return Like::whereStatusId($id)->count(); return Cache::get('pf:services:likes:count:'.$id, 0);
} }
} }