Merge branch 'develop' into feat-1714

2024-07-04 18:32:08 +09:00
parent 483cce1cc9 6dd2e9fc0b
commit aab4fa9394
116 changed files with 6003 additions and 4791 deletions
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -101,9 +101,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 	}

 	function reportAbuse() {
-		os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 			user: user,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	}

 	async function getConfirmed(text: string): Promise<boolean> {