diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-06-01 17:25:52 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-06-01 17:25:52 +0000 |
| commit | e1504cfb88d047acbfc5c08bcf790c0a08875ee9 (patch) | |
| tree | 074df46515fd4ddd4a6bdf7b0a1af57fcb663291 /packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts | |
| parent | merge: fix DeepLX (!1077) (diff) | |
| parent | exclude local notes from bubble timeline (diff) | |
| download | sharkey-e1504cfb88d047acbfc5c08bcf790c0a08875ee9.tar.gz sharkey-e1504cfb88d047acbfc5c08bcf790c0a08875ee9.tar.bz2 sharkey-e1504cfb88d047acbfc5c08bcf790c0a08875ee9.zip | |
merge: Persisted instance blocks (!1068)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1068
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts index df030d90aa..7c375cb0f5 100644 --- a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts @@ -85,7 +85,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) .andWhere('note.visibility = \'public\'') .andWhere('note.channelId IS NULL') - .andWhere('note.userHost IN (:...hosts)', { hosts: this.serverSettings.bubbleInstances }) + .andWhere('note.userHost IS NULL') + .andWhere('userInstance.isBubbled = true') // This comes from generateVisibilityQuery below .innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.reply', 'reply') .leftJoinAndSelect('note.renote', 'renote') |