diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index e70bf2dd9..031652ed1 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -1384,6 +1384,7 @@ export type SearchItem = { readingProgressAnchorIndex?: Maybe; readingProgressPercent?: Maybe; shortId?: Maybe; + siteName?: Maybe; slug: Scalars['String']; state?: Maybe; subscription?: Maybe; @@ -3384,6 +3385,7 @@ export type SearchItemResolvers, ParentType, ContextType>; readingProgressPercent?: Resolver, ParentType, ContextType>; shortId?: Resolver, ParentType, ContextType>; + siteName?: Resolver, ParentType, ContextType>; slug?: Resolver; state?: Resolver, ParentType, ContextType>; subscription?: Resolver, ParentType, ContextType>; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index f6dfe4e86..679b986f9 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -991,6 +991,7 @@ type SearchItem { readingProgressAnchorIndex: Int readingProgressPercent: Float shortId: String + siteName: String slug: String! state: ArticleSavingRequestStatus subscription: String diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index 836606f1b..e6e62eb21 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -1438,6 +1438,7 @@ const schema = gql` unsubMailTo: String unsubHttpUrl: String state: ArticleSavingRequestStatus + siteName: String } type SearchItemEdge { diff --git a/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx b/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx index 0b201184d..a163e4f98 100644 --- a/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx +++ b/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx @@ -6,16 +6,18 @@ import { PageType } from '../../../lib/networking/fragments/articleFragment' const siteName = (originalArticleUrl: string, itemUrl: string): string => { try { - return new URL(originalArticleUrl).hostname + return new URL(originalArticleUrl).hostname.replace(/^www\./, '') } catch {} try { - return new URL(itemUrl).hostname + return new URL(itemUrl).hostname.replace(/^www\./, '') } catch {} return '' } export function LinkedItemCard(props: LinkedItemCardProps): JSX.Element { - const originText = siteName(props.item.originalArticleUrl, props.item.url) + const originText = + props.item.siteName || + siteName(props.item.originalArticleUrl, props.item.url) if (props.item.pageType === PageType.HIGHLIGHTS) { return diff --git a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx index 9d016290a..89f45aa79 100644 --- a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx +++ b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx @@ -75,6 +75,7 @@ export type LibraryItemNode = { annotation: string state: State pageType: PageType + siteName?: string } export type PageInfo = { @@ -125,6 +126,7 @@ export function useGetLibraryItemsQuery({ quote annotation state + siteName } } pageInfo {