mirror
/
pixelfed
kopia lustrzana https://github.com/pixelfed/pixelfed
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update UnfollowPipeline, fix follower count cache bug

pull/5041/head
Daniel Supernault 2024-04-06 03:29:17 -06:00
rodzic 858fcbf606
commit 6bdf73de4d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 23740873EE6F76A1
1 zmienionych plików z 88 dodań i 87 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

43
app/Jobs/FollowPipeline/UnfollowPipeline.php
Wyświetl plik

@ -4,26 +4,25 @@ namespace App\Jobs\FollowPipeline;
use App\Follower; use App\Follower;
use App\FollowRequest; use App\FollowRequest;
use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
use App\Notification; use App\Notification;
use App\Profile; use App\Profile;
use App\Services\AccountService;
use App\Services\FollowerService;
use App\Services\NotificationService;
use Cache; use Cache;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Log;
use Illuminate\Support\Facades\Redis;
use App\Services\AccountService;
use App\Services\FollowerService;
use App\Services\NotificationService;
use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
class UnfollowPipeline implements ShouldQueue class UnfollowPipeline implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $actor; protected $actor;
protected $target; protected $target;
/** /**
@ -48,11 +47,11 @@ class UnfollowPipeline implements ShouldQueue
$target = $this->target; $target = $this->target;
$actorProfile = Profile::find($actor); $actorProfile = Profile::find($actor);
if(!$actorProfile) { if (! $actorProfile) {
return; return;
} }
$targetProfile = Profile::find($target); $targetProfile = Profile::find($target);
if(!$targetProfile) { if (! $targetProfile) {
return; return;
} }
@ -60,37 +59,37 @@ class UnfollowPipeline implements ShouldQueue
FollowerService::remove($actor, $target); FollowerService::remove($actor, $target);
$actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY . $actor); $actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY.$actor);
if(!$actorProfileSync) { if (! $actorProfileSync) {
FollowServiceWarmCache::dispatch($actor)->onQueue('low'); FollowServiceWarmCache::dispatch($actor)->onQueue('low');
} else { } else {
if($actorProfile->following_count) { if ($actorProfile->following_count) {
$actorProfile->decrement('following_count'); $actorProfile->decrement('following_count');
} else { } else {
$count = Follower::whereProfileId($actor)->count(); $count = Follower::whereProfileId($actor)->count();
$actorProfile->following_count = $count; $actorProfile->following_count = $count;
$actorProfile->save(); $actorProfile->save();
} }
Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $actor, 1, 604800); Cache::put(FollowerService::FOLLOWING_SYNC_KEY.$actor, 1, 604800);
AccountService::del($actor); AccountService::del($actor);
} }
$targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY . $target); $targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY.$target);
if(!$targetProfileSync) { if (! $targetProfileSync) {
FollowServiceWarmCache::dispatch($target)->onQueue('low'); FollowServiceWarmCache::dispatch($target)->onQueue('low');
} else { } else {
if($targetProfile->followers_count) { if ($targetProfile->followers_count) {
$targetProfile->decrement('followers_count'); $targetProfile->decrement('followers_count');
} else { } else {
$count = Follower::whereFollowingId($target)->count(); $count = Follower::whereFollowingId($target)->count();
$targetProfile->followers_count = $count; $targetProfile->followers_count = $count;
$targetProfile->save(); $targetProfile->save();
} }
Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $target, 1, 604800); Cache::put(FollowerService::FOLLOWERS_SYNC_KEY.$target, 1, 604800);
AccountService::del($target); AccountService::del($target);
} }
if($targetProfile->domain == null) { if ($targetProfile->domain == null) {
Notification::withTrashed() Notification::withTrashed()
->whereProfileId($target) ->whereProfileId($target)
->whereAction('follow') ->whereAction('follow')
@ -98,20 +97,22 @@ class UnfollowPipeline implements ShouldQueue
->whereItemId($target) ->whereItemId($target)
->whereItemType('App\Profile') ->whereItemType('App\Profile')
->get() ->get()
->each(function($n) { ->each(function ($n) {
NotificationService::del($n->profile_id, $n->id); NotificationService::del($n->profile_id, $n->id);
$n->forceDelete(); $n->forceDelete();
}); });
} }
if($actorProfile->domain == null && config('instance.timeline.home.cached')) { if ($actorProfile->domain == null && config('instance.timeline.home.cached')) {
Cache::forget('pf:timelines:home:' . $actor); Cache::forget('pf:timelines:home:'.$actor);
} }
FollowRequest::whereFollowingId($target) FollowRequest::whereFollowingId($target)
->whereFollowerId($actor) ->whereFollowerId($actor)
->delete(); ->delete();
return; AccountService::del($target);
AccountService::del($actor);
} }
} }