Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4246 from omnivore-app/fix/highlighted-markdown

Browse Source 
fix: return markdown content for the old clients when highlighted markdown is requested
This commit is contained in:
Hongbo Wu
2024-08-07 11:00:17 +08:00
committed by GitHub
parent c15f16eb02 4de6cfc1f8
commit 5b523916bb
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/api/src/resolvers/article/index.ts
View File

@ -114,7 +114,6 @@ import { getStorageFileDetails } from '../../utils/uploads'
export enum ArticleFormat {
Markdown = 'markdown',
Html = 'html',
Distiller = 'distiller',
HighlightedMarkdown = 'highlightedMarkdown',
}

14
packages/api/src/resolvers/function_resolvers.ts
View File

@ -569,13 +569,11 @@ export const functionResolvers = {
item.format !== ArticleFormat.Html &&
item.readableContent
) {
let highlights: Highlight[] = []
// load highlights if needed
if (
item.format === ArticleFormat.HighlightedMarkdown &&
item.highlightAnnotations?.length
) {
highlights = await ctx.dataLoaders.highlights.load(item.id)
if (item.format === ArticleFormat.HighlightedMarkdown) {
// if the content is highlighted markdown, we will return markdown instead
// because the conversion is very slow and we don't want to block the response
// we will convert it to highlighted markdown in the client if needed
item.format = ArticleFormat.Markdown
}
try {
@ -584,7 +582,7 @@ export const functionResolvers = {
// convert html to the requested format
const converter = contentConverter(item.format)
if (converter) {
return converter(item.readableContent, highlights)
return converter(item.readableContent)
}
} catch (error) {
ctx.log.error('Error converting content', error)