Merge 8b1f889d1d into 0f8c068e84

locales/index.d.ts

@@ -5286,10 +5286,6 @@ export interface Locale extends ILocale {
      * 下書き
      */
     "draft": string;
-    /**
-     * 下書きと予約投稿
-     */
-    "draftsAndScheduledNotes": string;
     /**
      * リアクションする際に確認する
      */
@@ -5561,22 +5557,6 @@ export interface Locale extends ILocale {
      * 投稿を予約
      */
     "schedulePost": string;
-    /**
-     * {x}に投稿を予約します
-     */
-    "scheduleToPostOnX": ParameterizedString<"x">;
-    /**
-     * {x}に投稿が予約されています
-     */
-    "scheduledToPostOnX": ParameterizedString<"x">;
-    /**
-     * 予約
-     */
-    "schedule": string;
-    /**
-     * 予約
-     */
-    "scheduled": string;
     "_compression": {
         "_quality": {
             /**
@@ -10356,10 +10336,6 @@ export interface Locale extends ILocale {
          * 予約ノートが投稿されました
          */
         "scheduledNotePosted": string;
-        /**
-         * 予約ノートの投稿に失敗しました
-         */
-        "scheduledNotePostFailed": string;
         /**
          * 新しい投稿
          */
@@ -12677,14 +12653,6 @@ export interface Locale extends ILocale {
          * 投稿予約
          */
         "schedule": string;
-        /**
-         * 予約投稿一覧
-         */
-        "listScheduledNotes": string;
-        /**
-         * 予約解除
-         */
-        "cancelSchedule": string;
     };
     /**
      * 二次元コード

locales/ja-JP.yml

@@ -1317,7 +1317,6 @@ acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします
 federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
 federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
 draft: "下書き"
-draftsAndScheduledNotes: "下書きと予約投稿"
 confirmOnReact: "リアクションする際に確認する"
 reactAreYouSure: "\" {emoji} \" をリアクションしますか？"
 markAsSensitiveConfirm: "このメディアをセンシティブとして設定しますか？"
@@ -1385,10 +1384,6 @@ themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォル
 thankYouForTestingBeta: "ベータ版の検証にご協力いただきありがとうございます！"
 createUserSpecifiedNote: "ユーザー指定ノートを作成"
 schedulePost: "投稿を予約"
-scheduleToPostOnX: "{x}に投稿を予約します"
-scheduledToPostOnX: "{x}に投稿が予約されています"
-schedule: "予約"
-scheduled: "予約"
 
 _compression:
   _quality:
@@ -2735,7 +2730,6 @@ _notification:
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
   pollEnded: "アンケートの結果が出ました"
   scheduledNotePosted: "予約ノートが投稿されました"
-  scheduledNotePostFailed: "予約ノートの投稿に失敗しました"
   newNote: "新しい投稿"
   unreadAntennaNote: "アンテナ {name}"
   roleAssigned: "ロールが付与されました"
@@ -3394,8 +3388,6 @@ _drafts:
   restore: "復元"
   listDrafts: "下書き一覧"
   schedule: "投稿予約"
-  listScheduledNotes: "予約投稿一覧"
-  cancelSchedule: "予約解除"
 
 qr: "二次元コード"
 _qr:

packages/backend/migration/1758677617888-scheduled-post.js

@@ -11,14 +11,12 @@ export class ScheduledPost1758677617888 {
      */
     async up(queryRunner) {
         await queryRunner.query(`ALTER TABLE "note_draft" ADD "scheduledAt" TIMESTAMP WITH TIME ZONE`);
-        await queryRunner.query(`ALTER TABLE "note_draft" ADD "isActuallyScheduled" boolean NOT NULL DEFAULT false`);
     }
 
     /**
      * @param {QueryRunner} queryRunner
      */
     async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note_draft" DROP COLUMN "isActuallyScheduled"`);
         await queryRunner.query(`ALTER TABLE "note_draft" DROP COLUMN "scheduledAt"`);
     }
 }

packages/backend/src/core/NoteDraftService.ts

@@ -18,7 +18,21 @@ import { isRenote, isQuote } from '@/misc/is-renote.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { QueueService } from '@/core/QueueService.js';
 
-export type NoteDraftOptions = Omit<MiNoteDraft, 'id' | 'userId' | 'user' | 'reply' | 'renote' | 'channel'>;
+export type NoteDraftOptions = {
+	replyId?: MiNote['id'] | null;
+	renoteId?: MiNote['id'] | null;
+	text?: string | null;
+	cw?: string | null;
+	localOnly?: boolean | null;
+	reactionAcceptance?: typeof noteReactionAcceptances[number];
+	visibility?: typeof noteVisibilities[number];
+	fileIds?: MiDriveFile['id'][];
+	visibleUserIds?: MiUser['id'][];
+	hashtag?: string;
+	channelId?: MiChannel['id'] | null;
+	poll?: (IPoll & { expiredAfter?: number | null }) | null;
+	scheduledAt?: Date | null;
+};
 
 @Injectable()
 export class NoteDraftService {
@@ -61,6 +75,7 @@ export class NoteDraftService {
 	@bindThis
 	public async create(me: MiLocalUser, data: NoteDraftOptions): Promise<MiNoteDraft> {
 		//#region check draft limit
+
 		const currentCount = await this.noteDraftsRepository.countBy({
 			userId: me.id,
 		});
@@ -69,15 +84,23 @@ export class NoteDraftService {
 		}
 		//#endregion
 
-		await this.validate(me, data);
+		if (data.poll) {
+			if (typeof data.poll.expiresAt === 'number') {
+				if (data.poll.expiresAt < Date.now()) {
+					throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
+				}
+			} else if (typeof data.poll.expiredAfter === 'number') {
+				data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
+			}
+		}
 
-		const draft = await this.noteDraftsRepository.insertOne({
+		const appliedDraft = await this.checkAndSetDraftNoteOptions(me, this.noteDraftsRepository.create(), data);
-			...data,
-			id: this.idService.gen(),
-			userId: me.id,
-		});
 
-		if (draft.scheduledAt && draft.isActuallyScheduled) {
+		appliedDraft.id = this.idService.gen();
+		appliedDraft.userId = me.id;
+		const draft = await this.noteDraftsRepository.insertOne(appliedDraft);
+
+		if (draft.scheduledAt) {
 			this.schedule(draft);
 		}
 
@@ -85,7 +108,7 @@ export class NoteDraftService {
 	}
 
 	@bindThis
-	public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: Partial<NoteDraftOptions>): Promise<MiNoteDraft> {
+	public async update(me: MiLocalUser, draftId: MiNoteDraft['id'], data: NoteDraftOptions): Promise<MiNoteDraft> {
 		const draft = await this.noteDraftsRepository.findOneBy({
 			id: draftId,
 			userId: me.id,
@@ -95,22 +118,30 @@ export class NoteDraftService {
 			throw new IdentifiableError('49cd6b9d-848e-41ee-b0b9-adaca711a6b1', 'No such note draft');
 		}
 
-		await this.validate(me, data);
+		if (data.poll) {
+			if (typeof data.poll.expiresAt === 'number') {
+				if (data.poll.expiresAt < Date.now()) {
+					throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
+				}
+			} else if (typeof data.poll.expiredAfter === 'number') {
+				data.poll.expiresAt = new Date(Date.now() + data.poll.expiredAfter);
+			}
+		}
 
-		const updatedDraft = await this.noteDraftsRepository.createQueryBuilder().update()
+		const appliedDraft = await this.checkAndSetDraftNoteOptions(me, draft, data);
-			.set(data)
-			.where('id = :id', { id: draftId })
-			.returning('*')
-			.execute()
-			.then((response) => response.raw[0]);
 
-		this.clearSchedule(draftId).then(() => {
+		await this.noteDraftsRepository.update(draftId, appliedDraft);
-			if (updatedDraft.scheduledAt != null && updatedDraft.isActuallyScheduled) {
+
-				this.schedule(updatedDraft);
+		this.clearSchedule(draft).then(() => {
+			if (appliedDraft.scheduledAt) {
+				this.schedule(draft);
 			}
 		});
 
-		return updatedDraft;
+		return {
+			...draft,
+			...appliedDraft,
+		};
 	}
 
 	@bindThis
@@ -126,7 +157,7 @@ export class NoteDraftService {
 
 		await this.noteDraftsRepository.delete(draft.id);
 
-		this.clearSchedule(draftId);
+		this.clearSchedule(draft);
 	}
 
 	@bindThis
@@ -143,20 +174,27 @@ export class NoteDraftService {
 		return draft;
 	}
 
+	// 関連エンティティを取得し紐づける部分を共通化する
 	@bindThis
-	public async validate(
+	public async checkAndSetDraftNoteOptions(
 		me: MiLocalUser,
-		data: Partial<NoteDraftOptions>,
+		draft: MiNoteDraft,
-	): Promise<void> {
+		data: NoteDraftOptions,
-		if (data.pollExpiresAt != null) {
+	): Promise<MiNoteDraft> {
-			if (data.pollExpiresAt.getTime() < Date.now()) {
+		data.visibility ??= 'public';
-				throw new IdentifiableError('04da457d-b083-4055-9082-955525eda5a5', 'Cannot create expired poll');
+		data.localOnly ??= false;
-			}
+		if (data.reactionAcceptance === undefined) data.reactionAcceptance = null;
+		if (data.channelId != null) {
+			data.visibility = 'public';
+			data.visibleUserIds = [];
+			data.localOnly = true;
 		}
 
+		let appliedDraft = draft;
+
 		//#region visibleUsers
 		let visibleUsers: MiUser[] = [];
-		if (data.visibleUserIds != null && data.visibleUserIds.length > 0) {
+		if (data.visibleUserIds != null) {
 			visibleUsers = await this.usersRepository.findBy({
 				id: In(data.visibleUserIds),
 			});
@@ -166,7 +204,7 @@ export class NoteDraftService {
 		//#region files
 		let files: MiDriveFile[] = [];
 		const fileIds = data.fileIds ?? null;
-		if (fileIds != null && fileIds.length > 0) {
+		if (fileIds != null) {
 			files = await this.driveFilesRepository.createQueryBuilder('file')
 				.where('file.userId = :userId AND file.id IN (:...fileIds)', {
 					userId: me.id,
@@ -270,11 +308,33 @@ export class NoteDraftService {
 			}
 		}
 		//#endregion
+
+		appliedDraft = {
+			...appliedDraft,
+			visibility: data.visibility,
+			cw: data.cw ?? null,
+			fileIds: fileIds ?? [],
+			replyId: data.replyId ?? null,
+			renoteId: data.renoteId ?? null,
+			channelId: data.channelId ?? null,
+			text: data.text ?? null,
+			hashtag: data.hashtag ?? null,
+			hasPoll: data.poll != null,
+			pollChoices: data.poll ? data.poll.choices : [],
+			pollMultiple: data.poll ? data.poll.multiple : false,
+			pollExpiresAt: data.poll ? data.poll.expiresAt : null,
+			pollExpiredAfter: data.poll ? data.poll.expiredAfter ?? null : null,
+			visibleUserIds: data.visibleUserIds ?? [],
+			localOnly: data.localOnly,
+			reactionAcceptance: data.reactionAcceptance,
+			scheduledAt: data.scheduledAt ?? null,
+		} satisfies MiNoteDraft;
+
+		return appliedDraft;
 	}
 
 	@bindThis
 	public async schedule(draft: MiNoteDraft): Promise<void> {
-		if (!draft.isActuallyScheduled) return;
 		if (draft.scheduledAt == null) return;
 		if (draft.scheduledAt.getTime() <= Date.now()) return;
 
@@ -295,10 +355,10 @@ export class NoteDraftService {
 	}
 
 	@bindThis
-	public async clearSchedule(draftId: MiNoteDraft['id']): Promise<void> {
+	public async clearSchedule(draft: MiNoteDraft): Promise<void> {
 		const jobs = await this.queueService.postScheduledNoteQueue.getJobs(['delayed', 'waiting', 'active']);
 		for (const job of jobs) {
-			if (job.data.noteDraftId === draftId) {
+			if (job.data.noteDraftId === draft.id) {
 				await job.remove();
 			}
 		}

packages/backend/src/core/entities/NoteDraftEntityService.ts

@@ -106,7 +106,6 @@ export class NoteDraftEntityService implements OnModuleInit {
 			id: noteDraft.id,
 			createdAt: this.idService.parse(noteDraft.id).date.toISOString(),
 			scheduledAt: noteDraft.scheduledAt?.getTime() ?? null,
-			isActuallyScheduled: noteDraft.isActuallyScheduled,
 			userId: noteDraft.userId,
 			user: packedUsers?.get(noteDraft.userId) ?? this.userEntityService.pack(noteDraft.user ?? noteDraft.userId, me),
 			text: text,
@@ -114,13 +113,13 @@ export class NoteDraftEntityService implements OnModuleInit {
 			visibility: noteDraft.visibility,
 			localOnly: noteDraft.localOnly,
 			reactionAcceptance: noteDraft.reactionAcceptance,
-			visibleUserIds: noteDraft.visibleUserIds,
+			visibleUserIds: noteDraft.visibility === 'specified' ? noteDraft.visibleUserIds : undefined,
-			hashtag: noteDraft.hashtag,
+			hashtag: noteDraft.hashtag ?? undefined,
 			fileIds: noteDraft.fileIds,
 			files: packedFiles != null ? this.packAttachedFiles(noteDraft.fileIds, packedFiles) : this.driveFileEntityService.packManyByIds(noteDraft.fileIds),
 			replyId: noteDraft.replyId,
 			renoteId: noteDraft.renoteId,
-			channelId: noteDraft.channelId,
+			channelId: noteDraft.channelId ?? undefined,
 			channel: channel ? {
 				id: channel.id,
 				name: channel.name,

packages/backend/src/models/NoteDraft.ts

@@ -153,13 +153,17 @@ export class MiNoteDraft {
 
 	//#endregion
 
+	// 予約投稿
 	@Column('timestamp with time zone', {
 		nullable: true,
 	})
 	public scheduledAt: Date | null;
 
-	@Column('boolean', {
+	constructor(data: Partial<MiNoteDraft>) {
-		default: false,
+		if (data == null) return;
-	})
+
-	public isActuallyScheduled: boolean;
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
 }

packages/backend/src/models/Notification.ts

@@ -9,7 +9,6 @@ import { MiNote } from './Note.js';
 import { MiAccessToken } from './AccessToken.js';
 import { MiRole } from './Role.js';
 import { MiDriveFile } from './DriveFile.js';
-import { MiNoteDraft } from './NoteDraft.js';
 
 // misskey-js の notificationTypes と同期すべし
 export type MiNotification = {
@@ -66,11 +65,6 @@ export type MiNotification = {
 	id: string;
 	createdAt: string;
 	noteId: MiNote['id'];
-} | {
-	type: 'scheduledNotePostFailed';
-	id: string;
-	createdAt: string;
-	noteDraftId: MiNoteDraft['id'];
 } | {
 	type: 'receiveFollowRequest';
 	id: string;

packages/backend/src/models/json-schema/note-draft.ts

@@ -171,9 +171,5 @@ export const packedNoteDraftSchema = {
 			type: 'number',
 			optional: false, nullable: true,
 		},
-		isActuallyScheduled: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
 	},
 } as const;

packages/backend/src/models/json-schema/notification.ts

@@ -222,21 +222,6 @@ export const packedNotificationSchema = {
 				optional: false, nullable: false,
 			},
 		},
-	}, {
-		type: 'object',
-		properties: {
-			...baseSchema.properties,
-			type: {
-				type: 'string',
-				optional: false, nullable: false,
-				enum: ['scheduledNotePostFailed'],
-			},
-			noteDraft: {
-				type: 'object',
-				ref: 'NoteDraft',
-				optional: false, nullable: false,
-			},
-		},
 	}, {
 		type: 'object',
 		properties: {

packages/backend/src/models/json-schema/user.ts

@@ -610,7 +610,6 @@ export const packedMeDetailedOnlySchema = {
 				reaction: { optional: true, ...notificationRecieveConfig },
 				pollEnded: { optional: true, ...notificationRecieveConfig },
 				scheduledNotePosted: { optional: true, ...notificationRecieveConfig },
-				scheduledNotePostFailed: { optional: true, ...notificationRecieveConfig },
 				receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
 				followRequestAccepted: { optional: true, ...notificationRecieveConfig },
 				roleAssigned: { optional: true, ...notificationRecieveConfig },

packages/backend/src/queue/processors/PostScheduledNoteProcessorService.ts

@@ -32,24 +32,16 @@ export class PostScheduledNoteProcessorService {
 	@bindThis
 	public async process(job: Bull.Job<PostScheduledNoteJobData>): Promise<void> {
 		const draft = await this.noteDraftsRepository.findOne({ where: { id: job.data.noteDraftId }, relations: ['user'] });
-		if (draft == null || draft.user == null || draft.scheduledAt == null || !draft.isActuallyScheduled) {
+		if (draft == null || draft.user == null || draft.scheduledAt == null) {
 			return;
 		}
 
-		try {
 		const note = await this.noteCreateService.create(draft.user, draft);
 
-			// await不要
 		this.noteDraftsRepository.remove(draft);
 
-			// await不要
 		this.notificationService.createNotification(draft.userId, 'scheduledNotePosted', {
 			noteId: note.id,
 		});
-		} catch (err) {
-			this.notificationService.createNotification(draft.userId, 'scheduledNotePostFailed', {
-				noteDraftId: draft.id,
-			});
-		}
 	}
 }

packages/backend/src/server/api/endpoints/admin/show-user.ts

@@ -104,7 +104,6 @@ export const meta = {
 					reaction: { optional: true, ...notificationRecieveConfig },
 					pollEnded: { optional: true, ...notificationRecieveConfig },
 					scheduledNotePosted: { optional: true, ...notificationRecieveConfig },
-					scheduledNotePostFailed: { optional: true, ...notificationRecieveConfig },
 					receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
 					followRequestAccepted: { optional: true, ...notificationRecieveConfig },
 					roleAssigned: { optional: true, ...notificationRecieveConfig },

packages/backend/src/server/api/endpoints/i/update.ts

@@ -210,7 +210,6 @@ export const paramDef = {
 				reaction: notificationRecieveConfig,
 				pollEnded: notificationRecieveConfig,
 				scheduledNotePosted: notificationRecieveConfig,
-				scheduledNotePostFailed: notificationRecieveConfig,
 				receiveFollowRequest: notificationRecieveConfig,
 				followRequestAccepted: notificationRecieveConfig,
 				roleAssigned: notificationRecieveConfig,

packages/backend/src/server/api/endpoints/notes/drafts/create.ts

@@ -162,7 +162,7 @@ export const paramDef = {
 		fileIds: {
 			type: 'array',
 			uniqueItems: true,
-			minItems: 0,
+			minItems: 1,
 			maxItems: 16,
 			items: { type: 'string', format: 'misskey:id' },
 		},
@@ -184,9 +184,8 @@ export const paramDef = {
 			required: ['choices'],
 		},
 		scheduledAt: { type: 'integer', nullable: true },
-		isActuallyScheduled: { type: 'boolean', default: false },
 	},
-	required: ['visibility', 'visibleUserIds', 'cw', 'hashtag', 'localOnly', 'reactionAcceptance', 'replyId', 'renoteId', 'channelId', 'text', 'fileIds', 'poll', 'scheduledAt', 'isActuallyScheduled'],
+	required: [],
 } as const;
 
 @Injectable()
@@ -198,23 +197,23 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const draft = await this.noteDraftService.create(me, {
 				fileIds: ps.fileIds,
-				pollChoices: ps.poll?.choices ?? [],
+				poll: ps.poll ? {
-				pollMultiple: ps.poll?.multiple ?? false,
+					choices: ps.poll.choices,
-				pollExpiresAt: ps.poll?.expiresAt ? new Date(ps.poll.expiresAt) : null,
+					multiple: ps.poll.multiple ?? false,
-				pollExpiredAfter: ps.poll?.expiredAfter ?? null,
+					expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
-				hasPoll: ps.poll != null,
+					expiredAfter: ps.poll.expiredAfter ?? null,
-				text: ps.text,
+				} : undefined,
-				replyId: ps.replyId,
+				text: ps.text ?? null,
-				renoteId: ps.renoteId,
+				replyId: ps.replyId ?? undefined,
-				cw: ps.cw,
+				renoteId: ps.renoteId ?? undefined,
-				hashtag: ps.hashtag,
+				cw: ps.cw ?? null,
+				...(ps.hashtag ? { hashtag: ps.hashtag } : {}),
 				localOnly: ps.localOnly,
 				reactionAcceptance: ps.reactionAcceptance,
 				visibility: ps.visibility,
-				visibleUserIds: ps.visibleUserIds,
+				visibleUserIds: ps.visibleUserIds ?? [],
-				channelId: ps.channelId,
+				channelId: ps.channelId ?? undefined,
 				scheduledAt: ps.scheduledAt ? new Date(ps.scheduledAt) : null,
-				isActuallyScheduled: ps.isActuallyScheduled,
 			}).catch((err) => {
 				if (err instanceof IdentifiableError) {
 					switch (err.id) {

packages/backend/src/server/api/endpoints/notes/drafts/list.ts

@@ -41,7 +41,6 @@ export const paramDef = {
 		untilId: { type: 'string', format: 'misskey:id' },
 		sinceDate: { type: 'integer' },
 		untilDate: { type: 'integer' },
-		scheduled: { type: 'boolean', nullable: true },
 	},
 	required: [],
 } as const;
@@ -59,12 +58,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const query = this.queryService.makePaginationQuery<MiNoteDraft>(this.noteDraftsRepository.createQueryBuilder('drafts'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 				.andWhere('drafts.userId = :meId', { meId: me.id });
 
-			if (ps.scheduled === true) {
-				query.andWhere('drafts.isActuallyScheduled = true');
-			} else if (ps.scheduled === false) {
-				query.andWhere('drafts.isActuallyScheduled = false');
-			}
-
 			const drafts = await query
 				.limit(ps.limit)
 				.getMany();

packages/backend/src/server/api/endpoints/notes/drafts/update.ts

@@ -171,14 +171,14 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		draftId: { type: 'string', nullable: false, format: 'misskey:id' },
-		visibility: { type: 'string', enum: ['public', 'home', 'followers', 'specified'] },
+		visibility: { type: 'string', enum: ['public', 'home', 'followers', 'specified'], default: 'public' },
 		visibleUserIds: { type: 'array', uniqueItems: true, items: {
 			type: 'string', format: 'misskey:id',
 		} },
 		cw: { type: 'string', nullable: true, minLength: 1, maxLength: 100 },
 		hashtag: { type: 'string', nullable: true, maxLength: 200 },
-		localOnly: { type: 'boolean' },
+		localOnly: { type: 'boolean', default: false },
-		reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'] },
+		reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null },
 		replyId: { type: 'string', format: 'misskey:id', nullable: true },
 		renoteId: { type: 'string', format: 'misskey:id', nullable: true },
 		channelId: { type: 'string', format: 'misskey:id', nullable: true },
@@ -194,7 +194,7 @@ export const paramDef = {
 		fileIds: {
 			type: 'array',
 			uniqueItems: true,
-			minItems: 0,
+			minItems: 1,
 			maxItems: 16,
 			items: { type: 'string', format: 'misskey:id' },
 		},
@@ -216,7 +216,6 @@ export const paramDef = {
 			required: ['choices'],
 		},
 		scheduledAt: { type: 'integer', nullable: true },
-		isActuallyScheduled: { type: 'boolean' },
 	},
 	required: ['draftId'],
 } as const;
@@ -230,22 +229,23 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const draft = await this.noteDraftService.update(me, ps.draftId, {
 				fileIds: ps.fileIds,
-				pollChoices: ps.poll?.choices,
+				poll: ps.poll ? {
-				pollMultiple: ps.poll?.multiple,
+					choices: ps.poll.choices,
-				pollExpiresAt: ps.poll?.expiresAt ? new Date(ps.poll.expiresAt) : null,
+					multiple: ps.poll.multiple ?? false,
-				pollExpiredAfter: ps.poll?.expiredAfter,
+					expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
-				text: ps.text,
+					expiredAfter: ps.poll.expiredAfter ?? null,
-				replyId: ps.replyId,
+				} : undefined,
-				renoteId: ps.renoteId,
+				text: ps.text ?? null,
-				cw: ps.cw,
+				replyId: ps.replyId ?? undefined,
-				hashtag: ps.hashtag,
+				renoteId: ps.renoteId ?? undefined,
+				cw: ps.cw ?? null,
+				...(ps.hashtag ? { hashtag: ps.hashtag } : {}),
 				localOnly: ps.localOnly,
 				reactionAcceptance: ps.reactionAcceptance,
 				visibility: ps.visibility,
-				visibleUserIds: ps.visibleUserIds,
+				visibleUserIds: ps.visibleUserIds ?? [],
-				channelId: ps.channelId,
+				channelId: ps.channelId ?? undefined,
 				scheduledAt: ps.scheduledAt ? new Date(ps.scheduledAt) : null,
-				isActuallyScheduled: ps.isActuallyScheduled,
 			}).catch((err) => {
 				if (err instanceof IdentifiableError) {
 					switch (err.id) {

packages/backend/src/types.ts

@@ -13,7 +13,6 @@
  * reaction - 投稿にリアクションされた
  * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した
  * scheduledNotePosted - 予約したノートが投稿された
- * scheduledNotePostFailed - 予約したノートの投稿に失敗した
  * receiveFollowRequest - フォローリクエストされた
  * followRequestAccepted - 自分の送ったフォローリクエストが承認された
  * roleAssigned - ロールが付与された
@@ -35,7 +34,6 @@ export const notificationTypes = [
 	'reaction',
 	'pollEnded',
 	'scheduledNotePosted',
-	'scheduledNotePostFailed',
 	'receiveFollowRequest',
 	'followRequestAccepted',
 	'roleAssigned',

packages/frontend-embed/vite.config.ts

@@ -64,8 +64,6 @@ function toBase62(n: number): string {
 }
 
 export function getConfig(): UserConfig {
-	const localesHash = toBase62(hash(JSON.stringify(locales)));
-
 	return {
 		base: '/embed_vite/',
 
@@ -150,9 +148,9 @@ export function getConfig(): UserConfig {
 						// dependencies of i18n.ts
 						'config': ['@@/js/config.js'],
 					},
-					entryFileNames: `scripts/${localesHash}-[hash:8].js`,
+					entryFileNames: 'scripts/[hash:8].js',
-					chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
+					chunkFileNames: 'scripts/[hash:8].js',
-					assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
+					assetFileNames: 'assets/[hash:8][extname]',
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {

packages/frontend/src/components/MkNoteDraftsDialog.vue

@@ -15,32 +15,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@esc="cancel()"
 >
 	<template #header>
-		{{ i18n.ts.draftsAndScheduledNotes }} ({{ currentDraftsCount }}/{{ $i?.policies.noteDraftLimit }})
+		{{ i18n.ts.drafts }} ({{ currentDraftsCount }}/{{ $i?.policies.noteDraftLimit }})
 	</template>
-
-	<MkStickyContainer>
-		<template #header>
-			<MkTabs
-				v-model:tab="tab"
-				centered
-				:class="$style.tabs"
-				:tabs="[
-					{
-						key: 'drafts',
-						title: i18n.ts.drafts,
-						icon: 'ti ti-pencil-question',
-					},
-					{
-						key: 'scheduled',
-						title: i18n.ts.scheduled,
-						icon: 'ti ti-calendar-clock',
-					},
-				]"
-			/>
-		</template>
-
 	<div class="_spacer">
-			<MkPagination :key="tab" :paginator="tab === 'scheduled' ? scheduledPaginator : draftsPaginator" withControl>
+		<MkPagination :paginator="paginator" withControl>
 			<template #empty>
 				<MkResult type="empty" :text="i18n.ts._drafts.noDrafts"/>
 			</template>
@@ -54,7 +32,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						:class="[$style.draft]"
 					>
 						<div :class="$style.draftBody" class="_gaps_s">
-								<MkInfo v-if="draft.scheduledAt != null && draft.isActuallyScheduled">{{ i18n.tsx.scheduledToPostOnX({ x: new Date(draft.scheduledAt).toLocaleString() }) }}</MkInfo>
 							<div :class="$style.draftInfo">
 								<div :class="$style.draftMeta">
 									<div v-if="draft.reply" class="_nowrap">
@@ -108,19 +85,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkTime :time="draft.createdAt" :class="$style.draftCreatedAt" mode="detail" colored/>
 							</div>
 						</div>
-
 						<div :class="$style.draftActions" class="_buttons">
 							<MkButton
-									v-if="draft.scheduledAt != null && draft.isActuallyScheduled"
-									:class="$style.itemButton"
-									small
-									@click="cancelSchedule(draft)"
-								>
-									<i class="ti ti-calendar-x"></i>
-									{{ i18n.ts._drafts.cancelSchedule }}
-								</MkButton>
-								<MkButton
-									v-else
 								:class="$style.itemButton"
 								small
 								@click="restoreDraft(draft)"
@@ -128,6 +94,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<i class="ti ti-corner-up-left"></i>
 								{{ i18n.ts._drafts.restore }}
 							</MkButton>
+							<MkButton
+								:class="$style.itemButton"
+								small
+								@click="schedule(draft)"
+							>
+								<i class="ti ti-calendar-time"></i>
+								{{ i18n.ts._drafts.schedule }}
+							</MkButton>
 							<MkButton
 								v-tooltip="i18n.ts._drafts.delete"
 								danger
@@ -145,7 +119,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</template>
 		</MkPagination>
 	</div>
-	</MkStickyContainer>
 </MkModalWindow>
 </template>
 
@@ -161,12 +134,6 @@ import * as os from '@/os.js';
 import { $i } from '@/i.js';
 import { misskeyApi } from '@/utility/misskey-api';
 import { Paginator } from '@/utility/paginator.js';
-import MkTabs from '@/components/MkTabs.vue';
-import MkInfo from '@/components/MkInfo.vue';
-
-const props = defineProps<{
-	scheduled?: boolean;
-}>();
 
 const emit = defineEmits<{
 	(ev: 'restore', draft: Misskey.entities.NoteDraft): void;
@@ -174,20 +141,8 @@ const emit = defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-const tab = ref<'drafts' | 'scheduled'>(props.scheduled ? 'scheduled' : 'drafts');
+const paginator = markRaw(new Paginator('notes/drafts/list', {
-
-const draftsPaginator = markRaw(new Paginator('notes/drafts/list', {
 	limit: 10,
-	params: {
-		scheduled: false,
-	},
-}));
-
-const scheduledPaginator = markRaw(new Paginator('notes/drafts/list', {
-	limit: 10,
-	params: {
-		scheduled: true,
-	},
 }));
 
 const currentDraftsCount = ref(0);
@@ -216,17 +171,7 @@ async function deleteDraft(draft: Misskey.entities.NoteDraft) {
 	if (canceled) return;
 
 	os.apiWithDialog('notes/drafts/delete', { draftId: draft.id }).then(() => {
-		draftsPaginator.reload();
+		paginator.reload();
-	});
-}
-
-async function cancelSchedule(draft: Misskey.entities.NoteDraft) {
-	os.apiWithDialog('notes/drafts/update', {
-		draftId: draft.id,
-		isActuallyScheduled: false,
-		scheduledAt: null,
-	}).then(() => {
-		scheduledPaginator.reload();
 	});
 }
 </script>
@@ -284,11 +229,4 @@ async function cancelSchedule(draft: Misskey.entities.NoteDraft) {
 	padding-top: 16px;
 	border-top: solid 1px var(--MI_THEME-divider);
 }
-
-.tabs {
-	background: color(from var(--MI_THEME-bg) srgb r g b / 0.75);
-	-webkit-backdrop-filter: var(--MI-blur, blur(15px));
-	backdrop-filter: var(--MI-blur, blur(15px));
-	border-bottom: solid 0.5px var(--MI_THEME-divider);
-}
 </style>

packages/frontend/src/components/MkNotification.vue

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div :class="$style.root">
 	<div :class="$style.head">
 		<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && 'note' in notification" :class="$style.icon" :user="notification.note.user" link preview/>
-		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login', 'createToken', 'scheduledNotePosted', 'scheduledNotePostFailed'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
+		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login', 'createToken'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
 		<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
@@ -24,7 +24,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				[$style.t_quote]: notification.type === 'quote',
 				[$style.t_pollEnded]: notification.type === 'pollEnded',
 				[$style.t_scheduledNotePosted]: notification.type === 'scheduledNotePosted',
-				[$style.t_scheduledNotePostFailed]: notification.type === 'scheduledNotePostFailed',
 				[$style.t_achievementEarned]: notification.type === 'achievementEarned',
 				[$style.t_exportCompleted]: notification.type === 'exportCompleted',
 				[$style.t_login]: notification.type === 'login',
@@ -42,7 +41,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
 			<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
 			<i v-else-if="notification.type === 'scheduledNotePosted'" class="ti ti-send"></i>
-			<i v-else-if="notification.type === 'scheduledNotePostFailed'" class="ti ti-alert-triangle"></i>
 			<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
 			<i v-else-if="notification.type === 'exportCompleted'" class="ti ti-archive"></i>
 			<i v-else-if="notification.type === 'login'" class="ti ti-login-2"></i>
@@ -65,7 +63,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<header :class="$style.header">
 			<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
 			<span v-else-if="notification.type === 'scheduledNotePosted'">{{ i18n.ts._notification.scheduledNotePosted }}</span>
-			<span v-else-if="notification.type === 'scheduledNotePostFailed'">{{ i18n.ts._notification.scheduledNotePostFailed }}</span>
 			<span v-else-if="notification.type === 'note'">{{ i18n.ts._notification.newNote }}: <MkUserName :user="notification.note.user"/></span>
 			<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
 			<span v-else-if="notification.type === 'chatRoomInvitationReceived'">{{ i18n.ts._notification.chatRoomInvitationReceived }}</span>
@@ -354,11 +351,6 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
 	pointer-events: none;
 }
 
-.t_scheduledNotePostFailed {
-	background: var(--eventOther);
-	pointer-events: none;
-}
-
 .t_achievementEarned {
 	background: var(--eventAchievement);
 	pointer-events: none;

packages/frontend/src/components/MkPostForm.vue

@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button v-click-anime v-tooltip="i18n.ts.switchAccount" :class="$style.account" class="_button" @click="openAccountMenu">
 				<img :class="$style.avatar" :src="(postAccount ?? $i).avatarUrl" style="border-radius: 100%;"/>
 			</button>
-			<button v-if="$i.policies.noteDraftLimit > 0" v-tooltip="(postAccount != null && postAccount.id !== $i.id) ? null : i18n.ts.draftsAndScheduledNotes" class="_button" :class="$style.draftButton" :disabled="postAccount != null && postAccount.id !== $i.id" @click="showDraftMenu"><i class="ti ti-list"></i></button>
+			<button v-if="$i.policies.noteDraftLimit > 0" v-tooltip="(postAccount != null && postAccount.id !== $i.id) ? null : i18n.ts.draft" class="_button" :class="$style.draftButton" :disabled="postAccount != null && postAccount.id !== $i.id" @click="showDraftMenu"><i class="ti ti-pencil-minus"></i></button>
 		</div>
 		<div :class="$style.headerRight">
 			<template v-if="!(targetChannel != null && fixed)">
@@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template v-if="posted"></template>
 					<template v-else-if="posting"><MkEllipsis/></template>
 					<template v-else>{{ submitText }}</template>
-					<i style="margin-left: 6px;" :class="submitIcon"></i>
+					<i style="margin-left: 6px;" :class="posted ? 'ti ti-check' : replyTargetNote ? 'ti ti-arrow-back-up' : renoteTargetNote ? 'ti ti-quote' : 'ti ti-send'"></i>
 				</div>
 			</button>
 		</div>
@@ -61,7 +61,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button>
 		</div>
 	</div>
-	<MkInfo v-if="scheduledAt != null" :class="$style.scheduledAt">{{ i18n.tsx.scheduleToPostOnX({ x: new Date(scheduledAt).toLocaleString() }) }} - <button class="_textButton" @click="cancelSchedule()">{{ i18n.ts.cancel }}</button></MkInfo>
 	<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
 	<div v-show="useCw" :class="$style.cwOuter">
 		<input ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown" @keyup="onKeyup" @compositionend="onCompositionEnd">
@@ -264,19 +263,13 @@ const placeholder = computed((): string => {
 });
 
 const submitText = computed((): string => {
-	return scheduledAt.value != null
+	return renoteTargetNote.value
-		? i18n.ts.schedule
-		: renoteTargetNote.value
 		? i18n.ts.quote
 		: replyTargetNote.value
 			? i18n.ts.reply
 			: i18n.ts.note;
 });
 
-const submitIcon = computed((): string => {
-	return posted.value ? 'ti ti-check' : scheduledAt.value != null ? 'ti ti-calendar-time' : replyTargetNote.value ? 'ti ti-arrow-back-up' : renoteTargetNote.value ? 'ti ti-quote' : 'ti ti-send';
-});
-
 const textLength = computed((): number => {
 	return (text.value + imeText.value).length;
 });
@@ -669,7 +662,6 @@ function clear() {
 	files.value = [];
 	poll.value = null;
 	quoteId.value = null;
-	scheduledAt.value = null;
 }
 
 function onKeydown(ev: KeyboardEvent) {
@@ -840,9 +832,7 @@ function deleteDraft() {
 	miLocalStorage.setItem('drafts', JSON.stringify(draftData));
 }
 
-async function saveServerDraft(options: {
+async function saveServerDraft(clearLocal = false) {
-	isActuallyScheduled?: boolean;
-} = {}) {
 	return await os.apiWithDialog(serverDraftId.value == null ? 'notes/drafts/create' : 'notes/drafts/update', {
 		...(serverDraftId.value == null ? {} : { draftId: serverDraftId.value }),
 		text: text.value,
@@ -850,15 +840,20 @@ async function saveServerDraft(options: {
 		visibility: visibility.value,
 		localOnly: localOnly.value,
 		hashtag: hashtags.value,
-		fileIds: files.value.map(f => f.id),
+		...(files.value.length > 0 ? { fileIds: files.value.map(f => f.id) } : {}),
 		poll: poll.value,
-		visibleUserIds: visibleUsers.value.map(x => x.id),
+		...(visibleUsers.value.length > 0 ? { visibleUserIds: visibleUsers.value.map(x => x.id) } : {}),
-		renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : null,
+		renoteId: renoteTargetNote.value ? renoteTargetNote.value.id : quoteId.value ? quoteId.value : undefined,
-		replyId: replyTargetNote.value ? replyTargetNote.value.id : null,
+		replyId: replyTargetNote.value ? replyTargetNote.value.id : undefined,
-		channelId: targetChannel.value ? targetChannel.value.id : null,
+		channelId: targetChannel.value ? targetChannel.value.id : undefined,
 		reactionAcceptance: reactionAcceptance.value,
 		scheduledAt: scheduledAt.value,
-		isActuallyScheduled: options.isActuallyScheduled ?? false,
+	}).then(() => {
+		if (clearLocal) {
+			clear();
+			deleteDraft();
+		}
+	}).catch((err) => {
 	});
 }
 
@@ -893,21 +888,6 @@ async function post(ev?: MouseEvent) {
 		}
 	}
 
-	if (scheduledAt.value != null) {
-		if (uploader.items.value.some(x => x.uploaded == null)) {
-			await uploadFiles();
-
-			// アップロード失敗したものがあったら中止
-			if (uploader.items.value.some(x => x.uploaded == null)) {
-				return;
-			}
-		}
-
-		await postAsScheduled();
-		clear();
-		return;
-	}
-
 	if (props.mock) return;
 
 	if (visibility.value === 'public' && (
@@ -1079,14 +1059,6 @@ async function post(ev?: MouseEvent) {
 	});
 }
 
-async function postAsScheduled() {
-	if (props.mock) return;
-
-	await saveServerDraft({
-		isActuallyScheduled: true,
-	});
-}
-
 function cancel() {
 	emit('cancel');
 }
@@ -1256,28 +1228,14 @@ function showDraftMenu(ev: MouseEvent) {
 		action: () => {
 			showDraftsDialog();
 		},
-	}, { type: 'divider' }, {
-		type: 'button',
-		text: i18n.ts._drafts.listScheduledNotes,
-		icon: 'ti ti-clock-down',
-		action: () => {
-			showDraftsDialog();
-		},
 	}], (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
 }
 
 async function schedule() {
-	const { canceled, result } = await os.inputDatetime({
+	const { canceled, result } = await os.inputDate({
 		title: i18n.ts.schedulePost,
 	});
 	if (canceled) return;
-	if (result.getTime() <= Date.now()) return;
-
-	scheduledAt.value = result.getTime();
-}
-
-function cancelSchedule() {
-	scheduledAt.value = null;
 }
 
 onMounted(() => {
@@ -1580,10 +1538,6 @@ html[data-color-scheme=light] .preview {
 	margin: 0 20px 16px 20px;
 }
 
-.scheduledAt {
-	margin: 0 20px 16px 20px;
-}
-
 .cw,
 .hashtags,
 .text {

packages/frontend/src/os.ts

@@ -460,7 +460,7 @@ export function inputNumber(props: {
 	});
 }
 
-export function inputDatetime(props: {
+export function inputDate(props: {
 	title?: string;
 	text?: string;
 	placeholder?: string | null;
@@ -475,7 +475,7 @@ export function inputDatetime(props: {
 			title: props.title,
 			text: props.text,
 			input: {
-				type: 'datetime-local',
+				type: 'date',
 				placeholder: props.placeholder,
 				default: props.default ?? null,
 			},

packages/frontend/vite.config.ts

@@ -85,8 +85,6 @@ export function toBase62(n: number): string {
 }
 
 export function getConfig(): UserConfig {
-	const localesHash = toBase62(hash(JSON.stringify(locales)));
-
 	return {
 		base: '/vite/',
 
@@ -190,9 +188,9 @@ export function getConfig(): UserConfig {
 						// dependencies of i18n.ts
 						'config': ['@@/js/config.js'],
 					},
-					entryFileNames: `scripts/${localesHash}-[hash:8].js`,
+					entryFileNames: 'scripts/[hash:8].js',
-					chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
+					chunkFileNames: 'scripts/[hash:8].js',
-					assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
+					assetFileNames: 'assets/[hash:8][extname]',
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {

packages/misskey-js/etc/misskey-js.api.md

@@ -3226,7 +3226,7 @@ type Notification_2 = components['schemas']['Notification'];
 type NotificationsCreateRequest = operations['notifications___create']['requestBody']['content']['application/json'];
 
 // @public (undocumented)
-export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollEnded", "scheduledNotePosted", "scheduledNotePostFailed", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "chatRoomInvitationReceived", "achievementEarned", "exportCompleted", "test", "login", "createToken"];
+export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollEnded", "scheduledNotePosted", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "chatRoomInvitationReceived", "achievementEarned", "exportCompleted", "test", "login", "createToken"];
 
 // @public (undocumented)
 export function nyaize(text: string): string;

packages/misskey-js/src/autogen/types.ts

@@ -4168,15 +4168,6 @@ export type components = {
                     /** Format: misskey:id */
                     userListId: string;
                 };
-                scheduledNotePostFailed?: {
-                    /** @enum {string} */
-                    type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
-                } | {
-                    /** @enum {string} */
-                    type: 'list';
-                    /** Format: misskey:id */
-                    userListId: string;
-                };
                 receiveFollowRequest?: {
                     /** @enum {string} */
                     type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
@@ -4472,7 +4463,6 @@ export type components = {
             /** @enum {string|null} */
             reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null;
             scheduledAt: number | null;
-            isActuallyScheduled: boolean;
         };
         NoteReaction: {
             /** Format: id */
@@ -4589,14 +4579,6 @@ export type components = {
             /** @enum {string} */
             type: 'scheduledNotePosted';
             note: components['schemas']['Note'];
-        } | {
-            /** Format: id */
-            id: string;
-            /** Format: date-time */
-            createdAt: string;
-            /** @enum {string} */
-            type: 'scheduledNotePostFailed';
-            noteDraft: components['schemas']['NoteDraft'];
         } | {
             /** Format: id */
             id: string;
@@ -11698,15 +11680,6 @@ export interface operations {
                                 /** Format: misskey:id */
                                 userListId: string;
                             };
-                            scheduledNotePostFailed?: {
-                                /** @enum {string} */
-                                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
-                            } | {
-                                /** @enum {string} */
-                                type: 'list';
-                                /** Format: misskey:id */
-                                userListId: string;
-                            };
                             receiveFollowRequest?: {
                                 /** @enum {string} */
                                 type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
@@ -26008,8 +25981,8 @@ export interface operations {
                     untilDate?: number;
                     /** @default true */
                     markAsRead?: boolean;
-                    includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+                    includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
-                    excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+                    excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
                 };
             };
         };
@@ -26093,8 +26066,8 @@ export interface operations {
                     untilDate?: number;
                     /** @default true */
                     markAsRead?: boolean;
-                    includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+                    includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
-                    excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'scheduledNotePostFailed' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+                    excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'scheduledNotePosted' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'chatRoomInvitationReceived' | 'achievementEarned' | 'exportCompleted' | 'login' | 'createToken' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
                 };
             };
         };
@@ -27377,15 +27350,6 @@ export interface operations {
                             /** Format: misskey:id */
                             userListId: string;
                         };
-                        scheduledNotePostFailed?: {
-                            /** @enum {string} */
-                            type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
-                        } | {
-                            /** @enum {string} */
-                            type: 'list';
-                            /** Format: misskey:id */
-                            userListId: string;
-                        };
                         receiveFollowRequest?: {
                             /** @enum {string} */
                             type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
@@ -29215,34 +29179,32 @@ export interface operations {
                      * @default public
                      * @enum {string}
                      */
-                    visibility: 'public' | 'home' | 'followers' | 'specified';
+                    visibility?: 'public' | 'home' | 'followers' | 'specified';
-                    visibleUserIds: string[];
+                    visibleUserIds?: string[];
-                    cw: string | null;
+                    cw?: string | null;
-                    hashtag: string | null;
+                    hashtag?: string | null;
                     /** @default false */
-                    localOnly: boolean;
+                    localOnly?: boolean;
                     /**
                      * @default null
                      * @enum {string|null}
                      */
-                    reactionAcceptance: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
+                    reactionAcceptance?: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
                     /** Format: misskey:id */
-                    replyId: string | null;
+                    replyId?: string | null;
                     /** Format: misskey:id */
-                    renoteId: string | null;
+                    renoteId?: string | null;
                     /** Format: misskey:id */
-                    channelId: string | null;
+                    channelId?: string | null;
-                    text: string | null;
+                    text?: string | null;
-                    fileIds: string[];
+                    fileIds?: string[];
-                    poll: {
+                    poll?: {
                         choices: string[];
                         multiple?: boolean;
                         expiresAt?: number | null;
                         expiredAfter?: number | null;
                     } | null;
-                    scheduledAt: number | null;
+                    scheduledAt?: number | null;
-                    /** @default false */
-                    isActuallyScheduled: boolean;
                 };
             };
         };
@@ -29389,7 +29351,6 @@ export interface operations {
                     untilId?: string;
                     sinceDate?: number;
                     untilDate?: number;
-                    scheduled?: boolean | null;
                 };
             };
         };
@@ -29456,13 +29417,20 @@ export interface operations {
                 'application/json': {
                     /** Format: misskey:id */
                     draftId: string;
-                    /** @enum {string} */
+                    /**
+                     * @default public
+                     * @enum {string}
+                     */
                     visibility?: 'public' | 'home' | 'followers' | 'specified';
                     visibleUserIds?: string[];
                     cw?: string | null;
                     hashtag?: string | null;
+                    /** @default false */
                     localOnly?: boolean;
-                    /** @enum {string|null} */
+                    /**
+                     * @default null
+                     * @enum {string|null}
+                     */
                     reactionAcceptance?: null | 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
                     /** Format: misskey:id */
                     replyId?: string | null;
@@ -29479,7 +29447,6 @@ export interface operations {
                         expiredAfter?: number | null;
                     } | null;
                     scheduledAt?: number | null;
-                    isActuallyScheduled?: boolean;
                 };
             };
         };

packages/misskey-js/src/consts.ts

@@ -27,7 +27,6 @@ export const notificationTypes = [
 	'reaction',
 	'pollEnded',
 	'scheduledNotePosted',
-	'scheduledNotePostFailed',
 	'receiveFollowRequest',
 	'followRequestAccepted',
 	'groupInvited',