Merge pull request #2817 from pixelfed/staging

Staging

app/Services/LikeService.php

@@ -62,8 +62,16 @@ class LikeService {
 		if(!$status->likes_count) {
 			return $empty;
 		}
+		$user = request()->user();
 
-		$like = Like::whereStatusId($status->id)->first();
+		if($user) {
+			$like = Like::whereStatusId($status->id)
+			->where('profile_id', '!=', $user->profile_id)
+			->first();
+		} else {
+			$like = Like::whereStatusId($status->id)
+			->first();
+		}
 
 		if(!$like) {
 			return $empty;

app/Util/ActivityPub/Inbox.php

@@ -435,9 +435,14 @@ class Inbox
 		if(!$actor || !$target) {
 			return;
 		}
+
 		$actor = Helpers::profileFetch($actor);
 		$target = Helpers::profileFetch($target);
 
+		if(!$actor || !$target) {
+			return;
+		}
+
 		$request = FollowRequest::whereFollowerId($actor->id)
 			->whereFollowingId($target->id)
 			->whereIsRejected(false)