Merge pull request #4220 from pixelfed/staging

Update FollowPipeline, fix followers_count and following_count counters

app/Http/Controllers/Api/ApiV1Controller.php

@@ -54,6 +54,7 @@ use App\Jobs\SharePipeline\UndoSharePipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
 use App\Jobs\FollowPipeline\FollowPipeline;
+use App\Jobs\FollowPipeline\UnfollowPipeline;
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Jobs\VideoPipeline\{
 	VideoOptimize,
@@ -707,8 +708,7 @@ class ApiV1Controller extends Controller
 			if($remote == true && config('federation.activitypub.remoteFollow') == true) {
 				(new FollowerController())->sendFollow($user->profile, $target);
 			}
-			FollowPipeline::dispatch($follower);
-			$target->increment('followers_count');
+			FollowPipeline::dispatch($follower)->onQueue('high');
 		}
 
 		RelationshipService::refresh($user->profile_id, $target->id);
@@ -769,25 +769,11 @@ class ApiV1Controller extends Controller
 			return $this->json($res);
 		}
 
-		if($user->profile->following_count) {
-			$user->profile->decrement('following_count');
-		}
-
-		FollowRequest::whereFollowerId($user->profile_id)
-			->whereFollowingId($target->id)
-			->delete();
-
 		Follower::whereProfileId($user->profile_id)
 			->whereFollowingId($target->id)
 			->delete();
 
-		if(config('instance.timeline.home.cached')) {
-            Cache::forget('pf:timelines:home:' . $user->profile_id);
-        }
-
-		FollowerService::remove($user->profile_id, $target->id);
-
-		$target->decrement('followers_count');
+		UnfollowPipeline::dispatch($user->profile_id, $target->id)->onQueue('high');
 
 		if($remote == true && config('federation.activitypub.remoteFollow') == true) {
 			(new FollowerController())->sendUndoFollow($user->profile, $target);

app/Jobs/FollowPipeline/FollowPipeline.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs\FollowPipeline;
 
+use App\Follower;
 use App\Notification;
 use Cache;
 use Illuminate\Bus\Queueable;
@@ -11,6 +12,8 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Log;
 use Illuminate\Support\Facades\Redis;
+use App\Services\AccountService;
+use App\Services\FollowerService;
 
 class FollowPipeline implements ShouldQueue
 {
@@ -46,9 +49,45 @@ class FollowPipeline implements ShouldQueue
 		$actor = $follower->actor;
 		$target = $follower->target;
 
+		if(!$actor || !$target) {
+			return;
+		}
+
 		Cache::forget('profile:following:' . $actor->id);
 		Cache::forget('profile:following:' . $target->id);
 
+		FollowerService::add($actor->id, $target->id);
+
+		$actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY . $actor->id);
+		if(!$actorProfileSync) {
+			FollowServiceWarmCache::dispatch($actor->id)->onQueue('low');
+		} else {
+			if($actor->following_count) {
+				$actor->increment('following_count');
+			} else {
+				$count = Follower::whereProfileId($actor->id)->count();
+				$actor->following_count = $count;
+				$actor->save();
+			}
+			Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $actor->id, 1, 604800);
+			AccountService::del($actor->id);
+		}
+
+		$targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY . $target->id);
+		if(!$targetProfileSync) {
+			FollowServiceWarmCache::dispatch($target->id)->onQueue('low');
+		} else {
+			if($target->followers_count) {
+				$target->increment('followers_count');
+			} else {
+				$count = Follower::whereFollowingId($target->id)->count();
+				$target->followers_count = $count;
+				$target->save();
+			}
+			Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $target->id, 1, 604800);
+			AccountService::del($target->id);
+		}
+
 		if($target->domain || !$target->private_key) {
 			return;
 		}

app/Jobs/FollowPipeline/FollowServiceWarmCache.php

@@ -20,8 +20,8 @@ class FollowServiceWarmCache implements ShouldQueue
 
 	public $profileId;
 	public $tries = 5;
-    public $timeout = 300;
-    public $failOnTimeout = true;
+	public $timeout = 5000;
+	public $failOnTimeout = false;
 
 	/**
 	 * Create a new job instance.
@@ -45,8 +45,8 @@ class FollowServiceWarmCache implements ShouldQueue
 		$account = AccountService::get($id, true);
 
 		if(!$account) {
-            Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $id, 1);
-            Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $id, 1);
+			Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $id, 1, 604800);
+			Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $id, 1, 604800);
 			return;
 		}
 
@@ -70,8 +70,8 @@ class FollowServiceWarmCache implements ShouldQueue
 			}
 		});
 
-        Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $id, 1);
-        Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $id, 1);
+		Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $id, 1, 604800);
+		Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $id, 1, 604800);
 
 		$profile = Profile::find($id);
 		if($profile) {

app/Jobs/FollowPipeline/UnfollowPipeline.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Jobs\FollowPipeline;
+
+use App\Follower;
+use App\FollowRequest;
+use App\Notification;
+use App\Profile;
+use Cache;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Log;
+use Illuminate\Support\Facades\Redis;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\NotificationService;
+
+class UnfollowPipeline implements ShouldQueue
+{
+	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+	protected $actor;
+	protected $target;
+
+	/**
+	 * Create a new job instance.
+	 *
+	 * @return void
+	 */
+	public function __construct($actor, $target)
+	{
+		$this->actor = $actor;
+		$this->target = $target;
+	}
+
+	/**
+	 * Execute the job.
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$actor = $this->actor;
+		$target = $this->target;
+
+		$actorProfile = Profile::find($actor);
+		if(!$actorProfile) {
+			return;
+		}
+		$targetProfile = Profile::find($target);
+		if(!$targetProfile) {
+			return;
+		}
+
+		FollowerService::remove($actor, $target);
+
+		$actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY . $actor);
+		if(!$actorProfileSync) {
+			FollowServiceWarmCache::dispatch($actor)->onQueue('low');
+		} else {
+			if($actorProfile->following_count) {
+				$actorProfile->decrement('following_count');
+			} else {
+				$count = Follower::whereProfileId($actor)->count();
+				$actorProfile->following_count = $count;
+				$actorProfile->save();
+			}
+			Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $actor, 1, 604800);
+			AccountService::del($actor);
+		}
+
+		$targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY . $target);
+		if(!$targetProfileSync) {
+			FollowServiceWarmCache::dispatch($target)->onQueue('low');
+		} else {
+			if($targetProfile->followers_count) {
+				$targetProfile->decrement('followers_count');
+			} else {
+				$count = Follower::whereFollowingId($target)->count();
+				$targetProfile->followers_count = $count;
+				$targetProfile->save();
+			}
+			Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $target, 1, 604800);
+			AccountService::del($target);
+		}
+
+		if($targetProfile->domain == null) {
+			Notification::withTrashed()
+				->whereProfileId($target)
+				->whereAction('follow')
+				->whereActorId($actor)
+				->whereItemId($target)
+				->whereItemType('App\Profile')
+				->get()
+				->each(function($n) {
+					NotificationService::del($n->profile_id, $n->id);
+					$n->forceDelete();
+				});
+		}
+
+		if($actorProfile->domain == null && config('instance.timeline.home.cached')) {
+			Cache::forget('pf:timelines:home:' . $actor);
+		}
+
+		FollowRequest::whereFollowingId($target)
+			->whereFollowerId($actor)
+			->delete();
+
+		return;
+	}
+}

app/Services/FollowerService.php

@@ -15,7 +15,6 @@ use App\Jobs\FollowPipeline\FollowServiceWarmCache;
 class FollowerService
 {
 	const CACHE_KEY = 'pf:services:followers:';
-	const FOLLOWERS_SYNC_ACTIVE = 'pf:services:followers:sync-active:';
 	const FOLLOWERS_SYNC_KEY = 'pf:services:followers:sync-followers:';
 	const FOLLOWING_SYNC_KEY = 'pf:services:followers:sync-following:';
 	const FOLLOWING_KEY = 'pf:services:follow:following:id:';
@@ -106,25 +105,13 @@ class FollowerService
 			if(Cache::get(self::FOLLOWERS_SYNC_KEY . $id) != null) {
 				return;
 			}
-
-			if(Cache::get(self::FOLLOWERS_SYNC_ACTIVE . $id) != null) {
-				return;
-			}
-
 			FollowServiceWarmCache::dispatch($id)->onQueue('low');
-			Cache::put(self::FOLLOWERS_SYNC_ACTIVE . $id, 1, 604800);
 		}
 		if($scope === 'following') {
 			if(Cache::get(self::FOLLOWING_SYNC_KEY . $id) != null) {
 				return;
 			}
-
-			if(Cache::get(self::FOLLOWERS_SYNC_ACTIVE . $id) != null) {
-				return;
-			}
-
 			FollowServiceWarmCache::dispatch($id)->onQueue('low');
-			Cache::put(self::FOLLOWERS_SYNC_ACTIVE . $id, 1, 604800);
 		}
 		return;
 	}
@@ -220,6 +207,5 @@ class FollowerService
 		Redis::del(self::FOLLOWERS_KEY . $id);
 		Cache::forget(self::FOLLOWERS_SYNC_KEY . $id);
 		Cache::forget(self::FOLLOWING_SYNC_KEY . $id);
-		Cache::forget(self::FOLLOWERS_SYNC_ACTIVE . $id);
 	}
 }