Procházet zdrojové kódy

Update FollowerController

Daniel Supernault před 5 roky
rodič
revize
dccaa2bd94
1 změnil soubory, kde provedl 7 přidání a 3 odebrání
  1. 7 3
      app/Http/Controllers/FollowerController.php

+ 7 - 3
app/Http/Controllers/FollowerController.php

@@ -83,14 +83,18 @@ class FollowerController extends Controller
             $follower->profile_id = $user->id;
             $follower->profile_id = $user->id;
             $follower->following_id = $target->id;
             $follower->following_id = $target->id;
             $follower->save();
             $follower->save();
-            
+
             if($remote == true && config('federation.activitypub.remoteFollow') == true) {
             if($remote == true && config('federation.activitypub.remoteFollow') == true) {
                 $this->sendFollow($user, $target);
                 $this->sendFollow($user, $target);
             } 
             } 
             FollowPipeline::dispatch($follower);
             FollowPipeline::dispatch($follower);
         } else {
         } else {
-            $follower = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->firstOrFail();
-            if($remote == true) {
+            $request = FollowRequest::whereFollowerId($user->id)->whereFollowingId($target->id)->exists();
+            $follower = Follower::whereProfileId($user->id)->whereFollowingId($target->id)->exists();
+            if($remote == true && $request && !$follower) {
+                $this->sendFollow($user, $target);
+            }
+            if($remote == true && $follower) {
                 $this->sendUndoFollow($user, $target);
                 $this->sendUndoFollow($user, $target);
             }
             }
             $follower->delete();
             $follower->delete();