Update ApiV1Controller, filter mute/blocks on statuses/context and st…

…atuses/replies endpoints
pixelfed · Apr 4, 2023 · 73aa01e · 73aa01e
1 parent 988818b
commit 73aa01e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -2501,15 +2501,17 @@ public function statusContext(Request $request, $id)
 		}
 
 		if($status['replies_count']) {
+			$filters = UserFilterService::filters($pid);
+
 			$descendants = DB::table('statuses')
 				->where('in_reply_to_id', $id)
 				->limit(20)
 				->pluck('id')
 				->map(function($sid) {
 					return StatusService::getMastodon($sid, false);
 				})
-				->filter(function($post) {
-					return $post && isset($post['account']);
+				->filter(function($post) use($filters) {
+					return $post && isset($post['account'], $post['account']['id']) && !in_array($post['account']['id'], $filters);
 				})
 				->map(function($status) use($pid) {
 					$status['favourited'] = LikeService::liked($pid, $status['id']);
@@ -3358,7 +3360,11 @@ public function statusReplies(Request $request, $id)
 				->cursorPaginate($limit);
 		}
 
-		$data = $ids->map(function($post) use($pid) {
+		$filters = UserFilterService::filters($pid);
+		$data = $ids->filter(function($post) use($filters) {
+			return !in_array($post->profile_id, $filters);
+		})
+		->map(function($post) use($pid) {
 			$status = StatusService::get($post->id, false);
 
 			if(!$status || !isset($status['id'])) {