Update StatusHashtagService, remove problemaatic cache layer

pixelfed · Nov 16, 2023 · e5401f8 · e5401f8
1 parent 33a60e7
commit e5401f8
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php
@@ -84,18 +84,14 @@ public static function getStatus($statusId, $hashtagId)
 
 	public static function statusTags($statusId)
 	{
-		$key = 'pf:services:sh:id:' . $statusId;
-
-		return Cache::remember($key, 604800, function() use($statusId) {
-			$status = Status::find($statusId);
-			if(!$status) {
-				return [];
-			}
+		$status = Status::with('hashtags')->find($statusId);
+		if(!$status) {
+			return [];
+		}
 
-			$fractal = new Fractal\Manager();
-			$fractal->setSerializer(new ArraySerializer());
-			$resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer());
-			return $fractal->createData($resource)->toArray();
-		});
+		$fractal = new Fractal\Manager();
+		$fractal->setSerializer(new ArraySerializer());
+		$resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer());
+		return $fractal->createData($resource)->toArray();
 	}
 }