update the use of the url fetch for images

WorldBrain · Mar 5, 2024 · 0882c27 · 0882c27
1 parent e4db3c1
commit 0882c27
Show file tree

Hide file tree

Showing 9 changed files with 375 additions and 205 deletions.
diff --git a/external/@worldbrain/storex-hub b/external/@worldbrain/storex-hub
diff --git a/src/annotations/background/index.ts b/src/annotations/background/index.ts
@@ -31,6 +31,7 @@ import type { AnalyticsCoreInterface } from '@worldbrain/memex-common/lib/analyt
 import type { PKMSyncBackgroundModule } from 'src/pkm-integrations/background'
 import type { ImageSupportInterface } from '@worldbrain/memex-common/lib/image-support/types'
 import type { AuthBackground } from 'src/authentication/background'
+import { ImageSupportBackground } from 'src/image-support/background'
 
 interface TabArg {
     tab: Tabs.Tab
@@ -60,7 +61,7 @@ export default class DirectLinkingBackground {
             preAnnotationDelete(params: {
                 annotationUrl: string
             }): Promise<void>
-            imageSupport: ImageSupportInterface
+            imageSupport: ImageSupportBackground
         },
     ) {
         this.socialBg = options.socialBg

diff --git a/src/annotations/components/AnnotationEditable.tsx b/src/annotations/components/AnnotationEditable.tsx
@@ -226,7 +226,7 @@ export default class AnnotationEditable extends React.Component<Props, State> {
                 this.props.highlightColorSettings,
             )
 
-            const defaultHighlightSettings = highlightColorSettings.find(
+            const defaultHighlightSettings = highlightColorSettings?.find(
                 (setting) => setting.id === 'default',
             )
             if (defaultHighlightSettings?.color) {
@@ -452,11 +452,7 @@ export default class AnnotationEditable extends React.Component<Props, State> {
                             />
                         </HighlightEditContainer>
                     ) : (
-                        <Markdown
-                            imageSupport={this.props.imageSupport}
-                            isHighlight
-                            pageUrl={this.props.pageUrl}
-                        >
+                        <Markdown isHighlight pageUrl={this.props.pageUrl}>
                             {this.state.isTruncatedHighlight
                                 ? this.state.truncatedTextHighlight
                                 : this.props.body}
@@ -847,7 +843,6 @@ export default class AnnotationEditable extends React.Component<Props, State> {
                     <NoteText
                         contextLocation={this.props.contextLocation}
                         getYoutubePlayer={this.props.getYoutubePlayer}
-                        imageSupport={this.props.imageSupport}
                     >
                         {comment}
                         {/* {this.state.isTruncatedNote

diff --git a/src/copy-paster/background/template-data-fetchers.ts b/src/copy-paster/background/template-data-fetchers.ts
@@ -420,7 +420,10 @@ export function getTemplateDataFetchers({
 }
 
 async function convertHTMLintoMarkdown(inputHtml, imageSupport) {
-    const html = await replaceImgSrcWithFunctionOutput(inputHtml, imageSupport)
+    const html = await replaceImgSrcWithFunctionOutput(
+        inputHtml,
+        process.env.NODE_ENV,
+    )
     if (html) {
         let turndownService = new TurndownService({
             headingStyle: 'atx',

diff --git a/src/markdown-preview/markdown-preview.tsx b/src/markdown-preview/markdown-preview.tsx
@@ -106,11 +106,7 @@ export class MarkdownPreview extends React.Component<Props, State> {
 
     private renderEditor() {
         if (this.state.showPreview) {
-            return (
-                <Markdown imageSupport={this.props.imageSupport}>
-                    {this.props.value}
-                </Markdown>
-            )
+            return <Markdown>{this.props.value}</Markdown>
         }
 
         return this.props.renderInput({