notes-to-strapi-export-article-ai 1.0.18 → 1.0.19

package/manifest.json

@@ -1,9 +1,9 @@
 {
 	"id": "notes-to-strapi-export-article-ai",
-	"name": "Strapi Exporter, Notes to Strapi article AI enhanced",
-	"version": "1.0.18",
+	"name": "Strapi Exporter AI",
+	"version": "1.0.19",
 	"minAppVersion": "1.5.0",
-	"description": "Effortlessly export your notes to Strapi CMS with AI-powered image handling and SEO optimization. Replace all the images in your notes by uploaded images in Strapi, and add SEO metadata to uploaded images.",
+	"description": "Effortlessly export your notes to Strapi CMS with AI-powered handling and SEO optimization.",
 	"author": "Cinquin Andy",
 	"authorUrl": "https://andy.cinquin.com",
 	"isDesktopOnly": true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "notes-to-strapi-export-article-ai",
-	"version": "1.0.18",
+	"version": "1.0.19",
 	"description": "Effortlessly export your Obsidian notes to Strapi CMS with AI-powered image handling and SEO optimization. Replace all the images in your notes by uploaded images in Strapi, and add SEO metadata to uploaded images.",
 	"main": "main.js",
 	"scripts": {

package/src/main.ts

@@ -14,27 +14,25 @@ export default class StrapiExporterPlugin extends Plugin {
 		/**
 		 * Add a ribbon icon to the Markdown view (the little icon on the left side bar)
 		 */
-		const ribbonIconEl = this.addRibbonIcon(
+		this.addRibbonIcon(
 			'upload',
-			'Upload images to Strapi and update links in Markdown content, then generate article content using OpenAI',
-			async (evt: MouseEvent) => {
+			'Upload to Strapi and generate content with AI',
+			async () => {
 				await this.processMarkdownContent()
 			}
 		)
-		ribbonIconEl.addClass('strapi-exporter-ribbon-class')
 
 		/**
 		 * Add a ribbon icon based on the settings (if enabled)
 		 */
 		if (this.settings.enableAdditionalApiCall) {
-			const additionalRibbonIconEl = this.addRibbonIcon(
+			this.addRibbonIcon(
 				'link',
-				'Upload images to Strapi and update links in Markdown content, then generate additional content using OpenAI',
-				async (evt: MouseEvent) => {
+				'Upload to Strapi and generate additional content with AI',
+				async () => {
 					await this.processMarkdownContent(true)
 				}
 			)
-			additionalRibbonIconEl.addClass('strapi-exporter-additional-ribbon-class')
 		}
 
 		this.addSettingTab(new StrapiExporterSettingTab(this.app, this))

package/src/settings.ts

@@ -1,4 +1,4 @@
-import { App, Notice, PluginSettingTab, Setting } from 'obsidian'
+import { App, PluginSettingTab, Setting } from 'obsidian'
 import StrapiExporterPlugin from './main'
 import { validateJsonTemplate } from './utils/validators'
 
@@ -11,17 +11,11 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 	}
 
 	display(): void {
-		// Display settings fields
 		const { containerEl } = this
 		containerEl.empty()
 
-		/** ****************************************************************************
-		 * Add the settings for the plugin
-		 * *****************************************************************************
-		 */
-		containerEl.createEl('h1', { text: 'Strapi & OpenAI Settings' })
 		new Setting(containerEl)
-			.setName('Strapi API Token')
+			.setName('Strapi API token')
 			.setDesc('Enter your Strapi API token')
 			.addText(text =>
 				text
@@ -34,7 +28,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			)
 
 		new Setting(containerEl)
-			.setName('OpenAI API Key')
+			.setName('OpenAI API key')
 			.setDesc('Enter your OpenAI API key for GPT-3')
 			.addText(text =>
 				text
@@ -47,7 +41,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			)
 
 		new Setting(containerEl)
-			.setName('Additional Prompt')
+			.setName('Additional prompt')
 			.setDesc(
 				'Enter an optional additional prompt to customize the article content generation'
 			)
@@ -61,7 +55,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 					})
 			)
 
-		containerEl.createEl('h1', { text: 'Strapi Settings - Call 1' })
+		new Setting(containerEl).setName('Strapi settings - Call 1').setHeading()
 
 		new Setting(containerEl)
 			.setName('Strapi URL')
@@ -77,7 +71,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			)
 
 		new Setting(containerEl)
-			.setName('JSON Template')
+			.setName('JSON template')
 			.setDesc('Enter the JSON template for the fields needed')
 			.addTextArea(text =>
 				text
@@ -87,17 +81,12 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 						if (validateJsonTemplate(value)) {
 							this.plugin.settings.jsonTemplate = value
 							await this.plugin.saveSettings()
-							new Notice('JSON template saved successfully. (valid !)')
-						} else {
-							new Notice(
-								'Invalid JSON template. Please enter a valid JSON template.'
-							)
 						}
 					})
 			)
 
 		new Setting(containerEl)
-			.setName('JSON Template Description')
+			.setName('JSON template description')
 			.setDesc('Enter the description for each field in the JSON template')
 			.addTextArea(text =>
 				text
@@ -110,7 +99,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			)
 
 		new Setting(containerEl)
-			.setName('Strapi Article Create URL')
+			.setName('Strapi article create URL')
 			.setDesc('Enter the URL to create articles in Strapi')
 			.addText(text =>
 				text
@@ -123,7 +112,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			)
 
 		new Setting(containerEl)
-			.setName('Strapi Content Attribute Name')
+			.setName('Strapi content attribute name')
 			.setDesc('Enter the attribute name for the content field in Strapi')
 			.addText(text =>
 				text
@@ -135,10 +124,10 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 					})
 			)
 
-		containerEl.createEl('h2', { text: 'Main Image Settings' })
+		new Setting(containerEl).setName('Main image settings').setHeading()
 
 		new Setting(containerEl)
-			.setName('Enable Main Image')
+			.setName('Enable main image')
 			.setDesc('Toggle the main image')
 			.addToggle(toggle =>
 				toggle
@@ -151,7 +140,6 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			)
 
 		if (this.plugin.settings.mainButtonImageEnabled) {
-			// Display main image settings
 			containerEl.createEl('p', {
 				text: 'For the plugin to detect images and galleries, ensure the following folder structure:',
 			})
@@ -168,7 +156,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			})
 
 			new Setting(containerEl)
-				.setName('Main Image Full Path Property')
+				.setName('Main image full path property')
 				.setDesc(
 					'Enter the full path property for the main image in the final call'
 				)
@@ -183,10 +171,10 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 				)
 		}
 
-		containerEl.createEl('h2', { text: 'Main Gallery Settings' })
+		new Setting(containerEl).setName('Main gallery settings').setHeading()
 
 		new Setting(containerEl)
-			.setName('Enable Main Gallery')
+			.setName('Enable main gallery')
 			.setDesc('Toggle the main gallery')
 			.addToggle(toggle =>
 				toggle
@@ -215,7 +203,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 			})
 
 			new Setting(containerEl)
-				.setName('Main Gallery Full Path Property')
+				.setName('Main gallery full path property')
 				.setDesc(
 					'Enter the full path property for the main gallery in the final call'
 				)
@@ -230,15 +218,16 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 				)
 		}
 
-		containerEl.createEl('h1', {
-			text: 'Strapi Settings - Call 2 - Additional call',
-		})
+		new Setting(containerEl)
+			.setName('Strapi settings - Call 2 - Additional call')
+			.setHeading()
+
 		containerEl.createEl('p', {
 			text: `(Be careful, when enabling this feature, you'll need to restart Obsidian to see the additional button in the ribbon menu.)`,
 		})
 
 		new Setting(containerEl)
-			.setName('Enable Additional Call API')
+			.setName('Enable additional call API')
 			.setDesc(
 				'Toggle the additional Call API, and display a new icon in the ribbon menu'
 			)
@@ -254,7 +243,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 
 		if (this.plugin.settings.enableAdditionalApiCall) {
 			new Setting(containerEl)
-				.setName('Additional JSON Template')
+				.setName('Additional JSON template')
 				.setDesc(
 					'Enter the JSON template for the fields needed for the additional api'
 				)
@@ -266,17 +255,12 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 							if (validateJsonTemplate(value)) {
 								this.plugin.settings.additionalJsonTemplate = value
 								await this.plugin.saveSettings()
-								new Notice('JSON template saved successfully. (valid !)')
-							} else {
-								new Notice(
-									'Invalid additional JSON template. Please enter a valid JSON template.'
-								)
 							}
 						})
 				)
 
 			new Setting(containerEl)
-				.setName('Additional API JSON Template Description')
+				.setName('Additional API JSON template description')
 				.setDesc(
 					'Enter the description for each field in the additional API JSON template'
 				)
@@ -304,7 +288,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 				)
 
 			new Setting(containerEl)
-				.setName('Additional API Content Attribute Name')
+				.setName('Additional API content attribute name')
 				.setDesc(
 					'Enter the attribute name for the content field for the additional API'
 				)
@@ -318,10 +302,12 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 						})
 				)
 
-			containerEl.createEl('h2', { text: 'Additional Call api Image Settings' })
+			new Setting(containerEl)
+				.setName('Additional call API image settings')
+				.setHeading()
 
 			new Setting(containerEl)
-				.setName('Enable Additional Call API Image')
+				.setName('Enable additional call API image')
 				.setDesc('Toggle the additional Call API image')
 				.addToggle(toggle =>
 					toggle
@@ -350,7 +336,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 				})
 
 				new Setting(containerEl)
-					.setName('Additional Call API Image Full Path Property')
+					.setName('Additional call API image full path property')
 					.setDesc(
 						'Enter the full path property for the additional Call API image in the final call'
 					)
@@ -365,12 +351,12 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 					)
 			}
 
-			containerEl.createEl('h2', {
-				text: 'Additional Call API Gallery Settings',
-			})
+			new Setting(containerEl)
+				.setName('Additional call API gallery settings')
+				.setHeading()
 
 			new Setting(containerEl)
-				.setName('Enable Additional Call API Gallery')
+				.setName('Enable additional call API gallery')
 				.setDesc('Toggle the additional Call API gallery')
 				.addToggle(toggle =>
 					toggle
@@ -399,7 +385,7 @@ export class StrapiExporterSettingTab extends PluginSettingTab {
 				})
 
 				new Setting(containerEl)
-					.setName('Additional Call API Gallery Full Path Property')
+					.setName('Additional call API gallery full path property')
 					.setDesc(
 						'Enter the full path property for the additional Call API gallery in the final call'
 					)

package/src/utils/image-processor.ts

@@ -256,26 +256,24 @@ export async function processMarkdownContent(
 
 	new Notice('Article content generated successfully!')
 	try {
-		const response = await fetch(
-			useAdditionalCallAPI
+		const response = await this.app.requestUrl({
+			url: useAdditionalCallAPI
 				? settings.additionalUrl
 				: settings.strapiArticleCreateUrl,
-			{
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-					Authorization: `Bearer ${settings.strapiApiToken}`,
-				},
-				body: JSON.stringify(articleContent),
-			}
-		)
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+				Authorization: `Bearer ${settings.strapiApiToken}`,
+			},
+			body: JSON.stringify(articleContent),
+		})
 
-		if (response.ok) {
+		if (response.status === 200) {
 			new Notice(
 				'Check your API content now, the article is created & uploaded! 🎉'
 			)
 		} else {
-			const errorData = await response.json()
+			const errorData = await response.json
 			new Notice(
 				`Failed to create article in Strapi. Error: ${errorData.error.message}`
 			)

package/src/utils/strapi-uploader.ts

@@ -31,7 +31,8 @@ export async function uploadImagesToStrapi(
 		)
 
 		try {
-			const response = await fetch(`${settings.strapiUrl}/api/upload`, {
+			const response = await this.app.requestUrl({
+				url: `${settings.strapiUrl}/api/upload`,
 				method: 'POST',
 				headers: {
 					Authorization: `Bearer ${settings.strapiApiToken}`,
@@ -39,15 +40,15 @@ export async function uploadImagesToStrapi(
 				body: formData,
 			})
 
-			if (response.ok) {
-				const data = await response.json()
+			if (response.status === 200) {
+				const data = await response.json
 				uploadedImages[imageDescription.name] = {
 					url: data[0].url,
 					data: data[0],
 					id: data[0].id,
 				}
 			} else {
-				const errorData = await response.json()
+				const errorData = await response.json
 				new Notice(
 					`Failed to upload image: ${imageDescription.name}. Error: ${errorData.error.message}`
 				)
@@ -94,7 +95,8 @@ export async function uploadGalleryImagesToStrapi(
 		formData.append('files', imageBlob.blob, imageBlob.name)
 
 		try {
-			const response = await fetch(`${settings.strapiUrl}/api/upload`, {
+			const response = await this.app.requestUrl({
+				url: `${settings.strapiUrl}/api/upload`,
 				method: 'POST',
 				headers: {
 					Authorization: `Bearer ${settings.strapiApiToken}`,
@@ -102,15 +104,15 @@ export async function uploadGalleryImagesToStrapi(
 				body: formData,
 			})
 
-			if (response.ok) {
-				const data = await response.json()
+			if (response.status === 200) {
+				const data = await response.json
 				uploadedImages[imageBlob.name] = {
 					url: data[0].url,
 					id: data[0].id,
 					data: data[0],
 				}
 			} else {
-				const errorData = await response.json()
+				const errorData = await response.json
 				new Notice(
 					`Failed to upload gallery image: ${imageBlob.name}. Error: ${errorData.error.message}`
 				)

package/versions.json

@@ -14,5 +14,6 @@
 	"1.0.15": "1.5.0",
 	"1.0.16": "1.5.0",
 	"1.0.17": "1.5.0",
-	"1.0.18": "1.5.0"
+	"1.0.18": "1.5.0",
+	"1.0.19": "1.5.0"
 }