Update FeedService

Author: dansup

app/Http/Controllers/Api/AccountController.php

@@ -964,7 +964,6 @@ public function getContentSettings(Request $request)
 
         $res = [
             'hide_ai' => $user->hide_ai,
-            'hide_sensitive' => $user->hide_sensitive,
         ];
 
         return $this->data($res);
@@ -974,13 +973,12 @@ public function updateContentSettings(Request $request)
     {
         $validated = $request->validate([
             'hide_ai' => 'sometimes|boolean',
-            'hide_sensitive' => 'sometimes|boolean',
         ]);
 
         $user = $request->user();
 
         $changes = [
-            'old' => $user->only(['hide_ai', 'hide_sensitive']),
+            'old' => $user->only(['hide_ai']),
             'new' => $validated,
         ];
 

app/Http/Controllers/Api/FeedController.php

@@ -40,27 +40,31 @@ public function selfAccountFeed(Request $request)
 
     public function getForYouFeed(Request $request)
     {
-        if ($request->user()->cannot('viewAny', [Video::class])) {
+        $user = $request->user();
+        if ($user->cannot('viewAny', [Video::class])) {
             return $this->error('Please finish setting up your account', 403);
         }
-        app(UserActivityService::class)->markActive($request->user());
+        app(UserActivityService::class)->markActive($user);
         FeedService::enforcePaginationLimit($request);
-        $feed = FeedService::getVideoFeed($request->user()->profile_id, 5);
+        $hideAi = $user->hide_ai;
+        $feed = FeedService::getVideoFeed($user->profile_id, 5, $hideAi);
 
         return VideoResource::collection($feed);
     }
 
     public function getFollowingFeed(Request $request)
     {
-        if ($request->user()->cannot('viewAny', [Video::class])) {
+        $user = $request->user();
+        if ($user->cannot('viewAny', [Video::class])) {
             return $this->error('Please finish setting up your account', 403);
         }
 
-        app(UserActivityService::class)->markActive($request->user());
+        app(UserActivityService::class)->markActive($user);
 
         FeedService::enforceFollowingPaginationLimit($request);
 
-        $me = $request->user()->profile_id;
+        $me = $user->profile_id;
+        $hideAi = $user->hide_ai;
 
         $feed = Video::query()
             ->published()
@@ -73,6 +77,9 @@ public function getFollowingFeed(Request $request)
                             ->where('followers.profile_id', $me);
                     });
             })
+            ->when($hideAi, function ($query, $hideAi) {
+                $query->where('contains_ai', false);
+            })
             ->orderBy('videos.id', 'desc')
             ->cursorPaginate(5)
             ->withQueryString();

app/Services/FeedService.php

@@ -47,7 +47,7 @@ public static function getAccountFeed($profileId, $limit = 10, $sort = 'Latest',
         return VideoResource::collection($feed);
     }
 
-    public static function getVideoFeed($profileId, $limit = 10)
+    public static function getVideoFeed($profileId, $limit = 10, $hideAi = false)
     {
         $blockedSubquery = UserFilterService::getFilters($profileId);
 
@@ -56,10 +56,12 @@ public static function getVideoFeed($profileId, $limit = 10)
                 $join->on('videos.profile_id', '=', 'blocked.account_id');
             })
             ->whereNull('blocked.account_id')
+            ->when($hideAi, function ($query, $hideAi) {
+                $query->where('contains_ai', false);
+            })
             ->orderBy('videos.id', 'desc')
             ->where('videos.status', 2)
             ->where('is_local', true)
-            ->whereNotNull('videos.vid_optimized')
             ->select('videos.*')
             ->cursorPaginate($limit)
             ->withQueryString();

database/migrations/2026_04_23_091003_add_contains_ai_index_to_videos_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('videos', function (Blueprint $table) {
+            $table->index(
+                ['status', 'is_local', 'contains_ai'],
+                'videos_local_feed_index'
+            );
+
+            $table->index(
+                ['status', 'visibility', 'contains_ai', 'created_at'],
+                'videos_fyp_feed_index'
+            );
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('videos', function (Blueprint $table) {
+            $table->dropIndex('videos_local_feed_index');
+            $table->dropIndex('videos_fyp_feed_index');
+        });
+    }
+};

resources/js/pages/dashboard/account/AccountContent.vue

@@ -26,20 +26,6 @@
                             <ToggleSwitch v-model="hideAI" />
                         </div>
                     </div>
-                    <div class="bg-white rounded-lg shadow-sm dark:bg-gray-800">
-                        <div class="px-4 py-6 flex items-center justify-between">
-                            <div class="flex flex-col max-w-[60%]">
-                                <h3 class="font-medium mb-2 dark:text-gray-300">
-                                    Hide Sensitive Content in feeds
-                                </h3>
-                                <p class="text-xs text-gray-500 font-light">
-                                    Allow sensitive content to be included in feeds, behind a
-                                    content warning.
-                                </p>
-                            </div>
-                            <ToggleSwitch v-model="hideSensitive" />
-                        </div>
-                    </div>
                 </div>
             </section>
         </div>
@@ -53,7 +39,6 @@ import ToggleSwitch from '@/components/Form/ToggleSwitch.vue'
 
 const apiClient = useApiClient()
 const hideAI = ref(false)
-const hideSensitive = ref(false)
 const loaded = ref(false)
 
 watch(
@@ -71,26 +56,10 @@ watch(
     }
 )
 
-watch(
-    () => hideSensitive.value,
-    async (newVal, oldVal) => {
-        if (!loaded.value) {
-            return
-        }
-        if (oldVal === null) return
-        try {
-            await apiClient.post('/api/v1/account/settings/content', {
-                hide_sensitive: newVal
-            })
-        } catch {}
-    }
-)
-
 const fetchContentSettings = async () => {
     try {
         await apiClient.get('/api/v1/account/settings/content').then((res) => {
             hideAI.value = res.data.data.hide_ai
-            hideSensitive.value = res.data.data.hide_sensitive
         })
     } catch {
     } finally {