Merge tag '2024.5.0-io.4d' into bun

MisskeyIO · Nov 14, 2024 · 8bc0d52 · 8bc0d52
2 parents 3d71895 + 5c12930
commit 8bc0d52
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git 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/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,

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
@@ -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();

diff --git 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>

diff --git 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;

diff --git 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',

diff --git 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": {