Merge pull request #111 from omnivore-app/fix/index-out-of-bound

fix/index out of bound

package.json

@@ -27,6 +27,7 @@
     "@logseq/libs": "^0.0.14",
     "date-fns": "^2.29.3",
     "diff-match-patch": "^1.0.5",
+    "lodash": "^4.17.21",
     "luxon": "^3.2.1",
     "markdown-escape": "^1.1.0",
     "mustache": "^4.2.0"
@@ -39,6 +40,7 @@
     "@types/chai": "^4.3.4",
     "@types/chai-string": "^1.4.2",
     "@types/diff-match-patch": "^1.0.32",
+    "@types/lodash": "^4.14.194",
     "@types/luxon": "^2.3.2",
     "@types/markdown-escape": "^1.1.0",
     "@types/mocha": "^10.0.1",

src/api.ts

@@ -57,6 +57,7 @@ export interface Article {
   readingProgressPercent: number
   isArchived: boolean
   wordsCount?: number
+  archivedAt?: string
 }
 
 export interface Label {
@@ -120,6 +121,10 @@ export const getOmnivoreArticles = async (
                   content
                   publishedAt
                   readAt
+                  isArchived
+                  readingProgressPercent
+                  wordsCount
+                  archivedAt
                   highlights {
                     id
                     quote
@@ -135,9 +140,6 @@ export const getOmnivoreArticles = async (
                   labels {
                     name
                   }
-                  isArchived
-                  readingProgressPercent
-                  wordsCount
                 }
               }
               pageInfo {

src/index.ts

@@ -28,6 +28,7 @@ import {
 import {
   DATE_FORMAT,
   compareHighlightsInFile,
+  escapeQuotes,
   getHighlightLocation,
   isBlockPropertiesChanged,
   parseBlockProperties,
@@ -86,13 +87,13 @@ const getBlockByContent = async (
       `[:find (pull ?b [*])
             :where
               [?b :block/page ?p]
-              [?p :block/original-name "${pageName}"]
+              [?p :block/original-name "${escapeQuotes(pageName)}"]
               [?b :block/parent ?parent]
               [?parent :block/uuid ?u]
               [(str ?u) ?s]
               [(= ?s "${parentBlockId}")]
               [?b :block/content ?c]
-              [(clojure.string/includes? ?c "${content}")]]`
+              [(clojure.string/includes? ?c "${escapeQuotes(content)}")]]`
     )
   ).flat()
 
@@ -108,9 +109,9 @@ const getBlockByTitle = async (
       `[:find (pull ?b [*])
             :where
               [?b :block/page ?p]
-              [?p :block/original-name "${pageName}"]
+              [?p :block/original-name "${escapeQuotes(pageName)}"]
               [?b :block/content ?c]
-              [(= ?c "${title}")]]`
+              [(= ?c "${escapeQuotes(title)}")]]`
     )
   ).flat()
 
@@ -242,7 +243,7 @@ const fetchOmnivore = async (inBackground = false) => {
         parseDateTime(syncAt).toISO(),
         getQueryFromFilter(filter, customQuery),
         true,
-        'markdown',
+        'highlightedMarkdown',
         endpoint
       )
       const articleBatchMap: Map<string, IBatchBlock[]> = new Map()

src/settings/template.ts

@@ -1,3 +1,4 @@
+import { truncate } from 'lodash'
 import Mustache from 'mustache'
 import { Article, Highlight, HighlightType, Label, PageType } from '../api'
 import {
@@ -33,6 +34,7 @@ export type ArticleView =
       state: string
       wordsCount?: number
       readLength?: number
+      dateArchived?: string
     }
   | FunctionMap
 
@@ -137,6 +139,9 @@ const createArticleView = (
   const readLength = wordsCount
     ? Math.round(Math.max(1, wordsCount / 235))
     : undefined
+  const dateArchived = article.archivedAt
+    ? formatDate(new Date(article.archivedAt), preferredDateFormat)
+    : undefined
   return {
     title: article.title,
     omnivoreUrl: `https://omnivore.app/me/${article.slug}`,
@@ -155,6 +160,7 @@ const createArticleView = (
     state: getArticleState(article),
     wordsCount,
     readLength,
+    dateArchived,
     ...functionMap,
   }
 }
@@ -195,10 +201,19 @@ export const renderPageName = (
   preferredDateFormat: string
 ) => {
   const date = formatDate(new Date(article.savedAt), preferredDateFormat)
-  return Mustache.render(pageName, {
-    title: article.title,
+  // replace slash with dash in the title to prevent creating subpages
+  // since there is no way to escape slashes in logseq
+  const title = article.title.replace(/\//g, '-')
+
+  const renderedPageName = Mustache.render(pageName, {
+    title,
     date,
   })
+
+  // truncate the page name to 100 characters
+  return truncate(renderedPageName, {
+    length: 100,
+  })
 }
 
 export const preParseTemplate = (template: string) => {

src/util.ts

@@ -158,3 +158,7 @@ export const isBlockPropertiesChanged = (
     return newBlockProperty != existingBlockProperty
   })
 }
+
+export const escapeQuotes = (str: string): string => {
+  return str.replace(/"/g, '\\"')
+}

yarn.lock

@@ -1227,6 +1227,11 @@
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
+"@types/lodash@^4.14.194":
+  version "4.14.194"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
+  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
+
 "@types/luxon@^2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-2.3.2.tgz#8a3f2cdd4858ce698b56cd8597d9243b8e9d3c65"
@@ -3369,7 +3374,7 @@ lodash.uniqby@^4.7.0:
 
 lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 [email protected]: