Update For You Feed, hide blocked creators. Fixes #346

Author: dansup

app/Http/Controllers/Api/AccountController.php

@@ -169,6 +169,10 @@ public function accountBlock(Request $request, $id)
 
         $profile = Profile::findOrFail($id);
 
+        $count = UserFilter::where('profile_id', $pid)->count();
+
+        abort_if($count > 250, 422, 'You cannot block any more accounts');
+
         UserFilter::updateOrCreate([
             'profile_id' => $pid,
             'account_id' => $profile->id,

app/Jobs/UpdateUserInterestsJob.php

@@ -36,7 +36,6 @@ public function handle(): void
         $this->decayInterests($profile);
 
         app(ForYouFeedService::class)->forgetUserInterests($this->profileId);
-        app(ForYouFeedService::class)->forgetHiddenCreators($this->profileId);
     }
 
     private function updateFromLikes(Profile $profile): void

app/Services/ForYouFeedService.php

@@ -62,8 +62,6 @@ private function buildFeedQuery(Profile $profile, ?string $cursor, int $limit):
         $interests = $this->getUserInterests($profile->id);
         $isNewUser = $interests->isEmpty();
 
-        $hiddenCreatorIds = $this->getHiddenCreators($profile->id);
-
         $cursorScore = null;
         $cursorId = null;
         if ($cursor) {
@@ -76,7 +74,6 @@ private function buildFeedQuery(Profile $profile, ?string $cursor, int $limit):
         $personalizedVideos = $this->getPersonalizedVideos(
             $profile,
             $interests,
-            $hiddenCreatorIds,
             $cursorScore,
             $cursorId,
             $isNewUser ? $limit : $personalizedCount
@@ -85,7 +82,6 @@ private function buildFeedQuery(Profile $profile, ?string $cursor, int $limit):
         if ($personalizedVideos->count() < self::MIN_RESULTS || $isNewUser) {
             $popularVideos = $this->getPopularVideos(
                 $profile,
-                $hiddenCreatorIds,
                 $cursorId,
                 $limit - $personalizedVideos->count(),
                 $personalizedVideos->pluck('id')->toArray()
@@ -103,7 +99,6 @@ private function buildFeedQuery(Profile $profile, ?string $cursor, int $limit):
         if (! $isNewUser && $discoveryCount > 0) {
             $discoveryVideos = $this->getDiscoveryVideos(
                 $profile,
-                $hiddenCreatorIds,
                 $personalizedVideos->pluck('id')->toArray(),
                 $discoveryCount
             );
@@ -114,10 +109,17 @@ private function buildFeedQuery(Profile $profile, ?string $cursor, int $limit):
         return $personalizedVideos->take($limit)->values();
     }
 
+    private function applyUserFilters($query, int $profileId)
+    {
+        return $query->leftJoin('user_filters', function ($join) use ($profileId) {
+            $join->on('videos.profile_id', '=', 'user_filters.account_id')
+                ->where('user_filters.profile_id', '=', $profileId);
+        })->whereNull('user_filters.id');
+    }
+
     private function getPersonalizedVideos(
         Profile $profile,
         Collection $interests,
-        array $hiddenCreatorIds,
         ?float $cursorScore,
         ?int $cursorId,
         int $limit
@@ -130,7 +132,6 @@ private function getPersonalizedVideos(
 
         while ($scoredVideos->count() < $limit && $attempts < $maxAttempts) {
             $attempts++;
-
             $batchSize = $limit * $batchMultiplier * $attempts;
 
             $query = Video::query()
@@ -141,13 +142,15 @@ private function getPersonalizedVideos(
                 ->where('videos.status', 2)
                 ->where('videos.visibility', 1)
                 ->where('videos.created_at', '>=', now()->subDays(self::MAX_AGE_DAYS))
-                ->whereNotIn('videos.profile_id', $hiddenCreatorIds)
                 ->orderByDesc('videos.id')
                 ->with([
                     'profile:id,username',
                     'hashtags:hashtags.id,hashtags.name',
                 ]);
 
+            // Apply user filters via join
+            $query = $this->applyUserFilters($query, $profile->id);
+
             if ($lastId !== null) {
                 $query->where('videos.id', '<', $lastId);
             }
@@ -181,7 +184,6 @@ private function getPersonalizedVideos(
 
     private function getPopularVideos(
         Profile $profile,
-        array $hiddenCreatorIds,
         ?int $cursorId,
         int $limit,
         array $alreadyIncludedIds = []
@@ -201,12 +203,14 @@ private function getPopularVideos(
             ->where('videos.visibility', 1)
             ->where('videos.created_at', '>=', now()->subDays(self::MAX_AGE_DAYS))
             ->whereNotIn('videos.id', $alreadyIncludedIds)
-            ->whereNotIn('videos.profile_id', $hiddenCreatorIds)
             ->with([
                 'profile:id,username',
                 'hashtags:hashtags.id,hashtags.name',
             ]);
 
+        // Apply user filters via join
+        $query = $this->applyUserFilters($query, $profile->id);
+
         if ($cursorId) {
             $query->where('videos.id', '<', $cursorId);
         }
@@ -223,11 +227,10 @@ private function getPopularVideos(
 
     private function getDiscoveryVideos(
         Profile $profile,
-        array $hiddenCreatorIds,
         array $alreadyIncludedIds,
         int $limit
     ): Collection {
-        $videos = Video::query()
+        $query = Video::query()
             ->select([
                 'videos.*',
                 DB::raw('RAND() as feed_score'),
@@ -236,15 +239,20 @@ private function getDiscoveryVideos(
             ->where('videos.visibility', 1)
             ->where('videos.created_at', '>=', now()->subDays(self::MAX_AGE_DAYS))
             ->whereNotIn('videos.id', $alreadyIncludedIds)
-            ->whereNotIn('videos.profile_id', $hiddenCreatorIds)
             ->where('videos.likes', '>=', 2)
             ->with([
                 'profile:id,username',
                 'hashtags:hashtags.id,hashtags.name',
-            ])
+            ]);
+
+        // Apply user filters via join
+        $query = $this->applyUserFilters($query, $profile->id);
+
+        $videos = $query
             ->inRandomOrder()
             ->limit($limit)
             ->get();
+
         $videos = app(ImpressionBloomFilterService::class)->filterVideos($profile->id, $videos);
 
         return $videos;
@@ -411,25 +419,6 @@ public function forgetUserInterests(int $profileId): void
         Cache::forget("fyf:user_interests:{$profileId}");
     }
 
-    private function getHiddenCreators(int $profileId): array
-    {
-        return Cache::remember(
-            "fyf:hidden_creators:{$profileId}",
-            now()->addMinutes(30),
-            fn () => FeedFeedback::where('feed_feedback.profile_id', $profileId)
-                ->where('feedback_type', FeedFeedback::TYPE_HIDE_CREATOR)
-                ->join('videos', 'feed_feedback.video_id', '=', 'videos.id')
-                ->pluck('videos.profile_id')
-                ->unique()
-                ->toArray()
-        );
-    }
-
-    public function forgetHiddenCreators(int $profileId): void
-    {
-        Cache::forget("fyf:hidden_creators:{$profileId}");
-    }
-
     private function generateCursor(Collection $videos): ?string
     {
         if ($videos->isEmpty()) {