fix (backend): fix scheduled reply/quote behavior

packages/backend/src/services/note/create.ts

@@ -171,6 +171,9 @@ export default async (
 		const dontFederateInitially =
 			data.visibility?.startsWith("hidden") === true;
 
+		// Whether this is a scheduled "draft" post (yet to be published)
+		const isDraft = data.scheduledAt != null;
+
 		// If you reply outside the channel, match the scope of the target.
 		// TODO (I think it's a process that could be done on the client side, but it's server side for now.)
 		if (
@@ -270,7 +273,7 @@ export default async (
 
 		data.text = data.text?.trim() ?? null;
 
-		if (data.lang) {
+		if (data.lang != null) {
 			if (!Object.keys(langmap).includes(data.lang.toLowerCase()))
 				throw new Error("invalid param");
 			data.lang = data.lang.toLowerCase();
@@ -314,7 +317,7 @@ export default async (
 			);
 		}
 
-		if (data.visibility === "specified") {
+		if (!isDraft && data.visibility === "specified") {
 			if (data.visibleUsers == null) throw new Error("invalid param");
 
 			for (const u of data.visibleUsers) {
@@ -352,6 +355,7 @@ export default async (
 			});
 		}
 
+		if (!isDraft) {
 			// ハッシュタグ更新
 			if (data.visibility === "public" || data.visibility === "home") {
 				updateHashtags(user, tags);
@@ -398,7 +402,7 @@ export default async (
 			}
 
 			// Channel
-		if (note.channelId) {
+			if (note.channelId != null) {
 				ChannelFollowings.findBy({ followeeId: note.channelId }).then(
 					(followings) => {
 						for (const following of followings) {
@@ -528,9 +532,11 @@ export default async (
 				await createMentionedEvents(mentionedUsers, note, nm);
 
 				// If has in reply to note
-			if (data.reply) {
+				if (data.reply != null) {
 					// Fetch watchers
-				nmRelatedPromises.push(notifyToWatchersOfReplyee(data.reply, user, nm));
+					nmRelatedPromises.push(
+						notifyToWatchersOfReplyee(data.reply, user, nm),
+					);
 
 					// 通知
 					if (data.reply.userHost === null) {
@@ -548,7 +554,8 @@ export default async (
 							publishMainStream(data.reply.userId, "reply", packedReply);
 
 							const webhooks = (await getActiveWebhooks()).filter(
-							(x) => x.userId === data.reply?.userId && x.on.includes("reply"),
+								(x) =>
+									x.userId === data.reply?.userId && x.on.includes("reply"),
 							);
 							for (const webhook of webhooks) {
 								webhookDeliver(webhook, "reply", {
@@ -560,7 +567,7 @@ export default async (
 				}
 
 				// If it is renote
-			if (data.renote) {
+				if (data.renote != null) {
 					const type = data.text ? "quote" : "renote";
 
 					// Notify
@@ -609,7 +616,9 @@ export default async (
 						const dm = new DeliverManager(user, noteActivity);
 
 						// メンションされたリモートユーザーに配送
-					for (const u of mentionedUsers.filter((u) => Users.isRemoteUser(u))) {
+						for (const u of mentionedUsers.filter((u) =>
+							Users.isRemoteUser(u),
+						)) {
 							dm.addDirectRecipe(u as IRemoteUser);
 						}
 
@@ -657,6 +666,7 @@ export default async (
 					}
 				});
 			}
+		}
 	});
 
 async function renderNoteOrRenoteActivity(data: NoteLike, note: Note) {

packages/backend/src/services/note/delete.ts

@@ -42,8 +42,12 @@ export default async function (
 ) {
 	const deletedAt = new Date();
 
+	// Whether this is a scheduled "draft" post
+	const isDraft = note.scheduledAt != null;
+
 	// この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
 	if (
+		!isDraft &&
 		note.renoteId &&
 		(await countSameRenotes(user.id, note.renoteId, note.id)) === 0 &&
 		deleteFromDb
@@ -52,7 +56,7 @@ export default async function (
 		Notes.decrement({ id: note.renoteId }, "score", 1);
 	}
 
-	if (note.replyId && deleteFromDb) {
+	if (!isDraft && note.replyId != null && deleteFromDb) {
 		await Notes.decrement({ id: note.replyId }, "repliesCount", 1);
 	}
 
@@ -67,14 +71,14 @@ export default async function (
 	const instanceNotesCountDecreasement: Record<string, number> = {};
 
 	// Only broadcast "deleted" to local if the note is deleted from db
-	if (deleteFromDb) {
+	if (!isDraft && deleteFromDb) {
 		publishNoteStream(note.id, "deleted", {
 			deletedAt: deletedAt,
 		});
 	}
 
 	//#region ローカルの投稿なら削除アクティビティを配送
-	if (Users.isLocalUser(user) && !note.localOnly) {
+	if (!isDraft && Users.isLocalUser(user) && !note.localOnly) {
 		let renote: Note | null = null;
 
 		// if deletd note is renote