Merge tag '2023.12.0-beta.5' into merge-upstream

This commit is contained in:
riku6460 2023-12-21 07:03:04 +09:00
commit 00c9e43861
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
150 changed files with 4706 additions and 2076 deletions

View file

@ -463,7 +463,7 @@ function showRenoteMenu(viaKeyboard = false): void {
pleaseLogin();
os.popupMenu([
getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
null,
{ type: 'divider' },
getUnrenote(),
], renoteTime.value, {
viaKeyboard: viaKeyboard,
@ -471,7 +471,7 @@ function showRenoteMenu(viaKeyboard = false): void {
} else {
os.popupMenu([
getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
null,
{ type: 'divider' },
getAbuseNoteMenu(note.value, i18n.ts.reportAbuseRenote),
$i.isModerator || $i.isAdmin ? getUnrenote() : undefined,
], renoteTime.value, {