etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-21 21:45:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix duplicate users in the following feed

Browse source
This commit is contained in:
Hazelnoot 2024-10-21 14:18:34 -04:00
parent 24ecef80e7
commit 6430a191f7
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,32 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.setParameter('me', me.id) .setParameter('me', me.id)
// Limit to latest notes // Limit to latest notes
.innerJoin(SkLatestNote, 'latest', 'note.id = latest.note_id') .innerJoin(
(sub: SelectQueryBuilder<SkLatestNote>) => {
sub
.from(SkLatestNote, 'latest')
// Return only one note per user
.addSelect('latest.user_id', 'user_id')
.addSelect('MAX(latest.note_id)', 'note_id')
.groupBy('latest.user_id');
// Match selected note types.
if (!ps.includeNonPublic) {
sub.andWhere('latest.is_public = true');
}
if (!ps.includeReplies) {
sub.andWhere('latest.is_reply = false');
}
if (!ps.includeQuotes) {
sub.andWhere('latest.is_quote = false');
}
return sub;
},
'latest',
'note.id = latest.note_id',
)
// Avoid N+1 queries from the "pack" method // Avoid N+1 queries from the "pack" method
.innerJoinAndSelect('note.user', 'user') .innerJoinAndSelect('note.user', 'user')
@ -87,17 +112,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
query.andWhere('note."fileIds" != \'{}\''); query.andWhere('note."fileIds" != \'{}\'');
} }
// Match selected note types.
if (!ps.includeNonPublic) {
query.andWhere('latest.is_public');
}
if (!ps.includeReplies) {
query.andWhere('latest.is_reply = false');
}
if (!ps.includeQuotes) {
query.andWhere('latest.is_quote = false');
}
// Match selected user types. // Match selected user types.
if (!ps.includeBots) { if (!ps.includeBots) {
query.andWhere('"user"."isBot" = false'); query.andWhere('"user"."isBot" = false');