Skip to content

Commit 8bc0d52

Browse files
committed
Merge tag '2024.5.0-io.4d' into bun
2 parents 3d71895 + 5c12930 commit 8bc0d52

File tree

7 files changed

+16
-5
lines changed

7 files changed

+16
-5
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "misskey",
3-
"version": "2024.5.0-io.4c",
3+
"version": "2024.5.0-io.4d",
44
"codename": "nasubi",
55
"repository": {
66
"type": "git",

packages/backend/src/core/EmailService.ts

+6
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,12 @@ export class EmailService {
304304
reason: 'mx',
305305
};
306306
}
307+
if (json.mx_host?.some(host => this.utilityService.isBlockedHost(meta.bannedEmailDomains, host))) {
308+
return {
309+
valid: false,
310+
reason: 'mx',
311+
};
312+
}
307313

308314
return {
309315
valid: true,

packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
9999
} else if (ps.reportContentPattern === null) {
100100
properties.reportContentPattern = null;
101101
}
102-
if (ps.forward) properties.forward = ps.forward;
102+
if (ps.forward !== undefined) properties.forward = ps.forward;
103103
if (ps.expiresAt) {
104104
let expirationDate: Date | null = new Date();
105105
const previousMonth = expirationDate.getUTCMonth();

packages/frontend/src/components/MkAccountMoved.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ const props = defineProps<{
2727
movedFrom?: string; // user id
2828
}>();
2929

30-
misskeyApi('users/show', { userId: props.movedTo ?? props.movedFrom }).then(u => user.value = u);
30+
if (props.movedTo || props.movedFrom) {
31+
misskeyApi('users/show', {
32+
userId: props.movedTo ?? props.movedFrom
33+
}).then(u => user.value = u);
34+
}
3135
</script>
3236

3337
<style lang="scss" module>

packages/frontend/src/pages/admin-user.vue

+1
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ definePageMetadata(() => ({
709709
<style lang="scss" module>
710710
.ip {
711711
display: flex;
712+
word-break: break-all;
712713

713714
> :global(.date) {
714715
opacity: 0.7;

packages/frontend/src/store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ export const defaultStore = markRaw(new Storage('base', {
485485
},
486486
sound_note: {
487487
where: 'device',
488-
default: { type: 'syuilo/n-aec', volume: 1 } as SoundStore,
488+
default: { type: null, volume: 1 } as SoundStore,
489489
},
490490
sound_noteMy: {
491491
where: 'device',

packages/misskey-js/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "module",
33
"name": "misskey-js",
4-
"version": "2024.5.0-io.4c",
4+
"version": "2024.5.0-io.4d",
55
"description": "Misskey SDK for JavaScript",
66
"types": "./built/dts/index.d.ts",
77
"exports": {

0 commit comments

Comments
 (0)