diff options
| author | Marie <marie@kaifa.ch> | 2023-10-18 19:15:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-18 19:15:53 +0200 |
| commit | 8debea7161d98b536337da79b19656e3527de398 (patch) | |
| tree | 46cf2d69bb421b7183efe1af16235705103353fc /packages/backend/src/server/api/endpoints/notes/timeline.ts | |
| parent | fix: reports not sending email (diff) | |
| parent | add: locales for toggles (diff) | |
| download | sharkey-8debea7161d98b536337da79b19656e3527de398.tar.gz sharkey-8debea7161d98b536337da79b19656e3527de398.tar.bz2 sharkey-8debea7161d98b536337da79b19656e3527de398.zip | |
merge: timeline changes, new options, silence users (#97)
Diffstat (limited to 'packages/backend/src/server/api/endpoints/notes/timeline.ts')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/timeline.ts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 8f13b3a4ba..e8bae286ef 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -46,6 +46,7 @@ export const paramDef = { includeLocalRenotes: { type: 'boolean', default: true }, withFiles: { type: 'boolean', default: false }, withRenotes: { type: 'boolean', default: true }, + withBots: { type: 'boolean', default: true }, }, required: [], } as const; @@ -97,6 +98,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- .leftJoinAndSelect('renote.user', 'renoteUser') .leftJoinAndSelect('note.channel', 'channel'); + if (!ps.withBots) query.andWhere('user.isBot = FALSE'); + let timeline = await query.getMany(); timeline = timeline.filter(note => { @@ -114,6 +117,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- if (note.reply && note.reply.visibility === 'followers') { if (!Object.hasOwn(followings, note.reply.userId)) return false; } + if (note.user?.isSilenced && note.userId !== me.id && !followings[note.userId]) return false; return true; }); |