summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-06-11 21:15:30 +0000
committerHazelnoot <acomputerdog@gmail.com>2025-06-11 21:15:30 +0000
commit791487c4df6137b945767c08a25b7b4bb2a32269 (patch)
tree856f72c430960622227e56decda2f43f2bd2826c /packages/backend/src/server/api
parentmerge: Fix admin-user / instance-info styling and broken controls (!1106) (diff)
parentenforce DM visibility in notes/mentions (diff)
downloadsharkey-791487c4df6137b945767c08a25b7b4bb2a32269.tar.gz
sharkey-791487c4df6137b945767c08a25b7b4bb2a32269.tar.bz2
sharkey-791487c4df6137b945767c08a25b7b4bb2a32269.zip
merge: Enforce DM visibility in generateVisibilityQuery (!1108)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1108 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/mentions.ts5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index a52f35cde6..f30e5a583f 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -79,14 +79,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
, 'source')
.innerJoin(MiNote, 'note', 'note.id = source.id');
- // Mentioned or visible users can always access
- //this.queryService.generateVisibilityQuery(query, me);
+ this.queryService.generateVisibilityQuery(qb, me);
this.queryService.generateBlockedHostQueryForNote(qb);
this.queryService.generateMutedUserQueryForNotes(qb, me);
this.queryService.generateMutedNoteThreadQuery(qb, me);
this.queryService.generateBlockedUserQueryForNotes(qb, me);
// A renote can't mention a user, so it will never appear here anyway.
- //this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
+ //this.queryService.generateMutedUserRenotesQueryForNotes(qb, me);
if (ps.visibility) {
qb.andWhere('note.visibility = :visibility', { visibility: ps.visibility });