fix: add labels of highlights to the template

omnivore-app · Mar 31, 2023 · 4b8aee1 · 4b8aee1
1 parent 43a3966
commit 4b8aee1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -12,6 +12,7 @@ import {
   TFile,
   TFolder,
 } from "obsidian";
+import { FolderSuggest } from "./settings/file-suggest";
 import {
   Article,
   compareHighlightsInFile,
@@ -23,7 +24,6 @@ import {
   parseDateTime,
   replaceIllegalChars,
 } from "./util";
-import { FolderSuggest } from "./settings/file-suggest";
 
 enum Filter {
   ALL = "import all my articles",
@@ -255,6 +255,9 @@ export default class OmnivorePlugin extends Plugin {
                 this.settings.dateHighlightedFormat
               ),
               note: highlight.annotation,
+              labels: highlight.labels?.map((l) => ({
+                name: l.name,
+              })),
             };
           });
           const dateFormat = this.settings.dateSavedFormat;
@@ -515,7 +518,7 @@ class OmnivoreSettingTab extends PluginSettingTab {
               href: "https://github.com/janl/mustache.js/#templates",
             }),
             fragment.createEl("p", {
-              text: "Available variables: id, title, omnivoreUrl, siteName, originalUrl, author, content, dateSaved, labels.name, highlights.text, highlights.highlightUrl, highlights.note, highlights.dateHighlighted",
+              text: "Available variables: id, title, omnivoreUrl, siteName, originalUrl, author, content, dateSaved, labels.name, highlights.text, highlights.highlightUrl, highlights.note, highlights.dateHighlighted, highlights.labels.name",
             }),
             fragment.createEl("p", {
               text: "Please note that id in the frontmatter is required for the plugin to work properly.",

diff --git a/src/util.ts b/src/util.ts
@@ -79,6 +79,7 @@ export interface Highlight {
   annotation: string;
   patch: string;
   updatedAt: string;
+  labels?: Label[];
 }
 
 export interface HighlightPoint {
@@ -111,12 +112,12 @@ export const loadArticle = async (
 export const loadArticles = async (
   endpoint: string,
   apiKey: string,
-  after: number = 0,
-  first: number = 10,
-  updatedAt: string = "",
-  query: string = "",
-  includeContent: boolean = false,
-  format: string = "html"
+  after = 0,
+  first = 10,
+  updatedAt = "",
+  query = "",
+  includeContent = false,
+  format = "html"
 ): Promise<[Article[], boolean]> => {
   const res = await requestUrl({
     url: endpoint,