Merge branch 'hotfix/3.19.67'

WorldBrain · Jul 17, 2024 · 835dcc2 · 835dcc2
2 parents 0c2b289 + b992276
commit 835dcc2
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 47 deletions.
diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "worldbrain-extension",
-    "version": "3.19.66",
+    "version": "3.19.67",
     "homepage": "https://memex.garden",
     "repository": "https://github.com/WorldBrain/Memex",
     "scripts": {

diff --git a/src/background-script/html-to-markdown.ts b/src/background-script/html-to-markdown.ts
@@ -9,14 +9,22 @@ export function htmlToMarkdown(
     if (!html?.length) {
         return ''
     }
+
     const { document: doc } = parseHTML(html)
 
     const turndownService = new TurndownService({
         headingStyle: 'atx',
         hr: '---',
         codeBlockStyle: 'fenced',
     })
+
     applyCustomRules?.(turndownService)
-    const markdown = turndownService.turndown(doc)
+
+    let markdown = turndownService.turndown(doc)
+
+    // Replace escaped double brackets with unescaped double brackets
+    markdown = markdown.replace(/\\\[\\\[/g, '[[')
+    markdown = markdown.replace(/\\\]\\\]/g, ']]')
+
     return markdown
 }
diff --git a/src/common-ui/components/prompt-templates/index.tsx b/src/common-ui/components/prompt-templates/index.tsx
@@ -17,7 +17,6 @@ import TutorialBox from '../../../../external/@worldbrain/memex-common/ts/common
 import styled, { css } from 'styled-components'
 import Icon from '../../../../external/@worldbrain/memex-common/ts/common-ui/components/icon'
 import ReactDOM from 'react-dom'
-import TextField from '@worldbrain/memex-common/lib/common-ui/components/text-field'
 import TextArea from '@worldbrain/memex-common/lib/common-ui/components/text-area'
 import { getKeyName } from '@worldbrain/memex-common/lib/utils/os-specific-key-names'
 
@@ -101,17 +100,6 @@ export default class PromptTemplatesComponent extends UIElement<
                             getRootElement={this.props.getRootElement}
                             tutorialId={'useTemplates'}
                         />
-                        {/* <Icon
-                            filePath={icons.helpIcon}
-                            heightAndWidth="18px"
-                            padding={'5px'}
-                            onClick={() =>
-                                window.open(
-                                    'https://links.memex.garden/tutorials/text-exporter',
-                                )
-                            }
-                        /> */}
-
                         <PrimaryAction
                             label={'New'}
                             onClick={() =>
@@ -430,6 +418,7 @@ export default class PromptTemplatesComponent extends UIElement<
 
 const TextAreaContainer = styled.div`
     position: relative;
+    margin-top: 3px;
 `
 const TextAreaSaveButton = styled.div`
     position: absolute;

diff --git a/src/common-ui/components/prompt-templates/logic.ts b/src/common-ui/components/prompt-templates/logic.ts
@@ -10,6 +10,7 @@ import {
 } from './types'
 import { UIEventHandler, UILogic } from 'ui-logic-core'
 import { AI_PROMPT_DEFAULTS } from 'src/sidebar/annotations-sidebar/constants'
+import { marked } from 'marked'
 
 type EventHandler<
     EventName extends keyof PromptTemplatesEvent
@@ -94,7 +95,7 @@ export default class PromptTemplatesLogic extends UILogic<
         const currentTemplates = previousState.promptTemplatesArray
 
         this.dependencies.onTemplateSelect(
-            currentTemplates[selectedTemplate].text,
+            marked.parse(currentTemplates[selectedTemplate].text),
         )
     }
     setTemplateEdit: EventHandler<'setTemplateEdit'> = async ({
@@ -105,17 +106,18 @@ export default class PromptTemplatesLogic extends UILogic<
         const currentTemplates = previousState.promptTemplatesArray
         const editValue =
             event.value || currentTemplates[selectedTemplate]?.text
-        const updatedTemplates = currentTemplates?.map((template, index) => {
-            if (index === selectedTemplate) {
-                return { ...template, isEditing: editValue }
+
+        if (currentTemplates[selectedTemplate]) {
+            currentTemplates[selectedTemplate] = {
+                ...currentTemplates[selectedTemplate],
+                isEditing: editValue,
             }
-            return template
-        })
 
-        this.emitMutation({
-            promptTemplatesArray: { $set: updatedTemplates },
-            editValue: { $set: editValue },
-        })
+            this.emitMutation({
+                promptTemplatesArray: { $set: currentTemplates },
+                editValue: { $set: editValue },
+            })
+        }
     }
 
     saveEditTemplate: EventHandler<'saveEditTemplate'> = async ({

diff --git a/src/content-scripts/content_script/global.ts b/src/content-scripts/content_script/global.ts
@@ -631,10 +631,6 @@ export async function main(
                 })
                 anchor = { quote, descriptor }
             }
-            if (quote?.length === 0 && !drawRectangle) {
-                highlightCreateState = 'success'
-                return
-            }
 
             if (
                 !(await pageActionAllowed(
@@ -652,6 +648,19 @@ export async function main(
                 return
             }
 
+            if (
+                (quote?.length === 0 || !selection) &&
+                window.location.href.includes('youtube.com')
+            ) {
+                await inPageUI.showSidebar({
+                    action: 'youtube_timestamp',
+                })
+                return
+            } else if (quote?.length === 0 && !drawRectangle) {
+                highlightCreateState = 'success'
+                return
+            }
+
             const highlightColorSettingStorage = await getHighlightColorSettings()
             const highlightColor = color ?? highlightColorSettingStorage[0].id
 

diff --git a/src/copy-paster/components/TemplateEditor.tsx b/src/copy-paster/components/TemplateEditor.tsx
@@ -88,7 +88,6 @@ export default class TemplateEditor extends PureComponent<
 
     renderPremadeTemplatesList() {
         if (this.state.showPremadeTemplatesModal) {
-            console.log('render')
             return (
                 <PopoutBox
                     getPortalRoot={this.props.getRootElement}

diff --git a/src/in-page-ui/keyboard-shortcuts/content_script/index.ts b/src/in-page-ui/keyboard-shortcuts/content_script/index.ts
@@ -131,16 +131,10 @@ function getShortcutHandlers({
             return
         },
         createHighlight: async () => {
-            const isYouTube = isUrlYTVideo(window.location.href)
-
-            if (isYouTube) {
-                await annotationFunctions.createYoutubeTimestamp()
-            } else {
-                await annotationFunctions.createHighlight(
-                    cloneSelectionAsPseudoObject(window.getSelection()),
-                    null,
-                )
-            }
+            await annotationFunctions.createHighlight(
+                cloneSelectionAsPseudoObject(window.getSelection()),
+                null,
+            )
 
             inPageUI.hideTooltip()
         },

diff --git a/src/readwise-integration/background/index.ts b/src/readwise-integration/background/index.ts
@@ -184,9 +184,14 @@ export class ReadwiseBackground {
                             return null
                         }
 
-                        return annotationToReadwise(annotation, {
-                            pageData,
-                        })
+                        const annotationForReadWise = await annotationToReadwise(
+                            annotation,
+                            {
+                                pageData,
+                            },
+                        )
+
+                        return annotationForReadWise
                     } catch (e) {
                         console.error(e)
                         Raven.captureException(e)

diff --git a/src/sidebar/annotations-sidebar/containers/logic.ts b/src/sidebar/annotations-sidebar/containers/logic.ts
@@ -249,8 +249,13 @@ export class SidebarContainerLogic extends UILogic<
         if (
             this.options.windowAPI.location.href.includes('youtube.com/watch')
         ) {
-            const sidebarContainerWidth = document.getElementById('secondary')
-                .clientWidth
+            const sidebarWidthNumber = parseFloat(
+                SIDEBAR_WIDTH_STORAGE_KEY.replace('px', ''),
+            )
+            const sidebarContainerWidth =
+                document.getElementById('secondary')?.clientWidth ??
+                sidebarWidthNumber
+
             sidebarWidth = sidebarContainerWidth - 50 + 'px'
         }
 
@@ -3542,7 +3547,7 @@ export class SidebarContainerLogic extends UILogic<
                     isEditing: null,
                     isFocused: false,
                 }))
-            prompt = syncsettings[0].text
+            prompt = marked.parse(syncsettings[0].text)
         }
 
         if (event.textToProcess) {
@@ -3580,7 +3585,7 @@ export class SidebarContainerLogic extends UILogic<
                         isEditing: null,
                         isFocused: false,
                     }))
-                prompt = syncsettings[0].text
+                prompt = marked.parse(syncsettings[0].text)
             }
 
             let retries = 0