mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-08-22 02:53:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Fix logic error in bubble timeline when withRenotes is false (!1086)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1086

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Hazelnoot 2025-06-01 19:23:10 +00:00
commit b956f1edd4
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/src/core/QueryService.ts
View file

@ -247,6 +247,7 @@ export class QueryService {
.orWhere('note.text IS NOT NULL') .orWhere('note.text IS NOT NULL')
.orWhere('note.cw IS NOT NULL') .orWhere('note.cw IS NOT NULL')
.orWhere('note.replyId IS NOT NULL') .orWhere('note.replyId IS NOT NULL')
.orWhere('note.hasPoll = false')
.orWhere('note.fileIds != \'{}\'') .orWhere('note.fileIds != \'{}\'')
.orWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`); .orWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
})); }));

24
packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
View file

@ -74,11 +74,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
throw new ApiError(meta.errors.btlDisabled); throw new ApiError(meta.errors.btlDisabled);
} }
const [ const followings = me ? await this.cacheService.userFollowingsCache.fetch(me.id) : undefined;
followings,
] = me ? await Promise.all([
this.cacheService.userFollowingsCache.fetch(me.id),
]) : [undefined];
//#region Construct query //#region Construct query
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'),
@ -86,7 +82,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.andWhere('note.visibility = \'public\'') .andWhere('note.visibility = \'public\'')
.andWhere('note.channelId IS NULL') .andWhere('note.channelId IS NULL')
.andWhere('note.userHost IS NULL') .andWhere('note.userHost IS NULL')
.andWhere('userInstance.isBubbled = true') // This comes from generateVisibilityQuery below .andWhere('userInstance.isBubbled = true') // This comes from generateBlockedHostQueryForNote below
.innerJoinAndSelect('note.user', 'user') .innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.reply', 'reply')
.leftJoinAndSelect('note.renote', 'renote') .leftJoinAndSelect('note.renote', 'renote')
@ -105,14 +101,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (!ps.withBots) query.andWhere('user.isBot = FALSE'); if (!ps.withBots) query.andWhere('user.isBot = FALSE');
if (ps.withRenotes === false) { if (!ps.withRenotes) {
query.andWhere(new Brackets(qb => { query.andWhere(new Brackets(qb => qb
qb.where('note.renoteId IS NULL'); .orWhere('note.renoteId IS NULL')
qb.orWhere(new Brackets(qb => { .orWhere('note.text IS NOT NULL')
qb.where('note.text IS NOT NULL'); .orWhere('note.cw IS NOT NULL')
qb.orWhere('note.fileIds != \'{}\''); .orWhere('note.replyId IS NOT NULL')
})); .orWhere('note.hasPoll = false')
})); .orWhere('note.fileIds != \'{}\'')));
} }
//#endregion //#endregion