1
0

2 Ревизии 8863523576 ... 0f41bb5132

Автор SHA1 Съобщение Дата
  gpt-engineer-app[bot] 0f41bb5132 Fix deactivate feeds filter преди 3 седмици
  gpt-engineer-app[bot] cde7c17942 Changes преди 3 седмици
променени са 3 файла, в които са добавени 19 реда и са изтрити 17 реда
  1. 15 10
      src/hooks/useRealArticles.tsx
  2. 3 6
      src/integrations/supabase/types.ts
  3. 1 1
      src/pages/Index.tsx

+ 15 - 10
src/hooks/useRealArticles.tsx

@@ -62,13 +62,14 @@ export function useRealArticles(dateFilter?: 'today' | 'yesterday' | null, showF
           .from('articles')
           .select(`
             *,
-            feeds!inner(name, category),
+            feeds!inner(name, category, status),
             user_articles!inner(is_read, is_pinned)
           `)
           .in('feed_id', followedFeedIds)
           .eq('user_articles.user_id', user.id)
           .eq('user_articles.is_pinned', true)
-          .eq('user_articles.is_read', false);
+          .eq('user_articles.is_read', false)
+          .eq('feeds.status', 'active');
 
         const { data: pinnedArticles, error: pinnedError } = await pinnedQuery
           .order('published_at', { ascending: false })
@@ -87,21 +88,23 @@ export function useRealArticles(dateFilter?: 'today' | 'yesterday' | null, showF
             .from('articles')
             .select(`
               *,
-              feeds!inner(name, category),
+              feeds!inner(name, category, status),
               user_articles!left(is_read, is_pinned)
             `)
             .in('feed_id', followedFeedIds)
-            .or(`user_articles.is.null,user_articles.is_read.eq.false`);
+            .or(`user_articles.is.null,user_articles.is_read.eq.false`)
+            .eq('feeds.status', 'active');
         } else {
           // Include all articles (read and unread)
           regularQuery = supabase
             .from('articles')
             .select(`
               *,
-              feeds!inner(name, category),
+              feeds!inner(name, category, status),
               user_articles(is_read, is_pinned)
             `)
-            .in('feed_id', followedFeedIds);
+            .in('feed_id', followedFeedIds)
+            .eq('feeds.status', 'active');
         }
         
         // Apply date filter to regular articles only
@@ -165,11 +168,12 @@ export function useRealArticles(dateFilter?: 'today' | 'yesterday' | null, showF
             .from('articles')
             .select(`
               *,
-              feeds!inner(name, category),
+              feeds!inner(name, category, status),
               user_articles!inner(is_read, is_pinned)
             `)
             .eq('user_articles.user_id', user.id)
-            .eq('user_articles.is_pinned', true);
+            .eq('user_articles.is_pinned', true)
+            .eq('feeds.status', 'active');
 
           const { data: pinnedData, error: pinnedError } = await pinnedQuery
             .order('published_at', { ascending: false })
@@ -187,9 +191,10 @@ export function useRealArticles(dateFilter?: 'today' | 'yesterday' | null, showF
           .from('articles')
           .select(`
             *,
-            feeds!inner(name, category),
+            feeds!inner(name, category, status),
             user_articles(is_read, is_pinned)
-          `);
+          `)
+          .eq('feeds.status', 'active');
         
         // Don't apply date filter in "All articles" mode - show everything
         

+ 3 - 6
src/integrations/supabase/types.ts

@@ -211,19 +211,16 @@ export type Database = {
       [_ in never]: never
     }
     Functions: {
-      is_super_user: {
-        Args: { user_email?: string }
-        Returns: boolean
-      }
+      is_super_user: { Args: { user_email?: string }; Returns: boolean }
       purge_old_articles: {
-        Args: Record<PropertyKey, never>
+        Args: never
         Returns: {
           admin_emails: string[]
           deleted_count: number
         }[]
       }
       test_purge_articles: {
-        Args: Record<PropertyKey, never>
+        Args: never
         Returns: {
           articles_to_delete: number
           newest_article_date: string

+ 1 - 1
src/pages/Index.tsx

@@ -22,7 +22,7 @@ const Index = () => {
   } = useAuth();
   const navigate = useNavigate();
   const [dateFilter, setDateFilter] = useState<'today' | 'yesterday' | null>(null);
-  const [showFollowedOnly, setShowFollowedOnly] = useState(false);
+  const [showFollowedOnly, setShowFollowedOnly] = useState(!!user);
   const [showReadArticles, setShowReadArticles] = useState(false);
 
   // Reset date filter when switching to "All articles" mode