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

fix

This commit is contained in:
tamaina 2023-07-30 11:14:02 +00:00
parent be2e596027
commit 911c368d05
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/frontend/src/scripts/entity-manager.ts
View File

@ -47,7 +47,7 @@ type CachedNoteSource = Ref<OmittedNote | null>;
type CachedNote = ComputedRef<Note | null>; type CachedNote = ComputedRef<Note | null>;
type InterruptedCachedNote = Ref<Note | null>; type InterruptedCachedNote = Ref<Note | null>;
export function isRenote(note: Note | OmittedNote): boolean { export function isRenote(note: Note | OmittedNote | null): boolean {
return note != null && return note != null &&
note.renoteId != null && note.renoteId != null &&
note.text == null && note.text == null &&
@ -205,13 +205,13 @@ export class NoteManager {
*/ */
public getNoteViewBase(id: string) { public getNoteViewBase(id: string) {
const { interruptedNote: note, interruptorUnwatch, executeInterruptor } = this.getInterrupted(id); const { interruptedNote: note, interruptorUnwatch, executeInterruptor } = this.getInterrupted(id);
const isRenote = computed(() => isRenote(note.value)); const noteIsRenote = computed(() => isRenote(note.value));
const isMyRenote = computed(() => $i && ($i.id === note.value?.userId)); const isMyRenote = computed(() => noteIsRenote.value && $i && ($i.id === note.value?.userId));
const appearNote = computed(() => (isRenote.value ? note.value?.renote : note.value) ?? null); const appearNote = computed(() => (noteIsRenote.value ? note.value?.renote : note.value) ?? null);
return { return {
note, interruptorUnwatch, executeInterruptor, note, interruptorUnwatch, executeInterruptor,
isRenote, isMyRenote, appearNote, isRenote: noteIsRenote, isMyRenote, appearNote,
urls: computed(() => appearNote.value?.text ? extractUrlFromMfm(mfm.parse(appearNote.value.text)) : null), urls: computed(() => appearNote.value?.text ? extractUrlFromMfm(mfm.parse(appearNote.value.text)) : null),
isLong: computed(() => appearNote.value ? shouldCollapsed(appearNote.value) : false), isLong: computed(() => appearNote.value ? shouldCollapsed(appearNote.value) : false),
canRenote: computed(() => (!!appearNote.value && !!$i) && (['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i.id)), canRenote: computed(() => (!!appearNote.value && !!$i) && (['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i.id)),