Merge pull request #7 from jamesmagoo/client-improvements

Add publish as draft (kind 30024) feature

main.ts

@@ -193,15 +193,15 @@ export default class NostrWriterPlugin extends Plugin {
 	async checkAndPublish() {
 		if (!this.settings.privateKey) {
 			new Notice(
-				`Please set your private key in the Nostr Writer Plugin settings before publishing.`
+				`🔑 Please set your private key in the Nostr Writer Plugin settings before publishing.`
 			);
 			return;
 		}
 		const activeFile = this.app.workspace.getActiveFile();
 		if (activeFile) {
 			const fileContent: string = await this.app.vault.read(activeFile);
 			if (this.isEmptyContent(fileContent)) {
-				new Notice("The note is empty and cannot be published.");
+				new Notice("❌ The note is empty and cannot be published.");
 				return;
 			}
 			if (this.nostrService.getConnectionStatus()) {
@@ -212,10 +212,10 @@ export default class NostrWriterPlugin extends Plugin {
 					this
 				).open();
 			} else {
-				new Notice(`Please connect to Nostr before publishing.`);
+				new Notice(`❗️ Please connect to Nostr before publishing.`);
 			}
 		} else {
-			new Notice("No note is currently active. Click into a note.");
+			new Notice("❗️ No note is currently active. Click into a note.");
 		}
 	}
 
@@ -228,7 +228,7 @@ export default class NostrWriterPlugin extends Plugin {
 					(evt: MouseEvent) => {
 						if (!this.settings.privateKey) {
 							new Notice(
-								`Please set your private key in the Nostr Writer Plugin settings before publishing.`
+								`🔑 Please set your private key in the Nostr Writer Plugin settings before publishing.`
 							);
 							return;
 						}
@@ -241,7 +241,7 @@ export default class NostrWriterPlugin extends Plugin {
 							return;
 						} else {
 							new Notice(
-								`Please connect to Nostr before publishing.`
+								`❗️ Please connect to Nostr before publishing.`
 							);
 						}
 					}
@@ -264,7 +264,7 @@ export default class NostrWriterPlugin extends Plugin {
 				});
 				this.statusBar.addEventListener("click", () => {
 					this.nostrService.connectToRelays();
-					new Notice("Re-connecting to Nostr..");
+					new Notice("⚡️ Re-connecting to Nostr..");
 				});
 			}
 		} else if (this.statusBar) {

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "nostr-writer",
 	"name": "Nostr Writer",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"minAppVersion": "0.15.0",
 	"description": "Publish your writing directly to Nostr.",
 	"author": "jamesmagoo",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nostr-writer",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"description": "Publish your writing seamlessly to Nostr.",
 	"main": "main.js",
 	"scripts": {

src/ConfirmPublishModal.ts

@@ -126,12 +126,10 @@ export default class ConfirmPublishModal extends Modal {
 										return;
 									}
 
-									const maxSizeInBytes = 10 * 1024 * 1024; // 10 MB
-									// TODO only do this check for non-premium nostr build users..
-									//if (premiumImageStorageUser){
-									//	maxSizeInBytes = 100 * 1024 * 1024;
-									//}
-									// Option toggle in settings for user to indicate this ?
+									let maxSizeInBytes = 10 * 1024 * 1024; // 10 MB
+									if (this.plugin.settings.premiumStorageEnabled) {
+										maxSizeInBytes = 100 * 1024 * 1024;
+									}
 									if (file.size > maxSizeInBytes) {
 										new Notice('❌ File size exceeds the limit. Please upload a smaller image.');
 										return;
@@ -221,20 +219,24 @@ export default class ConfirmPublishModal extends Modal {
 					dropdown.onChange(async (value) => {
 						selectedProfileKey = value;
 						new Notice(`${selectedProfileKey} selected`);
-						console.log(selectedProfileKey)
 					});
 				});
 		}
 
-		// TODO is this a featue I want to add? Why publish as a draft? Obsidian is the draft location.
-		// let x = new Setting(contentEl)
-		// 	.setName("Publish as a draft")
-		// 	.setDesc("Nostr clients allow you to edit your drafts later.")
-		// 	.addToggle((toggle) =>
-		// 		toggle.setValue(false).onChange(async (value) => {
-		// 			console.log("Toggled", value);
-		// 		})
-		// 	);
+		let publishAsDraft = false;
+		new Setting(contentEl)
+			.setName("Publish as a draft")
+			.setDesc("Nostr clients allow you to edit your drafts later.")
+			.addToggle((toggle) =>
+				toggle.setValue(false).onChange(async (value) => {
+					publishAsDraft = value;
+					if (publishAsDraft) {
+						new Notice(`🗒️ Publishing as a draft.`);
+					} else {
+						new Notice(`📜 Publishing as final.`);
+					}
+				})
+			);
 
 		contentEl.createEl("hr");
 
@@ -247,7 +249,7 @@ export default class ConfirmPublishModal extends Modal {
 			.setButtonText("Confirm and Publish")
 			.setCta()
 			.onClick(async () => {
-				if (confirm("Are you sure you want to publish this note to Nostr?")) {
+				if (confirm(`Are you sure you want to publish this note ${publishAsDraft ? "as a draft" : "publically" } to Nostr?`)) {
 					// Disable the button and change the text to show a loading state
 					publishButton.setButtonText("Publishing...").setDisabled(true);
 					setTimeout(async () => {
@@ -262,7 +264,8 @@ export default class ConfirmPublishModal extends Modal {
 								selectedBannerImage && selectedBannerImage.path ? selectedBannerImage.path : null,
 								title,
 								noteCategoryTags,
-								selectedProfileKey
+								selectedProfileKey,
+								publishAsDraft
 							);
 							if (res.success) {
 								setTimeout(() => {
@@ -312,8 +315,8 @@ export default class ConfirmPublishModal extends Modal {
 
 		function addTagAsPill(tag: string) {
 			if (tag.trim() === "") return;
-			noteCategoryTags.push(tag);
-			const pillElement = createPillElement(tag);
+			noteCategoryTags.push(tag.trim());
+			const pillElement = createPillElement(tag.trim());
 			pillsContainer.appendChild(pillElement);
 			tagsText.setValue("");
 		}

src/service/NostrService.ts

@@ -224,9 +224,14 @@ export default class NostrService {
 		imageBannerFilePath: string | null,
 		title: string,
 		userSelectedTags: string[],
-		profileNickname: string
+		profileNickname: string,
+		publishAsDraft: boolean
 	): Promise<{ success: boolean; publishedRelays: string[] }> {
-		console.log(`Publishing your note to Nostr...`);
+		if (!publishAsDraft) {
+			new Notice(`⏳ Publishing your note ${activeFile.name} to nostr...`)
+		} else {
+			new Notice(`⏳ Publishing your note ${activeFile.name} as a draft to nostr...`)
+		}
 
 		let profilePrivateKey = this.privateKey;
 		let profilePublicKey = this.publicKey;
@@ -248,14 +253,14 @@ export default class NostrService {
 			}
 
 			if (imageBannerFilePath !== null) {
-					new Notice("🖼️ Uploading Banner Image")
-					let imageUploadResult = await this.imageUploadService.uploadArticleBannerImage(imageBannerFilePath);
-					if (imageUploadResult !== null) {
-						tags.push(["image", imageUploadResult]);
-						new Notice("✅ Uploaded Banner Image")
-					} else {
-						new Notice("❌ Problem Uploading Banner Image..")
-					}
+				new Notice("🖼️ Uploading Banner Image")
+				let imageUploadResult = await this.imageUploadService.uploadArticleBannerImage(imageBannerFilePath);
+				if (imageUploadResult !== null) {
+					tags.push(["image", imageUploadResult]);
+					new Notice("✅ Uploaded Banner Image")
+				} else {
+					new Notice("❌ Problem Uploading Banner Image..")
+				}
 			} else {
 				console.info("No banner image...")
 			}
@@ -314,7 +319,7 @@ export default class NostrService {
 			}
 
 			let eventTemplate = {
-				kind: 30023,
+				kind: publishAsDraft ? 30024 : 30023,
 				created_at: timestamp,
 				tags: tags,
 				content: fileContent,

src/settings.ts

@@ -139,9 +139,7 @@ export class NostrWriterSettingTab extends PluginSettingTab {
 					.setValue(this.plugin.settings.premiumStorageEnabled)
 					.onChange(async (value) => {
 						this.plugin.settings.premiumStorageEnabled = value;
-						new Notice(
-							`✅ Premium image user mode ${value ? "enabled" : "disabled"}`
-						);
+						new Notice( `✅ Premium image user mode ${value ? "enabled" : "disabled"}`);
 						await this.plugin.saveSettings();
 						this.refreshDisplay();
 					})