summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-05-12 10:33:09 +0000
committerHazelnoot <acomputerdog@gmail.com>2025-05-12 10:33:09 +0000
commitc0c41af5f9b7db6eaca169be88dee961f412dfb4 (patch)
treeef8c74ec882ca6ac4e59901ad0d6953ab9746ccc /packages/backend/src/server/api
parentmerge: Fix unique constraint error when processing a flurry of note pinning a... (diff)
parentdon't show hidden hashtags on the trending page (diff)
downloadsharkey-c0c41af5f9b7db6eaca169be88dee961f412dfb4.tar.gz
sharkey-c0c41af5f9b7db6eaca169be88dee961f412dfb4.tar.bz2
sharkey-c0c41af5f9b7db6eaca169be88dee961f412dfb4.zip
merge: Fix hidden hashtags showing on the explore / trending page (!1014)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1014 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/hashtags/list.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index f378c5558e..b49c907432 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -58,6 +58,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (ps.attachedToLocalUserOnly) query.andWhere('tag.attachedLocalUsersCount != 0');
if (ps.attachedToRemoteUserOnly) query.andWhere('tag.attachedRemoteUsersCount != 0');
+ // Ignore hidden hashtags
+ query.andWhere(`
+ NOT EXISTS (
+ SELECT 1 FROM meta WHERE tag.name = ANY(meta."hiddenTags")
+ )`);
+
switch (ps.sort) {
case '+mentionedUsers': query.orderBy('tag.mentionedUsersCount', 'DESC'); break;
case '-mentionedUsers': query.orderBy('tag.mentionedUsersCount', 'ASC'); break;