Discover: Add Hiding Feature, fix issues with theming and SQL queries.

packages/api/src/generated/graphql.ts

@@ -918,6 +918,7 @@ export type DiscoverFeedArticle = {
   author?: Maybe<Scalars['String']>;
   description: Scalars['String'];
   feed: Scalars['String'];
+  hidden?: Maybe<Scalars['Boolean']>;
   id: Scalars['ID'];
   image?: Maybe<Scalars['String']>;
   publishedDate?: Maybe<Scalars['Date']>;
@@ -1364,6 +1365,29 @@ export type HiddenHomeSectionSuccess = {
   section?: Maybe<HomeSection>;
 };
 
+export type HideDiscoverArticleError = {
+  __typename?: 'HideDiscoverArticleError';
+  errorCodes: Array<HideDiscoverArticleErrorCode>;
+};
+
+export enum HideDiscoverArticleErrorCode {
+  BadRequest = 'BAD_REQUEST',
+  NotFound = 'NOT_FOUND',
+  Unauthorized = 'UNAUTHORIZED'
+}
+
+export type HideDiscoverArticleInput = {
+  discoverArticleId: Scalars['ID'];
+  setHidden: Scalars['Boolean'];
+};
+
+export type HideDiscoverArticleResult = HideDiscoverArticleError | HideDiscoverArticleSuccess;
+
+export type HideDiscoverArticleSuccess = {
+  __typename?: 'HideDiscoverArticleSuccess';
+  id: Scalars['ID'];
+};
+
 export type Highlight = {
   __typename?: 'Highlight';
   annotation?: Maybe<Scalars['String']>;
@@ -1863,6 +1887,7 @@ export type Mutation = {
   generateApiKey: GenerateApiKeyResult;
   googleLogin: LoginResult;
   googleSignup: GoogleSignupResult;
+  hideDiscoverArticle: HideDiscoverArticleResult;
   importFromIntegration: ImportFromIntegrationResult;
   joinGroup: JoinGroupResult;
   leaveGroup: LeaveGroupResult;
@@ -2063,6 +2088,11 @@ export type MutationGoogleSignupArgs = {
 };
 
 
+export type MutationHideDiscoverArticleArgs = {
+  input: HideDiscoverArticleInput;
+};
+
+
 export type MutationImportFromIntegrationArgs = {
   integrationId: Scalars['ID'];
 };
@@ -2544,6 +2574,7 @@ export type QueryGetDiscoverFeedArticlesArgs = {
   discoverTopicId: Scalars['String'];
   feedId?: InputMaybe<Scalars['ID']>;
   first?: InputMaybe<Scalars['Int']>;
+  showHidden?: InputMaybe<Scalars['Boolean']>;
 };
 
 
@@ -4661,6 +4692,11 @@ export type ResolversTypes = {
   HiddenHomeSectionErrorCode: HiddenHomeSectionErrorCode;
   HiddenHomeSectionResult: ResolversTypes['HiddenHomeSectionError'] | ResolversTypes['HiddenHomeSectionSuccess'];
   HiddenHomeSectionSuccess: ResolverTypeWrapper<HiddenHomeSectionSuccess>;
+  HideDiscoverArticleError: ResolverTypeWrapper<HideDiscoverArticleError>;
+  HideDiscoverArticleErrorCode: HideDiscoverArticleErrorCode;
+  HideDiscoverArticleInput: HideDiscoverArticleInput;
+  HideDiscoverArticleResult: ResolversTypes['HideDiscoverArticleError'] | ResolversTypes['HideDiscoverArticleSuccess'];
+  HideDiscoverArticleSuccess: ResolverTypeWrapper<HideDiscoverArticleSuccess>;
   Highlight: ResolverTypeWrapper<Highlight>;
   HighlightEdge: ResolverTypeWrapper<HighlightEdge>;
   HighlightReply: ResolverTypeWrapper<HighlightReply>;
@@ -5273,6 +5309,10 @@ export type ResolversParentTypes = {
   HiddenHomeSectionError: HiddenHomeSectionError;
   HiddenHomeSectionResult: ResolversParentTypes['HiddenHomeSectionError'] | ResolversParentTypes['HiddenHomeSectionSuccess'];
   HiddenHomeSectionSuccess: HiddenHomeSectionSuccess;
+  HideDiscoverArticleError: HideDiscoverArticleError;
+  HideDiscoverArticleInput: HideDiscoverArticleInput;
+  HideDiscoverArticleResult: ResolversParentTypes['HideDiscoverArticleError'] | ResolversParentTypes['HideDiscoverArticleSuccess'];
+  HideDiscoverArticleSuccess: HideDiscoverArticleSuccess;
   Highlight: Highlight;
   HighlightEdge: HighlightEdge;
   HighlightReply: HighlightReply;
@@ -6203,6 +6243,7 @@ export type DiscoverFeedArticleResolvers<ContextType = ResolverContext, ParentTy
   author?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   description?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   feed?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  hidden?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   image?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate?: Resolver<Maybe<ResolversTypes['Date']>, ParentType, ContextType>;
@@ -6552,6 +6593,20 @@ export type HiddenHomeSectionSuccessResolvers<ContextType = ResolverContext, Par
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type HideDiscoverArticleErrorResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['HideDiscoverArticleError'] = ResolversParentTypes['HideDiscoverArticleError']> = {
+  errorCodes?: Resolver<Array<ResolversTypes['HideDiscoverArticleErrorCode']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type HideDiscoverArticleResultResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['HideDiscoverArticleResult'] = ResolversParentTypes['HideDiscoverArticleResult']> = {
+  __resolveType: TypeResolveFn<'HideDiscoverArticleError' | 'HideDiscoverArticleSuccess', ParentType, ContextType>;
+};
+
+export type HideDiscoverArticleSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['HideDiscoverArticleSuccess'] = ResolversParentTypes['HideDiscoverArticleSuccess']> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type HighlightResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['Highlight'] = ResolversParentTypes['Highlight']> = {
   annotation?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   color?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -6945,6 +7000,7 @@ export type MutationResolvers<ContextType = ResolverContext, ParentType extends
   generateApiKey?: Resolver<ResolversTypes['GenerateApiKeyResult'], ParentType, ContextType, RequireFields<MutationGenerateApiKeyArgs, 'input'>>;
   googleLogin?: Resolver<ResolversTypes['LoginResult'], ParentType, ContextType, RequireFields<MutationGoogleLoginArgs, 'input'>>;
   googleSignup?: Resolver<ResolversTypes['GoogleSignupResult'], ParentType, ContextType, RequireFields<MutationGoogleSignupArgs, 'input'>>;
+  hideDiscoverArticle?: Resolver<ResolversTypes['HideDiscoverArticleResult'], ParentType, ContextType, RequireFields<MutationHideDiscoverArticleArgs, 'input'>>;
   importFromIntegration?: Resolver<ResolversTypes['ImportFromIntegrationResult'], ParentType, ContextType, RequireFields<MutationImportFromIntegrationArgs, 'integrationId'>>;
   joinGroup?: Resolver<ResolversTypes['JoinGroupResult'], ParentType, ContextType, RequireFields<MutationJoinGroupArgs, 'inviteCode'>>;
   leaveGroup?: Resolver<ResolversTypes['LeaveGroupResult'], ParentType, ContextType, RequireFields<MutationLeaveGroupArgs, 'groupId'>>;
@@ -8399,6 +8455,9 @@ export type Resolvers<ContextType = ResolverContext> = {
   HiddenHomeSectionError?: HiddenHomeSectionErrorResolvers<ContextType>;
   HiddenHomeSectionResult?: HiddenHomeSectionResultResolvers<ContextType>;
   HiddenHomeSectionSuccess?: HiddenHomeSectionSuccessResolvers<ContextType>;
+  HideDiscoverArticleError?: HideDiscoverArticleErrorResolvers<ContextType>;
+  HideDiscoverArticleResult?: HideDiscoverArticleResultResolvers<ContextType>;
+  HideDiscoverArticleSuccess?: HideDiscoverArticleSuccessResolvers<ContextType>;
   Highlight?: HighlightResolvers<ContextType>;
   HighlightEdge?: HighlightEdgeResolvers<ContextType>;
   HighlightReply?: HighlightReplyResolvers<ContextType>;

packages/api/src/generated/schema.graphql

@@ -824,6 +824,7 @@ type DiscoverFeedArticle {
   author: String
   description: String!
   feed: String!
+  hidden: Boolean
   id: ID!
   image: String
   publishedDate: Date
@@ -1226,6 +1227,27 @@ type HiddenHomeSectionSuccess {
   section: HomeSection
 }
 
+type HideDiscoverArticleError {
+  errorCodes: [HideDiscoverArticleErrorCode!]!
+}
+
+enum HideDiscoverArticleErrorCode {
+  BAD_REQUEST
+  NOT_FOUND
+  UNAUTHORIZED
+}
+
+input HideDiscoverArticleInput {
+  discoverArticleId: ID!
+  setHidden: Boolean!
+}
+
+union HideDiscoverArticleResult = HideDiscoverArticleError | HideDiscoverArticleSuccess
+
+type HideDiscoverArticleSuccess {
+  id: ID!
+}
+
 type Highlight {
   annotation: String
   color: String
@@ -1684,6 +1706,7 @@ type Mutation {
   generateApiKey(input: GenerateApiKeyInput!): GenerateApiKeyResult!
   googleLogin(input: GoogleLoginInput!): LoginResult!
   googleSignup(input: GoogleSignupInput!): GoogleSignupResult!
+  hideDiscoverArticle(input: HideDiscoverArticleInput!): HideDiscoverArticleResult!
   importFromIntegration(integrationId: ID!): ImportFromIntegrationResult!
   joinGroup(inviteCode: String!): JoinGroupResult!
   leaveGroup(groupId: ID!): LeaveGroupResult!
@@ -1916,7 +1939,7 @@ type Query {
   feeds(input: FeedsInput!): FeedsResult!
   filters: FiltersResult!
   folderPolicies: FolderPoliciesResult!
-  getDiscoverFeedArticles(after: String, discoverTopicId: String!, feedId: ID, first: Int): GetDiscoverFeedArticleResults!
+  getDiscoverFeedArticles(after: String, discoverTopicId: String!, feedId: ID, first: Int, showHidden: Boolean): GetDiscoverFeedArticleResults!
   getUserPersonalization: GetUserPersonalizationResult!
   groups: GroupsResult!
   hello: String

packages/api/src/jobs/discover_feed_added.ts

@@ -0,0 +1,8 @@
+import { DiscoverFeed } from '../generated/graphql'
+
+export interface DiscoverFeedAddedJobData {
+  id: string
+  feed: DiscoverFeed
+}
+
+export const DISCOVER_FEED_ADDED_NAME = 'discover-feed-added'

packages/api/src/pubsub.ts

@@ -135,6 +135,7 @@ export enum EntityType {
   HIGHLIGHT = 'HIGHLIGHT',
   LABEL = 'LABEL',
   RSS_FEED = 'FEED',
+  DISCOVER_FEED = 'DISCOVER_FEED',
 }
 
 export interface PubsubClient {

packages/api/src/queue-processor.ts

@@ -88,6 +88,8 @@ import { logger } from './utils/logger'
 
 export const BACKEND_QUEUE_NAME = 'omnivore-backend-queue'
 export const CONTENT_FETCH_QUEUE = 'omnivore-content-fetch-queue'
+export const DISCOVER_QUEUE = 'omnivore-discover-queue'
+
 
 export const JOB_VERSION = 'v001'
 

packages/api/src/resolvers/discover_feeds/add.ts

@@ -14,7 +14,18 @@ import {
   MutationAddDiscoverFeedArgs,
 } from '../../generated/graphql'
 import { authorized } from '../../utils/gql-utils'
-import { rssParserConfig } from '../../utils/parser'
+import { enqueueDiscoverJob } from '../../utils/createTask'
+
+const RSS_PARSER_CONFIG = {
+  timeout: 5000, // 5 seconds
+  headers: {
+    // some rss feeds require user agent
+    'User-Agent':
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36',
+    Accept:
+      'application/rss+xml, application/rdf+xml;q=0.8, application/atom+xml;q=0.6, application/xml;q=0.4, text/xml;q=0.4, text/html;q=0.2',
+  },
+}
 
 const parser = new XMLParser({
   ignoreAttributes: false,
@@ -23,10 +34,6 @@ const parser = new XMLParser({
   ignorePiTags: false,
 })
 
-type DiscoverFeedRows = {
-  rows: DiscoverFeed[]
-}
-
 const extractAtomData = (
   url: string,
   feed: {
@@ -70,7 +77,7 @@ const handleExistingSubscription = async (
     [userId, feed.id]
   )
 
-  if (existingSubscription.rows > 1) {
+  if (existingSubscription.length > 0) {
     return {
       __typename: 'AddDiscoverFeedError',
       errorCodes: [AddDiscoverFeedErrorCode.Conflict],
@@ -93,7 +100,7 @@ const addNewSubscription = async (
   userId: string
 ): Promise<AddDiscoverFeedSuccess | AddDiscoverFeedError> => {
   // First things first, we need to validate that this is an actual RSS or ATOM feed.
-  const response = await axios.get(url, rssParserConfig())
+  const response = await axios.get(url, RSS_PARSER_CONFIG)
   const content = response.data
 
   const contentType = response.headers['content-type']
@@ -157,26 +164,21 @@ export const addDiscoverFeedResolver = authorized<
   AddDiscoverFeedSuccess,
   AddDiscoverFeedError,
   MutationAddDiscoverFeedArgs
->(async (_, { input: { url } }, { uid, log, pubsub }) => {
+>(async (_, { input: { url } }, { uid, log }) => {
   try {
     const existingFeed = (await appDataSource.query(
       'SELECT id from omnivore.discover_feed where link = $1',
       [url]
-    )) as DiscoverFeedRows
+    )) as DiscoverFeed[]
 
-    if (existingFeed.rows.length > 0) {
-      return await handleExistingSubscription(existingFeed.rows[0], uid)
+    if (existingFeed.length > 0) {
+      return await handleExistingSubscription(existingFeed[0], uid)
     }
 
     const result = await addNewSubscription(url, uid)
-    // TODO: Add pubsub for new feed
-    // if (result.__typename == 'AddDiscoverFeedSuccess') {
-    //   await pubsub.entityCreated(
-    //     EntityType.RSS_FEED,
-    //     { feed: result.feed, libraryItemId: 'NA' },
-    //     uid
-    //   )
-    // }
+    if (result.__typename == 'AddDiscoverFeedSuccess') {
+      await enqueueDiscoverJob({ id: result.feed.id, feed: result.feed })
+    }
 
     return result
   } catch (error) {

packages/api/src/resolvers/discover_feeds/articles/add.ts

@@ -31,14 +31,12 @@ export const saveDiscoverArticleResolver = authorized<
         }
       }
 
-      const { rows: discoverArticles } = (await appDataSource.query(
+      const discoverArticles = (await appDataSource.query(
         `SELECT url FROM omnivore.discover_feed_articles WHERE id=$1`,
         [discoverArticleId]
       )) as {
-        rows: {
-          url: string
-        }[]
-      }
+        url: string
+      }[]
 
       if (discoverArticles.length != 1) {
         return {

packages/api/src/resolvers/discover_feeds/articles/delete.ts

@@ -24,12 +24,10 @@ export const deleteDiscoverArticleResolver = authorized<
       }
     }
 
-    const { rows: discoverArticles } = (await appDataSource.query(
+    const discoverArticles = (await appDataSource.query(
       `SELECT article_save_id FROM omnivore.discover_feed_save_link WHERE discover_article_id=$1 and user_id=$2`,
       [discoverArticleId, uid]
-    )) as {
-      rows: { article_save_id: string }[]
-    }
+    )) as { article_save_id: string }[]
 
     if (discoverArticles.length != 1) {
       return {