Merge branch 'develop' into feat-1714

This commit is contained in:
かっこかり 2024-07-15 10:11:15 +09:00 committed by GitHub
commit 8d144c8fdc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
85 changed files with 1222 additions and 831 deletions

View file

@ -197,7 +197,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
copyToClipboard(`${url}/${canonical}`);
},
}, {
}, ...($i ? [{
icon: 'ti ti-mail',
text: i18n.ts.sendMessage,
action: () => {
@ -270,7 +270,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
},
}));
},
}] as any;
}] : [])] as any;
if ($i && meId !== user.id) {
if (iAmModerator) {