amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

respect domain mutes

Browse Source
This commit is contained in:
Hazel K 2024-10-02 12:28:41 -04:00
parent 7b2bc12ff9
commit 7603ecddac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/server/api/endpoints/notes/following.ts
View File

@ -4,7 +4,7 @@
*/ */
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import { LatestNote, MiFollowing, MiBlocking, MiMuting } from '@/models/_.js'; import { LatestNote, MiFollowing, MiBlocking, MiMuting, MiUserProfile } from '@/models/_.js';
import type { NotesRepository } from '@/models/_.js'; import type { NotesRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js'; import { Endpoint } from '@/server/api/endpoint-base.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
@ -54,6 +54,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
super(meta, paramDef, async (ps, me) => { super(meta, paramDef, async (ps, me) => {
let query = this.notesRepository let query = this.notesRepository
.createQueryBuilder('note') .createQueryBuilder('note')
.innerJoin(MiUserProfile, 'user_profile', ':me = user_profile."userId"')
.setParameter('me', me.id) .setParameter('me', me.id)
// Limit to latest notes // Limit to latest notes
@ -70,7 +71,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
// Respect blocks and mutes // Respect blocks and mutes
.leftJoin(MiBlocking, 'b', 'note."userId" = b."blockerId"') .leftJoin(MiBlocking, 'b', 'note."userId" = b."blockerId"')
.leftJoin(MiMuting, 'm', 'note."userId" = m."muteeId"') .leftJoin(MiMuting, 'm', 'note."userId" = m."muteeId"')
.where('b.id IS NULL AND m.id IS NULL') .andWhere('b.id IS NULL AND m.id IS NULL')
.andWhere('note."userHost" IS NULL OR NOT user_profile."mutedInstances" ? note."userHost"')
// Limit to followers // Limit to followers
.innerJoin(MiFollowing, 'following', 'latest.user_id = following."followeeId"') .innerJoin(MiFollowing, 'following', 'latest.user_id = following."followeeId"')