summaryrefslogtreecommitdiff
path: root/packages/backend/src/server
diff options
context:
space:
mode:
authorozelot <contact@ozelot.dev>2023-11-04 18:45:59 +0900
committerGitHub <noreply@github.com>2023-11-04 18:45:59 +0900
commit1e737dbb94ac856be7cc68e834f99e0bb759cf41 (patch)
treec70ac8358f6692cf802ae45ddfd2a740aa9f9eed /packages/backend/src/server
parentNew Crowdin updates (#12231) (diff)
downloadsharkey-1e737dbb94ac856be7cc68e834f99e0bb759cf41.tar.gz
sharkey-1e737dbb94ac856be7cc68e834f99e0bb759cf41.tar.bz2
sharkey-1e737dbb94ac856be7cc68e834f99e0bb759cf41.zip
fix(backend): GTLの「リノートを表示」オプションが機能しないのを修正 (#12234)
* fix(backend): GTLの「リノートを表示」オプションが機能しないのを修正 (#12233) * docs: Update changelog * Apply suggestions from code review Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/server')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/global-timeline.ts10
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index be7557c213..68fefa5b58 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -87,6 +87,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (ps.withFiles) {
query.andWhere('note.fileIds != \'{}\'');
}
+
+ if (ps.withRenotes === false) {
+ query.andWhere(new Brackets(qb => {
+ qb.where('note.renoteId IS NULL');
+ qb.orWhere(new Brackets(qb => {
+ qb.where('note.text IS NOT NULL');
+ qb.orWhere('note.fileIds != \'{}\'');
+ }));
+ }));
+ }
//#endregion
const timeline = await query.limit(ps.limit).getMany();