From 43f0b9a73cc97c2587a9fd702086859d36fc6647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 10 Nov 2024 13:03:18 +0900
Subject: [PATCH 1/6] =?UTF-8?q?fix(about-report-resolver):=20=E8=BB=A2?=
 =?UTF-8?q?=E9=80=81=E8=A8=AD=E5=AE=9A=E3=82=92=E4=B8=80=E5=BA=A6=E6=9C=89?=
 =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=99=E3=82=8B=E3=81=A8=E6=88=BB=E3=81=99?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(MisskeyIO#812)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-picked from atsu1125/misskey-core@5001b4b77c8e12818e6c039d61b95eaea1b55be7

Co-authored-by: atsu1125 <atsuchan@atsuchan.page>
---
 .../server/api/endpoints/admin/abuse-report-resolver/update.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts
index ab77109c8..8bc724cf0 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts
@@ -99,7 +99,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			} else if (ps.reportContentPattern === null) {
 				properties.reportContentPattern = null;
 			}
-			if (ps.forward) properties.forward = ps.forward;
+			if (ps.forward !== undefined) properties.forward = ps.forward;
 			if (ps.expiresAt) {
 				let expirationDate: Date | null = new Date();
 				const previousMonth = expirationDate.getUTCMonth();

From a761b2e6cee37f7a7fef9429158715a9bdd4cc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 10 Nov 2024 13:03:38 +0900
Subject: [PATCH 2/6] =?UTF-8?q?fix(frontend):=20=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=9A=E3=83=BC=E3=82=B8=E9=96=B2=E8=A6=A7?=
 =?UTF-8?q?=E6=99=82=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(MisskeyIO#813)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkAccountMoved.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkAccountMoved.vue b/packages/frontend/src/components/MkAccountMoved.vue
index 594e5ab7e..1349df7bf 100644
--- a/packages/frontend/src/components/MkAccountMoved.vue
+++ b/packages/frontend/src/components/MkAccountMoved.vue
@@ -27,7 +27,11 @@ const props = defineProps<{
 	movedFrom?: string; // user id
 }>();
 
-misskeyApi('users/show', { userId: props.movedTo ?? props.movedFrom }).then(u => user.value = u);
+if (props.movedTo || props.movedFrom) {
+	misskeyApi('users/show', {
+		userId: props.movedTo ?? props.movedFrom
+	}).then(u => user.value = u);
+}
 </script>
 
 <style lang="scss" module>

From da43ac01a8cd1ba5a4371e11376b30c86734ab25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:04:31 +0900
Subject: [PATCH 3/6] =?UTF-8?q?spec(Email/Verifymail):=20MX=E3=83=AC?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E3=83=89=E3=83=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=81=AB=E3=82=82BAN=E3=81=8C=E9=81=A9=E7=94=A8?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(Missk?=
 =?UTF-8?q?eyIO#814)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/EmailService.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts
index 79e6ea4ef..1852536a8 100644
--- a/packages/backend/src/core/EmailService.ts
+++ b/packages/backend/src/core/EmailService.ts
@@ -304,6 +304,12 @@ export class EmailService {
 				reason: 'mx',
 			};
 		}
+		if (json.mx_host?.some(host => this.utilityService.isBlockedHost(meta.bannedEmailDomains, host))) {
+			return {
+				valid: false,
+				reason: 'mx',
+			};
+		}
 
 		return {
 			valid: true,

From aec01dd4adda8e975da523c5bea329120e689569 Mon Sep 17 00:00:00 2001
From: sleep-moe <yukikum57@gmail.com>
Date: Thu, 14 Nov 2024 22:05:03 +0900
Subject: [PATCH 4/6] =?UTF-8?q?fix(frontend):=20=E3=82=B9=E3=83=9E?=
 =?UTF-8?q?=E3=83=9B=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=9F=E6=99=82?=
 =?UTF-8?q?=E3=81=ABipv6=E3=81=A0=E3=81=A8=E3=81=AF=E3=81=BF=E5=87=BA?=
 =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(MisskeyIO#815)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/admin-user.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index aae2b77ce..b4e58d99f 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -709,6 +709,7 @@ definePageMetadata(() => ({
 <style lang="scss" module>
 .ip {
 	display: flex;
+	word-break: break-all;
 
 	> :global(.date) {
 		opacity: 0.7;

From 63122f85c2040dedbd8598cc0c66116740323778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 14 Nov 2024 22:05:22 +0900
Subject: [PATCH 5/6] =?UTF-8?q?spec(sound/note):=20=E3=83=87=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=88=E3=81=AE=E4=BB=96=E4=BA=BA=E3=81=AE?=
 =?UTF-8?q?=E6=8A=95=E7=A8=BF=E3=81=AE=E5=8A=B9=E6=9E=9C=E9=9F=B3=E3=82=92?=
 =?UTF-8?q?=E3=82=AA=E3=83=95=E3=81=AB=20(MisskeyIO#816)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 8ed9de227..4811e423a 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -485,7 +485,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	sound_note: {
 		where: 'device',
-		default: { type: 'syuilo/n-aec', volume: 1 } as SoundStore,
+		default: { type: null, volume: 1 } as SoundStore,
 	},
 	sound_noteMy: {
 		where: 'device',

From 5c129305311c32bdf862358c1a1f1979432324a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 15 Nov 2024 02:35:38 +0900
Subject: [PATCH 6/6] Bump up version to 2024.5.0-io.4d (MisskeyIO#817)

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ef408fbe6..92eacd697 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.4c",
+	"version": "2024.5.0-io.4d",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index b7d9e5cab..42c5374ef 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-io.4c",
+	"version": "2024.5.0-io.4d",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {