v0.0.16

Author: kaiiiz

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-raindrop-highlights",
 	"name": "Raindrop Highlights",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"minAppVersion": "0.14.0",
 	"description": "Sync your Raindrop.io highlights.",
 	"author": "kaiiiz",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-raindrop-highlights",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"description": "Sync your Raindrop.io highlights.",
 	"main": "main.js",
 	"scripts": {

src/api.ts

@@ -3,7 +3,12 @@ import axios from "axios";
 import type { RaindropBookmark, RaindropCollection, RaindropHighlight, RaindropUser } from "./types";
 import TokenManager from "./tokenManager";
 
-const BASEURL = "https://api.raindrop.io/rest/v1"
+const BASEURL = "https://api.raindrop.io/rest/v1";
+
+interface NestedRaindropCollection {
+	title: string,
+	parentId: number,
+}
 
 export class RaindropAPI {
 	app: App;
@@ -42,35 +47,45 @@ export class RaindropAPI {
 
 	async getCollections(): Promise<RaindropCollection[]> {
 		let res = await this.get(`${BASEURL}/collections`, {});
-		const collectionMap: {[id: number]: string} = {};
 
 		let collections: RaindropCollection[] = [
 			{ id: -1, title: 'Unsorted' },
 			{ id: -99, title: 'Trash' },
 		];
+
+		const rootCollectionMap: {[id: number]: string} = {};
 		res.items.forEach((collection: any) => {
 			const id = collection['_id'];
 			const title = collection['title'];
-			collectionMap[id] = title;
+			rootCollectionMap[id] = title;
 			collections.push({
 				title: title,
 				id: id,
 			});
 		});
 
 		res = await this.get(`${BASEURL}/collections/childrens`, {});
+		const nestedCollectionMap: {[id: number]: NestedRaindropCollection} = {};
+		res.items.forEach((collection: any) => {
+			const id = collection['_id'];
+			nestedCollectionMap[id] = {
+				title: collection['title'],
+				parentId: collection['parent']['$id'],
+			};
+		});
+
 		res.items.forEach((collection: any) => {
 			const id = collection['_id'];
-			const parentId = collection['parent']['$id'];
+			let parentId = collection['parent']['$id'];
 			let title = collection['title'];
-			if (parentId in collectionMap) {
-				title = `${collectionMap[parentId]}/${collection['title']}`;
+			while (!(parentId in rootCollectionMap)) {
+				title = `${nestedCollectionMap[parentId].title}/${title}`;
+				parentId = nestedCollectionMap[parentId].parentId;
 			}
 			collections.push({
 				title: title,
 				id: id,
 			});
-			collectionMap[id] = title;
 		});
 
 		return collections;

src/assets/defaultTemplate.njk

@@ -1,7 +1,7 @@
 {% if is_new_article %}
 # Metadata
 {% if link %}Source URL:: {{link}}{% endif %}
-{% if tags|length %}Topics:: {{ tags | join(", ") }}{% endif %}
+{% if tags|length %}Topics:: {{ tags | map("#{}") | join(", ") }}{% endif %}
 
 ---
 # {{title}}

src/constants.ts

@@ -1,7 +1,7 @@
 import DEFAULT_TEMPLATE from './assets/defaultTemplate.njk';
 import type { RaindropPluginSettings } from "./types";
 
-export const VERSION = '0.0.15';
+export const VERSION = '0.0.16';
 
 export const DEFAULT_SETTINGS: RaindropPluginSettings = {
 	version: VERSION,

src/types.ts

@@ -21,7 +21,7 @@ export interface RaindropHighlight { // Remote state
 export interface RaindropCreatorRef { // Remote state
 	name: string,
 	id: number,
-};
+}
 
 export interface RaindropBookmark { // Remote state
 	id: number,

versions.json

@@ -13,5 +13,6 @@
 	"0.0.12": "0.14.0",
 	"0.0.13": "0.14.0",
 	"0.0.14": "0.14.0",
-	"0.0.15": "0.14.0"
+	"0.0.15": "0.14.0",
+	"0.0.16": "0.14.0"
 }