wip

src/client/pages/instance/settings.vue

@@ -453,6 +453,7 @@ export default defineComponent({
 
 		addPinUser() {
 			os.modal(MkUserSelect, {}).then(user => {
+				if (user == null) return;
 				this.pinnedUsers = this.pinnedUsers.trim();
 				this.pinnedUsers += '\n@' + getAcct(user);
 				this.pinnedUsers = this.pinnedUsers.trim();
@@ -461,6 +462,7 @@ export default defineComponent({
 
 		chooseProxyAccount() {
 			os.modal(MkUserSelect, {}).then(user => {
+				if (user == null) return;
 				this.proxyAccount = user;
 				this.proxyAccountId = user.id;
 				this.save(true);

src/client/pages/my-settings/api.vue

@@ -26,7 +26,9 @@ export default defineComponent({
 	},
 	methods: {
 		async generateToken() {
-			os.modal(await import('@/components/token-generate-window.vue'), {}).then(async ({ name, permissions }) => {
+			os.modal(await import('@/components/token-generate-window.vue'), {}).then(async result => {
+				if (result == null) return;
+				const { name, permissions } = result;
 				const { token } = await os.api('miauth/gen-token', {
 					session: null,
 					name: name,

src/client/pages/my-settings/reaction.vue

@@ -58,14 +58,11 @@ export default defineComponent({
 		},
 
 		preview(ev) {
-			const picker = os.modal(MkReactionPicker, {
+			os.modal(MkReactionPicker, {
 				source: ev.currentTarget || ev.target,
 				reactions: this.splited,
 				showFocus: false,
 			});
-			picker.$once('chosen', reaction => {
-				picker.close();
-			});
 		},
 
 		setDefault() {

src/client/pages/preferences/plugins.vue

@@ -123,7 +123,9 @@ export default defineComponent({
 					information: this.$t('pluginTokenRequestedDescription'),
 					initialName: name,
 					initialPermissions: permissions
-				}).then(async ({ name, permissions }) => {
+				}).then(async result => {
+					if (result == null) return;
+					const { name, permissions } = result;
 					const { token } = await os.api('miauth/gen-token', {
 						session: null,
 						name: name,