1
0
mirror of https://github.com/MisskeyIO/misskey synced 2024-11-23 22:56:49 +09:00

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

This commit is contained in:
あわわわとーにゅ 2024-11-15 02:39:53 +09:00
commit 8cd854f98f
No known key found for this signature in database
GPG Key ID: 6AFBBF529601C1DB
7 changed files with 16 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "2024.5.0-host.4c", "version": "2024.5.0-host.4d",
"codename": "nasubi", "codename": "nasubi",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -304,6 +304,12 @@ export class EmailService {
reason: 'mx', reason: 'mx',
}; };
} }
if (json.mx_host?.some(host => this.utilityService.isBlockedHost(meta.bannedEmailDomains, host))) {
return {
valid: false,
reason: 'mx',
};
}
return { return {
valid: true, valid: true,

View File

@ -99,7 +99,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
} else if (ps.reportContentPattern === null) { } else if (ps.reportContentPattern === null) {
properties.reportContentPattern = null; properties.reportContentPattern = null;
} }
if (ps.forward) properties.forward = ps.forward; if (ps.forward !== undefined) properties.forward = ps.forward;
if (ps.expiresAt) { if (ps.expiresAt) {
let expirationDate: Date | null = new Date(); let expirationDate: Date | null = new Date();
const previousMonth = expirationDate.getUTCMonth(); const previousMonth = expirationDate.getUTCMonth();

View File

@ -27,7 +27,11 @@ const props = defineProps<{
movedFrom?: string; // user id 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> </script>
<style lang="scss" module> <style lang="scss" module>

View File

@ -709,6 +709,7 @@ definePageMetadata(() => ({
<style lang="scss" module> <style lang="scss" module>
.ip { .ip {
display: flex; display: flex;
word-break: break-all;
> :global(.date) { > :global(.date) {
opacity: 0.7; opacity: 0.7;

View File

@ -485,7 +485,7 @@ export const defaultStore = markRaw(new Storage('base', {
}, },
sound_note: { sound_note: {
where: 'device', where: 'device',
default: { type: 'syuilo/n-aec', volume: 1 } as SoundStore, default: { type: null, volume: 1 } as SoundStore,
}, },
sound_noteMy: { sound_noteMy: {
where: 'device', where: 'device',

View File

@ -1,7 +1,7 @@
{ {
"type": "module", "type": "module",
"name": "misskey-js", "name": "misskey-js",
"version": "2024.5.0-host.4c", "version": "2024.5.0-host.4d",
"description": "Misskey SDK for JavaScript", "description": "Misskey SDK for JavaScript",
"types": "./built/dts/index.d.ts", "types": "./built/dts/index.d.ts",
"exports": { "exports": {