diff options
| author | DW <36347199+chocological00@users.noreply.github.com> | 2020-05-16 11:49:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 00:49:46 +0900 |
| commit | f6cfa5cbb4b7a28f3fe2e1417d5ac0771f772e12 (patch) | |
| tree | 5b1dac990de76bfc8b0a77b5d44cbcc09aef059c /src/services/note/delete.ts | |
| parent | Merge branch 'develop' of https://github.com/syuilo/misskey into develop (diff) | |
| download | sharkey-f6cfa5cbb4b7a28f3fe2e1417d5ac0771f772e12.tar.gz sharkey-f6cfa5cbb4b7a28f3fe2e1417d5ac0771f772e12.tar.bz2 sharkey-f6cfa5cbb4b7a28f3fe2e1417d5ac0771f772e12.zip | |
Fix CASCADE-related problems (#6374)
* Fix renotes remaining on remote when CASCADE is invoked
* Fix CASCADE-invoked deletion not being federated to relays
Co-authored-by: DW <chocological00@gitlab.com>
Diffstat (limited to 'src/services/note/delete.ts')
| -rw-r--r-- | src/services/note/delete.ts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index 11b52cd135..1972801ab7 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -13,6 +13,7 @@ import { notesChart, perUserNotesChart, instanceChart } from '../chart'; import { deliverToFollowers } from '../../remote/activitypub/deliver-manager'; import { countSameRenotes } from '../../misc/count-same-renotes'; import { deliverToRelays } from '../relay'; +import { Brackets } from 'typeorm'; /** * 投稿を削除します。 @@ -59,6 +60,7 @@ export default async function(user: User, note: Note, quiet = false) { if (!Users.isLocalUser(cascadingNote.user)) continue; const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${cascadingNote.id}`), cascadingNote.user)); deliverToFollowers(cascadingNote.user, content); + deliverToRelays(cascadingNote.user, content); } //#endregion @@ -86,6 +88,10 @@ async function findCascadingNotes(note: Note) { const recursive = async (noteId: string) => { const query = Notes.createQueryBuilder('note') .where('note.replyId = :noteId', { noteId }) + .orWhere(new Brackets(q => { + q.where('note.renoteId = :noteId', { noteId }) + .andWhere('note.text IS NOT NULL'); + })) .leftJoinAndSelect('note.user', 'user'); const replies = await query.getMany(); for (const reply of replies) { |