From 2267e90d3bfb9ac51ed6dcdaee051c39c594bd19 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 25 Mar 2024 03:12:59 +0900
Subject: [PATCH] refactor (client): await asynchronous processes, remove
 duplicate code

---
 packages/client/src/components/MkPostForm.vue | 99 +++++++------------
 1 file changed, 35 insertions(+), 64 deletions(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index ad8c4c5ba3..6478838f4e 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -309,6 +309,8 @@ import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XNotePreview from "@/components/MkNotePreview.vue";
 import XPostFormAttaches from "@/components/MkPostFormAttaches.vue";
 import XPollEditor from "@/components/MkPollEditor.vue";
+import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
+import XMediaCaption from "@/components/MkMediaCaption.vue";
 import { host, url } from "@/config";
 import { erase, unique } from "@/scripts/array";
 import { extractMentions } from "@/scripts/extract-mentions";
@@ -325,7 +327,6 @@ import { getAccounts, openAccountMenu as openAccountMenu_ } from "@/account";
 import { me } from "@/me";
 import { uploadFile } from "@/scripts/upload";
 import { deepClone } from "@/scripts/clone";
-import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
 import preprocess from "@/scripts/preprocess";
 import { vibrate } from "@/scripts/vibrate";
 import { langmap } from "@/scripts/langmap";
@@ -500,7 +501,7 @@ const withHashtags = computed(
 );
 const hashtags = computed(defaultStore.makeGetterSetter("postFormHashtags"));
 
-let firstTryPost = true;
+let isFirstPostAttempt = true;
 
 watch(text, () => {
 	checkMissingMention();
@@ -1012,6 +1013,34 @@ function deleteDraft() {
 	localStorage.setItem("drafts", JSON.stringify(draftData));
 }
 
+async function openFileDescriptionWindow(file: DriveFile) {
+	await os.popup(
+		XMediaCaption,
+		{
+			title: i18n.ts.describeFile,
+			input: {
+				placeholder: i18n.ts.inputNewDescription,
+				default: file.comment !== null ? file.comment : "",
+			},
+			image: file,
+		},
+		{
+			done: (result) => {
+				if (!result || result.canceled) return;
+				const comment =
+					result.result.length === 0 ? null : result.result;
+				os.api("drive/files/update", {
+					fileId: file.id,
+					comment,
+				}).then(() => {
+					file.comment = comment;
+				});
+			},
+		},
+		"closed",
+	);
+}
+
 async function post() {
 	// For text that is too short, the false positive rate may be too high, so we don't show alarm.
 	if (defaultStore.state.autocorrectNoteLanguage && text.value.length > 10) {
@@ -1050,42 +1079,13 @@ async function post() {
 		defaultStore.state.showNoAltTextWarning &&
 		files.value.some((f) => f.comment == null || f.comment.length === 0)
 	) {
-		if (firstTryPost) {
+		if (isFirstPostAttempt) {
 			for (const file of files.value) {
 				if (file.comment == null || file.comment.length === 0) {
-					os.popup(
-						defineAsyncComponent(
-							() => import("@/components/MkMediaCaption.vue"),
-						),
-						{
-							title: i18n.ts.describeFile,
-							input: {
-								placeholder: i18n.ts.inputNewDescription,
-								default:
-									file.comment !== null ? file.comment : "",
-							},
-							image: file,
-						},
-						{
-							done: (result) => {
-								if (!result || result.canceled) return;
-								const comment =
-									result.result.length === 0
-										? null
-										: result.result;
-								os.api("drive/files/update", {
-									fileId: file.id,
-									comment,
-								}).then(() => {
-									file.comment = comment;
-								});
-							},
-						},
-						"closed",
-					);
+					await openFileDescriptionWindow(file);
 				}
 			}
-			firstTryPost = false;
+			isFirstPostAttempt = false;
 			return;
 		}
 
@@ -1101,36 +1101,7 @@ async function post() {
 		if (!canceled) {
 			for (const file of files.value) {
 				if (file.comment == null || file.comment.length === 0) {
-					os.popup(
-						defineAsyncComponent(
-							() => import("@/components/MkMediaCaption.vue"),
-						),
-						{
-							title: i18n.ts.describeFile,
-							input: {
-								placeholder: i18n.ts.inputNewDescription,
-								default:
-									file.comment !== null ? file.comment : "",
-							},
-							image: file,
-						},
-						{
-							done: (result) => {
-								if (!result || result.canceled) return;
-								const comment =
-									result.result.length === 0
-										? null
-										: result.result;
-								os.api("drive/files/update", {
-									fileId: file.id,
-									comment,
-								}).then(() => {
-									file.comment = comment;
-								});
-							},
-						},
-						"closed",
-					);
+					await openFileDescriptionWindow(file);
 				}
 			}
 			return;