From 384d8d853b123e3de2f41db518158099c586eae6 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 29 Jun 2024 18:45:19 +0900
Subject: [PATCH] fix generateNoScheduleNotesQuery

---
 .../server/api/mastodon/helpers/timeline.ts   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/helpers/timeline.ts b/packages/backend/src/server/api/mastodon/helpers/timeline.ts
index c1af3285ed..ec97b82508 100644
--- a/packages/backend/src/server/api/mastodon/helpers/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/helpers/timeline.ts
@@ -55,9 +55,10 @@ export class TimelineHelpers {
 		generateMutedUserQuery(query, user);
 		generateBlockedUserQuery(query, user);
 		generateMutedUserRenotesQueryForNotes(query, user);
-		this.generateNoScheduleNotesQuery(query);
 
-		query.andWhere("note.visibility != 'hidden'");
+		query
+			.andWhere("note.visibility != 'hidden'")
+			.andWhere("note.scheduledAt IS NULL");
 
 		return PaginationHelpers.execQueryLinkPagination(
 			query,
@@ -98,7 +99,9 @@ export class TimelineHelpers {
 			sinceId,
 			maxId,
 			minId,
-		).andWhere("note.visibility = 'public'");
+		)
+			.andWhere("note.visibility = 'public'")
+			.andWhere("note.scheduledAt IS NULL");
 
 		if (remote) query.andWhere("note.userHost IS NOT NULL");
 		if (local) query.andWhere("note.userHost IS NULL");
@@ -109,7 +112,7 @@ export class TimelineHelpers {
 			.leftJoinAndSelect("note.renote", "renote");
 
 		generateRepliesQuery(query, true, user);
-		this.generateNoScheduleNotesQuery(query);
+
 		if (user) {
 			generateMutedUserQuery(query, user);
 			generateBlockedUserQuery(query, user);
@@ -150,12 +153,12 @@ export class TimelineHelpers {
 		)
 			.andWhere(`note.userId IN (${listQuery.getQuery()})`)
 			.andWhere("note.visibility != 'specified'")
+			.andWhere("note.scheduledAt IS NULL")
 			.leftJoinAndSelect("note.user", "user")
 			.leftJoinAndSelect("note.renote", "renote")
 			.setParameters({ listId: list.id });
 
 		generateVisibilityQuery(query, user);
-		this.generateNoScheduleNotesQuery(query);
 
 		return PaginationHelpers.execQueryLinkPagination(
 			query,
@@ -195,6 +198,7 @@ export class TimelineHelpers {
 			minId,
 		)
 			.andWhere("note.visibility = 'public'")
+			.andWhere("note.scheduledAt IS NULL")
 			.andWhere("note.tags @> array[:tag]::varchar[]", { tag: tag });
 
 		if (any.length > 0)
@@ -215,7 +219,7 @@ export class TimelineHelpers {
 			.leftJoinAndSelect("note.renote", "renote");
 
 		generateRepliesQuery(query, true, user);
-		this.generateNoScheduleNotesQuery(query);
+
 		if (user) {
 			generateMutedUserQuery(query, user);
 			generateBlockedUserQuery(query, user);
@@ -263,11 +267,10 @@ export class TimelineHelpers {
 			maxId,
 			minId,
 		)
+			.andWhere("note.scheduledAt IS NULL")
 			.innerJoin(`(${sq.getQuery()})`, "sq", "note.id = sq.latest")
 			.setParameters({ userId: user.id });
 
-		this.generateNoScheduleNotesQuery(query);
-
 		return query
 			.take(limit)
 			.getMany()
@@ -378,9 +381,4 @@ export class TimelineHelpers {
 		}
 		return result;
 	}
-
-	/** Exclude scheduled notes from Mastodon timeline */
-	public static generateNoScheduleNotesQuery(q: SelectQueryBuilder<Note>) {
-		q.andWhere("note.scheduledAt IS NULL");
-	}
 }