Merge branch 'notification-read-api' into swn

packages/client/package.json

@@ -106,6 +106,7 @@
 		"punycode": "2.1.1",
 		"pureimage": "0.3.5",
 		"qrcode": "1.4.4",
+		"querystring": "0.2.1",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"reflect-metadata": "0.1.13",

packages/client/src/components/reactions-viewer.details.vue

@@ -6,21 +6,11 @@
 			<div class="name">{{ reaction.replace('@.', '') }}</div>
 		</div>
 		<div class="users">
-			<template v-if="users.length <= 10">
-				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
-					<MkAvatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
-					<br/>
-					<MkUserName :user="u" :nowrap="false" style="line-height: 24px;"/>
-				</b>
-			</template>
-			<template v-if="10 < users.length">
-				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
-					<MkAvatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
-					<br/>
-					<MkUserName :user="u" :nowrap="false" style="line-height: 24px;"/>
-				</b>
-				<span slot="omitted">+{{ count - 10 }}</span>
-			</template>
+			<div class="user" v-for="u in users" :key="u.id">
+				<MkAvatar class="avatar" :user="u"/>
+				<MkUserName class="name" :user="u" :nowrap="true"/>
+			</div>
+			<div v-if="users.length > 10" class="omitted">+{{ count - 10 }}</div>
 		</div>
 	</div>
 </MkTooltip>
@@ -81,13 +71,31 @@ export default defineComponent({
 	}
 
 	> .users {
-		display: flex;
 		flex: 1;
 		min-width: 0;
 		font-size: 0.9em;
 		border-left: solid 0.5px var(--divider);
 		padding-left: 10px;
 		margin-left: 10px;
+		margin-right: 14px;
+		text-align: left;
+
+		> .user {
+			line-height: 24px;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+
+			&:not(:last-child) {
+				margin-bottom: 3px;
+			}
+
+			> .avatar {
+				width: 24px;
+				height: 24px;
+				margin-right: 3px;
+			}
+		}
 	}
 }
 </style>

packages/client/src/components/renote.details.vue

@@ -1,11 +1,11 @@
 <template>
-<MkTooltip :source="source" ref="tooltip" @closed="$emit('closed')" :max-width="340">
-	<div class="renoteTooltip">
-		<b v-for="u in users" :key="u.id">
-			<MkAvatar :user="u" style="width: 24px; height: 24px;"/><br/>
-			<MkUserName :user="u" :nowrap="false" style="line-height: 24px;"/>
-		</b>
-		<span v-if="users.length < count" slot="omitted">+{{ count - users.length }}</span>
+<MkTooltip :source="source" ref="tooltip" @closed="$emit('closed')" :max-width="250">
+	<div class="beaffaef">
+		<div class="user" v-for="u in users" :key="u.id">
+			<MkAvatar class="avatar" :user="u"/>
+			<MkUserName class="name" :user="u" :nowrap="true"/>
+		</div>
+		<div v-if="users.length < count" class="omitted">+{{ count - users.length }}</div>
 	</div>
 </MkTooltip>
 </template>
@@ -36,11 +36,25 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.renoteTooltip {
-	display: flex;
-	flex: 1;
-	min-width: 0;
+.beaffaef {
 	font-size: 0.9em;
-	gap: 12px;
+	text-align: left;
+
+	> .user {
+		line-height: 24px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+
+		&:not(:last-child) {
+			margin-bottom: 3px;
+		}
+
+		> .avatar {
+			width: 24px;
+			height: 24px;
+			margin-right: 3px;
+		}
+	}
 }
 </style>

packages/client/src/init.ts

@@ -42,10 +42,6 @@ import { getAccountFromId } from '@/scripts/get-account-from-id';
 
 console.info(`Misskey v${version}`);
 
-// boot.jsのやつを解除
-window.onerror = null;
-window.onunhandledrejection = null;
-
 if (_DEV_) {
 	console.warn('Development mode!!!');
 
@@ -223,6 +219,10 @@ const rootEl = document.createElement('div');
 document.body.appendChild(rootEl);
 app.mount(rootEl);
 
+// boot.jsのやつを解除
+window.onerror = null;
+window.onunhandledrejection = null;
+
 reactionPicker.init();
 
 if (splash) {

packages/client/src/pages/settings/delete-account.vue

@@ -45,6 +45,15 @@ export default defineComponent({
 
 	methods: {
 		async deleteAccount() {
+			{
+				const { canceled } = await os.dialog({
+					type: 'warning',
+					text: this.$ts.deleteAccountConfirm,
+					showCancelButton: true
+				});
+				if (canceled) return;
+			}
+
 			const { canceled, result: password } = await os.dialog({
 				title: this.$ts.password,
 				input: {

packages/client/yarn.lock

@@ -5237,6 +5237,11 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+querystring@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
+  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
+
 quick-lru@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"