support for whole chapter links

.github/workflows/release.yaml

@@ -2,7 +2,7 @@ name: Obsidian Plugin Release
 # credits: https://github.com/scambier/obsidian-omnisearch/blob/master/.github/workflows/release.yml
 
 env:
-    VERSION: v1.0.1
+    VERSION: v1.0.2
 
 on: [pull_request, workflow_dispatch]
 

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-youversion-linker",
 	"name": "Obsidian YouVersion linker",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"minAppVersion": "0.15.0",
 	"description": "Obsidian plugin that automatically link bible verses to YouVersion bible.",
 	"author": "jaanonim",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-youversion-linker",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"description": "Obsidian plugin that automatically link bible verses to YouVersion bible.",
 	"main": "main.js",
 	"scripts": {

src/EditorSuggester.ts

@@ -90,7 +90,7 @@ export function getSuggestionsFromQuery(
 	const numbers = numbersPartsOfQueryString.split(separatorRegex);
 
 	const chapterNumber = parseInt(numbers[0]);
-	const verseNumber = parseInt(numbers[1]);
+	const verseNumber = numbers.length > 1 ? parseInt(numbers[1]) : undefined;
 	const verseEndNumber =
 		numbers.length === 3 ? parseInt(numbers[2]) : undefined;
 

src/LinkPreview.ts

@@ -30,6 +30,20 @@ async function processLink(link: HTMLAnchorElement) {
 			""
 		);
 		const data = JSON.parse(json_text);
+
+		console.log(data.props.pageProps);
+		if (data.props.pageProps.type !== "verse") {
+			const popup = document.createElement("div");
+			popup.addClass("preview-youversion");
+
+			popup
+				.createSpan({ cls: "error-youversion" })
+				.setText("Verse preview is unavailable for this type of link.");
+
+			tippy(link, { content: popup, allowHTML: true });
+			return;
+		}
+
 		const info =
 			data.props.pageProps.referenceTitle.title +
 			" " +

src/Regex.ts

@@ -1,5 +1,5 @@
 export const linkRegex =
-	/([123]\s?)?\p{L}+\s?\d{1,3}[:,.]\s?\d{1,3}(-\d{1,3})?/gu;
+	/([123]\s?)?\p{L}+\s?\d{1,3}([:,.]\s?\d{1,3}(-\d{1,3})?)?/gu;
 
 export const bookRegex = /([123]\s?)?\p{L}+/u;
 

src/VerseLink.ts

@@ -4,7 +4,7 @@ export default class VerseLink {
 		private bookUrl: string,
 		private book: string,
 		private chapter: number,
-		private verse: number,
+		private verse: number | undefined,
 		private verseEnd: number | undefined
 	) {}
 
@@ -13,9 +13,11 @@ export default class VerseLink {
 	}
 
 	toSimpleText() {
-		return this.verseEnd
-			? `${this.book} ${this.chapter}:${this.verse}-${this.verseEnd}`
-			: `${this.book} ${this.chapter}:${this.verse}`;
+		return this.verse
+			? this.verseEnd
+				? `${this.book} ${this.chapter}:${this.verse}-${this.verseEnd}`
+				: `${this.book} ${this.chapter}:${this.verse}`
+			: `${this.book} ${this.chapter}`;
 	}
 
 	toLink(): string {
@@ -24,8 +26,11 @@ export default class VerseLink {
 
 	getUrl(): string {
 		const base = "https://www.bible.com/bible";
-		let url = `${base}/${this.version}/${this.bookUrl}.${this.chapter}.${this.verse}`;
-		if (this.verseEnd) url += `-${this.verseEnd}`;
+		let url = `${base}/${this.version}/${this.bookUrl}.${this.chapter}`;
+		if (this.verse) {
+			url += `.${this.verse}`;
+			if (this.verseEnd) url += `-${this.verseEnd}`;
+		}
 		return url;
 	}
 }

styles.css

@@ -23,3 +23,9 @@ If your plugin does not need CSS, delete this file.
 	color: var(--text-faint);
 	text-align: right;
 }
+
+.error-youversion {
+	display: block;
+	text-align: center;
+	color: var(--text-error);
+}

versions.json

@@ -1,4 +1,5 @@
 {
 	"1.0.0": "0.15.0",
-	"1.0.1": "0.15.0"
+	"1.0.1": "0.15.0",
+	"1.0.2": "0.15.0"
 }