Browse Source

Merge pull request #1600 from pixelfed/frontend-ui-refactor

Frontend ui refactor
daniel 5 years ago
parent
commit
2018234817
2 changed files with 5 additions and 5 deletions
  1. 1 1
      app/Jobs/StatusPipeline/StatusDelete.php
  2. 4 4
      app/Util/ActivityPub/Inbox.php

+ 1 - 1
app/Jobs/StatusPipeline/StatusDelete.php

@@ -104,7 +104,7 @@ class StatusDelete implements ShouldQueue
             Report::whereObjectType('App\Status')
             Report::whereObjectType('App\Status')
                 ->whereObjectId($status->id)
                 ->whereObjectId($status->id)
                 ->delete();
                 ->delete();
-            $status->delete();
+            $status->forceDelete();
         });
         });
 
 
         return true;
         return true;

+ 4 - 4
app/Util/ActivityPub/Inbox.php

@@ -274,10 +274,10 @@ class Inbox
             return;
             return;
         }
         }
 
 
-        $follower = new Follower();
-        $follower->profile_id = $actor->id;
-        $follower->following_id = $target->id;
-        $follower->save();
+        $follower = Follower::firstOrCreate([
+            'profile_id' => $actor->id,
+            'following_id' => $target->id,
+        ]);
         FollowPipeline::dispatch($follower);
         FollowPipeline::dispatch($follower);
 
 
         $request->delete();
         $request->delete();