From b87840e7332a806b9f76e767996d62a300373338 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 13 Feb 2021 03:19:54 +0900
Subject: [PATCH] wip

---
 src/client/pages/share.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/client/pages/share.vue b/src/client/pages/share.vue
index 24d6fed793..1fd96e2fd5 100644
--- a/src/client/pages/share.vue
+++ b/src/client/pages/share.vue
@@ -79,6 +79,16 @@ export default defineComponent({
 			this.visibility = visibility;
 		}
 
+		if (this.visibility === 'specified') {
+			const visibleUserIds = urlParams.get('visibleUserIds');
+			const visibleAccts = urlParams.get('visibleAccts');
+			this.visibleUsers = await [
+				...(visibleUserIds ? visibleUserIds.split(',').map(userId => ({ userId })) : []),
+				...(visibleAccts ? visibleAccts.split(',').map(parseAcct) : [])
+			].map(q => os.api('users/show', q)
+				.catch(() => Error(`invalid user query: ${JSON.stringify(q)}`)))
+		}
+
 		const localOnly = urlParams.get('localOnly');
 		if (localOnly === '0') this.localOnly = false;
 		else if (localOnly === '1') this.localOnly = true;
@@ -113,20 +123,6 @@ export default defineComponent({
 					this.renote = obj.object;
 				}
 			}
-		})(),(() => {
-			const visibleUserIds = urlParams.get('visibleUserIds');
-			if (!visibleUserIds) return;
-			return Promise.all(visibleUserIds.split(',')
-				.map(userId => os.api('users/show', { userId })
-					.then(user => this.visibleUsers.push(user))
-					.catch(() => Error(`invalid userId: ${userId}`))));
-		})(),(() => {
-			const visibleAccts = urlParams.get('visibleAccts');
-			if (!visibleAccts) return;
-			return Promise.all(visibleAccts.split(',')
-				.map(acct => os.api('users/show', parseAcct(acct))
-					.then(user => this.visibleUsers.push(user))
-					.catch(() => Error(`invalid acct: ${acct}`))));
 		})(),(async () => {
 			const fileIds = urlParams.get('fileIds');
 			if (fileIds) {