From 26e6c148cb10e33f4d5039b1f00e2bbe4788d8bd Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 15 Jul 2025 12:01:41 +0900
Subject: [PATCH] Fix #16289

---
 .../server/api/endpoints/notes/timeline.ts    |  8 +++-
 packages/backend/test/e2e/timelines.ts        | 42 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index c76cca1518..1f3631ae3d 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -237,7 +237,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		}
 
 		if (ps.withRenotes === false) {
-			query.andWhere('note.renoteId IS NULL');
+			query.andWhere(new Brackets(qb => {
+				qb.orWhere('note.renoteId IS NULL');
+				qb.orWhere(new Brackets(qb => {
+					qb.orWhere('note.text IS NOT NULL');
+					qb.orWhere('note.fileIds != \'{}\'');
+				}));
+			}));
 		}
 		//#endregion
 
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index e3516845f4..f9ad66c119 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -282,6 +282,48 @@ describe('Timelines', () => {
 				assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 			});
 
+			test('[withRenotes: false] フォローしているユーザーの投稿が含まれる', async () => {
+				const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
+
+				await api('following/create', { userId: bob.id }, alice);
+				await setTimeout(250);
+				const bobNote = await post(bob, { text: 'hi' });
+				const carolNote = await post(carol, { text: 'hi' });
+
+				await waitForPushToTl();
+
+				const res = await api('notes/timeline', {
+					limit: 100,
+					withRenotes: false,
+				}, alice);
+
+				assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+				assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
+			});
+
+			test('[withRenotes: false] フォローしているユーザーのファイルのみの投稿が含まれる', async () => {
+				const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
+
+				await api('following/create', { userId: bob.id }, alice);
+				await setTimeout(250);
+				const [bobFile, carolFile] = await Promise.all([
+					uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/assets/main/public/icon.png'),
+					uploadUrl(carol, 'https://raw.githubusercontent.com/misskey-dev/assets/main/public/icon.png'),
+				]);
+				const bobNote = await post(bob, { fileIds: [bobFile.id] });
+				const carolNote = await post(carol, { fileIds: [carolFile.id] });
+
+				await waitForPushToTl();
+
+				const res = await api('notes/timeline', {
+					limit: 100,
+					withRenotes: false,
+				}, alice);
+
+				assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+				assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
+			});
+
 			test('[withRenotes: false] フォローしているユーザーの他人の投稿のリノートが含まれない', async () => {
 				const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);