Merge pull request #3902 from pixelfed/staging

Update Inbox

app/Util/ActivityPub/Inbox.php

@@ -219,6 +219,7 @@ class Inbox
 			}
 			$this->handleNoteCreate();
 		}
+		return;
 	}
 
 	public function handleNoteReply()
@@ -522,6 +523,8 @@ class Inbox
 			Cache::forget('profile:following_count:'.$target->id);
 			Cache::forget('profile:following_count:'.$actor->id);
 		}
+
+		return;
 	}
 
 	public function handleAnnounceActivity()
@@ -564,8 +567,10 @@ class Inbox
 			'item_type' => 'App\Status'
 		]);
 
-		$parent->reblogs_count = $parent->shares()->count();
+		$parent->reblogs_count = $parent->reblogs_count + 1;
 		$parent->save();
+
+		return;
 	}
 
 	public function handleAcceptActivity()
@@ -608,6 +613,8 @@ class Inbox
 		FollowPipeline::dispatch($follower);
 
 		$request->delete();
+
+		return;
 	}
 
 	public function handleDeleteActivity()
@@ -673,6 +680,7 @@ class Inbox
 					if($story) {
 						StoryExpire::dispatch($story)->onQueue('story');
 					}
+					return;
 					break;
 
 				default:
@@ -680,6 +688,7 @@ class Inbox
 					break;
 			}
 		}
+		return;
 	}
 
 	public function handleLikeActivity()
@@ -711,7 +720,7 @@ class Inbox
 		]);
 
 		if($like->wasRecentlyCreated == true) {
-			$status->likes_count = $status->likes()->count();
+			$status->likes_count = $status->likes_count + 1;
 			$status->save();
 			LikePipeline::dispatch($like);
 		}
@@ -854,6 +863,8 @@ class Inbox
 			$story->view_count++;
 			$story->save();
 		}
+
+		return;
 	}
 
 	public function handleStoryReactionActivity()
@@ -963,6 +974,8 @@ class Inbox
 		$n->message = "{$actorProfile->username} reacted to your story";
 		$n->rendered = "{$actorProfile->username} reacted to your story";
 		$n->save();
+
+		return;
 	}
 
 	public function handleStoryReplyActivity()
@@ -1072,5 +1085,7 @@ class Inbox
 		$n->message = "{$actorProfile->username} commented on story";
 		$n->rendered = "{$actorProfile->username} commented on story";
 		$n->save();
+
+		return;
 	}
 }