merge: upstream

2023-11-04 14:32:28 +01:00
parent 4ec812b3b3 8372e547eb
commit 647e76ab36
37 changed files with 493 additions and 130 deletions
@@ -98,6 +98,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}

 			if (!ps.withBots) query.andWhere('user.isBot = FALSE');
+			
+			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

 			let timeline = await query.limit(ps.limit).getMany();