etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-12-22 16:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

respect blocks and mutes for replies and renotes

Browse source
This commit is contained in:
Hazel K 2024-10-02 13:23:01 -04:00
parent f43cb514b0
commit d7f1e3f823
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/backend/src/server/api/endpoints/notes/following.ts
View file

@ -68,11 +68,23 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel') .leftJoinAndSelect('note.channel', 'channel')
// Respect blocks and mutes // Respect blocks and mutes for latest note
.leftJoin(MiBlocking, 'b', 'note."userId" = b."blockerId"') .leftJoin(MiBlocking, 'blocking_note', 'note."userId" = blocking_note."blockerId"')
.leftJoin(MiMuting, 'm', 'note."userId" = m."muteeId"') .leftJoin(MiMuting, 'muting_note', 'note."userId" = muting_note."muteeId"')
.andWhere('b.id IS NULL AND m.id IS NULL') .andWhere('blocking_note.id IS NULL AND muting_note.id IS NULL')
.andWhere('note."userHost" IS NULL OR NOT user_profile."mutedInstances" ? note."userHost"') .andWhere('(note."userHost" IS NULL OR NOT user_profile."mutedInstances" ? note."userHost")')
// Respect blocks and mutes for renote
.leftJoin(MiBlocking, 'blocking_renote', 'renote."userId" IS NOT NULL AND renote."userId" = blocking_renote."blockerId"')
.leftJoin(MiMuting, 'muting_renote', 'renote."userId" IS NOT NULL AND renote."userId" = muting_renote."muteeId"')
.andWhere('blocking_renote.id IS NULL AND muting_renote.id IS NULL')
.andWhere('(renote."userHost" IS NULL OR NOT user_profile."mutedInstances" ? renote."userHost")')
// Respect blocks and mutes for reply
.leftJoin(MiBlocking, 'blocking_reply', 'reply."userId" IS NOT NULL AND reply."userId" = blocking_reply."blockerId"')
.leftJoin(MiMuting, 'muting_reply', 'reply."userId" IS NOT NULL AND reply."userId" = muting_reply."muteeId"')
.andWhere('blocking_reply.id IS NULL AND muting_reply.id IS NULL')
.andWhere('(reply."userHost" IS NULL OR NOT user_profile."mutedInstances" ? reply."userHost")')
// Limit to followers // Limit to followers
.innerJoin(MiFollowing, 'following', 'latest.user_id = following."followeeId"') .innerJoin(MiFollowing, 'following', 'latest.user_id = following."followeeId"')