usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(frontend): fix type errors

This commit is contained in:
syuilo 2025-07-06 20:47:31 +09:00
parent 288f0abeac
commit c4fdf5a47c
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/frontend/src/types/post-form.ts
View File

@ -6,9 +6,9 @@
import * as Misskey from 'misskey-js';
export interface PostFormProps {
reply?: Misskey.entities.Note;
renote?: Misskey.entities.Note;
channel?: Misskey.entities.Channel; // TODO
reply?: Misskey.entities.Note | null;
renote?: Misskey.entities.Note | null;
channel?: Misskey.entities.Channel | null; // TODO
mention?: Misskey.entities.User;
specified?: Misskey.entities.UserDetailed;
initialText?: string;

29
packages/frontend/src/utility/get-note-menu.ts
View File

@ -180,6 +180,7 @@ export function getNoteMenu(props: {
currentClip?: Misskey.entities.Clip;
}) {
const appearNote = getAppearNote(props.note);
const link = appearNote.url ?? appearNote.uri;
const cleanups = [] as (() => void)[];
@ -189,6 +190,7 @@ export function getNoteMenu(props: {
text: i18n.ts.noteDeleteConfirm,
}).then(({ canceled }) => {
if (canceled) return;
if ($i == null) return;
misskeyApi('notes/delete', {
noteId: appearNote.id,
@ -208,6 +210,7 @@ export function getNoteMenu(props: {
text: i18n.ts.deleteAndEditConfirm,
}).then(({ canceled }) => {
if (canceled) return;
if ($i == null) return;
misskeyApi('notes/delete', {
noteId: appearNote.id,
@ -317,22 +320,25 @@ export function getNoteMenu(props: {
action: copyContent,
}, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink));
if (appearNote.url || appearNote.uri) {
if (link) {
menuItems.push({
icon: 'ti ti-link',
text: i18n.ts.copyRemoteLink,
action: () => {
copyToClipboard(appearNote.url ?? appearNote.uri);
copyToClipboard(link);
},
}, {
icon: 'ti ti-external-link',
text: i18n.ts.showOnRemote,
action: () => {
window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener');
window.open(link, '_blank', 'noopener');
},
});
} else {
menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
const embedMenu = getNoteEmbedCodeMenu(appearNote, i18n.ts.embed);
if (embedMenu != null) {
menuItems.push(embedMenu);
}
}
if (isSupportShare()) {
@ -475,22 +481,25 @@ export function getNoteMenu(props: {
action: copyContent,
}, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink));
if (appearNote.url || appearNote.uri) {
if (link != null) {
menuItems.push({
icon: 'ti ti-link',
text: i18n.ts.copyRemoteLink,
action: () => {
copyToClipboard(appearNote.url ?? appearNote.uri);
copyToClipboard(link);
},
}, {
icon: 'ti ti-external-link',
text: i18n.ts.showOnRemote,
action: () => {
window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener');
window.open(link, '_blank', 'noopener');
},
});
} else {
menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
const embedMenu = getNoteEmbedCodeMenu(appearNote, i18n.ts.embed);
if (embedMenu != null) {
menuItems.push(embedMenu);
}
}
}
@ -625,7 +634,7 @@ export function getRenoteMenu(props: {
});
}
},
}, (props.mock) ? undefined : {
}, ...(props.mock ? [] : [{
text: i18n.ts.quote,
icon: 'ti ti-quote',
action: () => {
@ -633,7 +642,7 @@ export function getRenoteMenu(props: {
renote: appearNote,
});
},
}]);
}])]);
normalExternalChannelRenoteItems.push({
type: 'parent',