summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-11-13 11:45:10 +0000
committerdakkar <dakkar@thenautilus.net>2024-11-13 11:45:10 +0000
commitfdad03691245f13f51fa88b555213f2871f40e8c (patch)
treedf207d8a08fd3ec373d8a6762e4846689b86953a /packages/backend/src/server/api/endpoints
parentfix upstream linting (diff)
parentmerge: Add "pinned" section to notes tab on user profiles (!689) (diff)
downloadsharkey-fdad03691245f13f51fa88b555213f2871f40e8c.tar.gz
sharkey-fdad03691245f13f51fa88b555213f2871f40e8c.tar.bz2
sharkey-fdad03691245f13f51fa88b555213f2871f40e8c.zip
Merge branch 'develop' into feature/2024.10
Diffstat (limited to 'packages/backend/src/server/api/endpoints')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/following.ts18
1 files changed, 9 insertions, 9 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/following.ts b/packages/backend/src/server/api/endpoints/notes/following.ts
index b6604b9798..f8e9e5c4a1 100644
--- a/packages/backend/src/server/api/endpoints/notes/following.ts
+++ b/packages/backend/src/server/api/endpoints/notes/following.ts
@@ -103,6 +103,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
sub.andWhere('latest.is_quote = false');
}
+ // Select the appropriate collection of users
+ if (ps.list === 'followers') {
+ addFollower(sub);
+ } else if (ps.list === 'following') {
+ addFollowee(sub);
+ } else {
+ addMutual(sub);
+ }
+
return sub;
},
'latest',
@@ -118,15 +127,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('note.channel', 'channel')
;
- // Select the appropriate collection of users
- if (ps.list === 'followers') {
- addFollower(query);
- } else if (ps.list === 'following') {
- addFollowee(query);
- } else {
- addMutual(query);
- }
-
// Limit to files, if requested
if (ps.filesOnly) {
query.andWhere('note."fileIds" != \'{}\'');