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

✌️

This commit is contained in:
tamaina 2023-08-06 16:36:18 +00:00
parent 2d0d87c8c0
commit 366dce1758
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,16 +155,26 @@ export class NoteManager {
this.notesComputed.set(id, computed<Note | null>(() => { this.notesComputed.set(id, computed<Note | null>(() => {
if (this.isDebuggerEnabled) console.log('NoteManager: compute note', id, note.value); if (this.isDebuggerEnabled) console.log('NoteManager: compute note', id, note.value);
if (!note.value) return null; if (!note.value) {
if (this.isDebuggerEnabled) console.log('NoteManager: compute note: source is null', id);
return null;
}
const user = userLiteManager.get(note.value.userId)!; const user = userLiteManager.get(note.value.userId)!;
const renote = note.value.renoteId ? this.get(note.value.renoteId) : undefined; const renote = note.value.renoteId ? this.get(note.value.renoteId) : undefined;
// renoteが削除されている場合はCASCADE削除されるためnullを返す // renoteが削除されている場合はCASCADE削除されるためnullを返す
if (renote && !renote.value) return null; if (renote && !renote.value) {
if (this.isDebuggerEnabled) console.log('NoteManager: compute note: renote is null', id, note.value.renoteId);
return null;
}
const reply = note.value.replyId ? this.get(note.value.replyId) : undefined; const reply = note.value.replyId ? this.get(note.value.replyId) : undefined;
if (reply && !reply.value) return null; // replyが削除されている場合はCASCADE削除されるためnullを返す
if (reply && !reply.value) {
if (this.isDebuggerEnabled) console.log('NoteManager: compute note: reply is null', id, note.value.replyId);
return null;
}
const files = note.value.fileIds.map(id => driveFileManager.get(id)?.value); const files = note.value.fileIds.map(id => driveFileManager.get(id)?.value);
@ -176,7 +186,7 @@ export class NoteManager {
files: files.filter(file => file) as DriveFile[], files: files.filter(file => file) as DriveFile[],
}; };
if (this.isDebuggerEnabled) console.log('NoteManager: compute note (not null)', id, result); if (this.isDebuggerEnabled) console.log('NoteManager: compute note: not null', id, result);
return result; return result;
})); }));