b562e86e4b (diff-717ec8c25ed5a94845484eac4c62a3c7b93e341a757c5cf491f2ecb746d25879)

src/client/pages/share.vue

@@ -94,7 +94,9 @@ export default defineComponent({
 		if (localOnly === '0') this.localOnly = false;
 		else if (localOnly === '1') this.localOnly = true;
 
-		await Promise.all([(async () => {
+
+		try {
+			//#region Reply
 			const replyId = urlParams.get('replyId');
 			const replyUri = urlParams.get('replyUri');
 			if (replyId) {
@@ -109,33 +111,40 @@ export default defineComponent({
 					this.reply = obj.object;
 				}
 			}
-		})(),(async () => {
+			//#endregion
-			const renoteId = urlParams.get('renoteId');
+
-			const renoteUri = urlParams.get('renoteUri');
+			//#region Renote
-			if (renoteId) {
+				const renoteId = urlParams.get('renoteId');
-				this.renote = await os.api('notes/show', {
+				const renoteUri = urlParams.get('renoteUri');
-					noteId: renoteId
+				if (renoteId) {
-				});
+					this.renote = await os.api('notes/show', {
-			} else if (renoteUri) {
+						noteId: renoteId
-				const obj = await os.api('ap/show', {
+					});
-					uri: renoteUri
+				} else if (renoteUri) {
-				}) as any;
+					const obj = await os.api('ap/show', {
-				if (obj.type === 'Note') {
+						uri: renoteUri
-					this.renote = obj.object;
+					}) as any;
+					if (obj.type === 'Note') {
+						this.renote = obj.object;
+					}
 				}
-			}
+			//#endregion
-		})(),(async () => {
+
-			const fileIds = urlParams.get('fileIds');
+			//#region Drive files
-			if (fileIds) {
+				const fileIds = urlParams.get('fileIds');
-				const promises = Promise.all(fileIds.split(',')
+				if (fileIds) {
-					.map(fileId => os.api('drive/files/show', { fileId }).catch(() => Error(`invalid fileId: ${fileId}`))));
+					const promises = Promise.all(fileIds.split(',')
-				await promises.then(files => this.files = files);
+						.map(fileId => os.api('drive/files/show', { fileId }).catch(() => Error(`invalid fileId: ${fileId}`))));
-			}
+					await promises.then(files => this.files = files);
-		})(),]).catch(e => os.dialog({
+				}
-			type: 'error',
+			//#endregion
-			title: e.message,
+		} catch (e) {
-			text: e.name
+			os.dialog({
-		}));
+				type: 'error',
+				title: e.message,
+				text: e.name
+			});
+		}
 
 		this.state = 'writing';
 	},