diff --git a/package.json b/package.json index 523de81f4..cad3851fc 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/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, 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 { } 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 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); +}