diff --git a/packages/api/src/resolvers/subscriptions/index.ts b/packages/api/src/resolvers/subscriptions/index.ts index 98e0d9c79..77464dbec 100644 --- a/packages/api/src/resolvers/subscriptions/index.ts +++ b/packages/api/src/resolvers/subscriptions/index.ts @@ -1,6 +1,5 @@ import axios from 'axios' import { parseHTML } from 'linkedom' -import Parser from 'rss-parser' import { Brackets } from 'typeorm' import { Subscription } from '../../entity/subscription' import { env } from '../../env' @@ -47,18 +46,6 @@ import { parseFeed, parseOpml } from '../../utils/parser' type PartialSubscription = Omit -const parser = new Parser({ - timeout: 30000, // 30 seconds - maxRedirects: 5, - 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', - }, -}) - export type SubscriptionsSuccessPartial = Merge< SubscriptionsSuccess, { subscriptions: PartialSubscription[] } diff --git a/packages/api/src/utils/search.ts b/packages/api/src/utils/search.ts index 33329e13a..5de97c6b4 100644 --- a/packages/api/src/utils/search.ts +++ b/packages/api/src/utils/search.ts @@ -6,7 +6,7 @@ export const parseSearchQuery = (query: string): LiqeQuery => { .replace('in:subscription', 'has:subscriptions') // compatibility with old search .replace('in:library', 'no:subscription') // compatibility with old search // wrap the value behind colon in quotes if it's not already - .replace(/(\w+):([^"\s]+)/g, '$1:"$2"') + .replace(/(\w+):("([^"]+)"|([^"\s]+))/g, '$1:"$3$4"') return parse(searchQuery) }