diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts index f7dea3d907..cb9a17fdb6 100644 --- a/packages/backend/src/server/api/EndpointsModule.ts +++ b/packages/backend/src/server/api/EndpointsModule.ts @@ -263,10 +263,10 @@ import * as ep___notes_children from './endpoints/notes/children.js'; import * as ep___notes_clips from './endpoints/notes/clips.js'; import * as ep___notes_conversation from './endpoints/notes/conversation.js'; import * as ep___notes_create from './endpoints/notes/create.js'; -import * as ep___notes_schedule_create from './endpoints/notes/create-schedule.js'; -import * as ep___notes_schedule_list from './endpoints/notes/list-schedule.js'; +import * as ep___notes_schedule_create from './endpoints/notes/schedule/create.js'; +import * as ep___notes_schedule_delete from './endpoints/notes/schedule/delete.js'; +import * as ep___notes_schedule_list from './endpoints/notes/schedule/list.js'; import * as ep___notes_delete from './endpoints/notes/delete.js'; -import * as ep___notes_schedule_delete from './endpoints/notes/delete-schedule.js'; import * as ep___notes_favorites_create from './endpoints/notes/favorites/create.js'; import * as ep___notes_favorites_delete from './endpoints/notes/favorites/delete.js'; import * as ep___notes_featured from './endpoints/notes/featured.js'; @@ -624,10 +624,10 @@ const $notes_children: Provider = { provide: 'ep:notes/children', useClass: ep__ const $notes_clips: Provider = { provide: 'ep:notes/clips', useClass: ep___notes_clips.default }; const $notes_conversation: Provider = { provide: 'ep:notes/conversation', useClass: ep___notes_conversation.default }; const $notes_create: Provider = { provide: 'ep:notes/create', useClass: ep___notes_create.default }; -const $notes_schedule_create: Provider = { provide: 'ep:notes/create-schedule', useClass: ep___notes_schedule_create.default }; -const $notes_schedule_list: Provider = { provide: 'ep:notes/list-schedule', useClass: ep___notes_schedule_list.default }; +const $notes_schedule_create: Provider = { provide: 'ep:notes/schedule/create', useClass: ep___notes_schedule_create.default }; +const $notes_schedule_delete: Provider = { provide: 'ep:notes/schedule/delete', useClass: ep___notes_schedule_delete.default }; +const $notes_schedule_list: Provider = { provide: 'ep:notes/schedule/list', useClass: ep___notes_schedule_list.default }; const $notes_delete: Provider = { provide: 'ep:notes/delete', useClass: ep___notes_delete.default }; -const $notes_schedule_delete: Provider = { provide: 'ep:notes/delete-schedule', useClass: ep___notes_schedule_delete.default }; const $notes_favorites_create: Provider = { provide: 'ep:notes/favorites/create', useClass: ep___notes_favorites_create.default }; const $notes_favorites_delete: Provider = { provide: 'ep:notes/favorites/delete', useClass: ep___notes_favorites_delete.default }; const $notes_featured: Provider = { provide: 'ep:notes/featured', useClass: ep___notes_featured.default }; @@ -990,9 +990,9 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention $notes_conversation, $notes_create, $notes_schedule_create, + $notes_schedule_delete, $notes_schedule_list, $notes_delete, - $notes_schedule_delete, $notes_favorites_create, $notes_favorites_delete, $notes_featured, @@ -1349,9 +1349,9 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention $notes_conversation, $notes_create, $notes_schedule_create, + $notes_schedule_delete, $notes_schedule_list, $notes_delete, - $notes_schedule_delete, $notes_favorites_create, $notes_favorites_delete, $notes_featured, diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index 386b139256..6010589093 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -263,10 +263,10 @@ import * as ep___notes_children from './endpoints/notes/children.js'; import * as ep___notes_clips from './endpoints/notes/clips.js'; import * as ep___notes_conversation from './endpoints/notes/conversation.js'; import * as ep___notes_create from './endpoints/notes/create.js'; -import * as ep___notes_schedule_create from './endpoints/notes/create-schedule.js'; -import * as ep___notes_schedule_list from './endpoints/notes/list-schedule.js'; +import * as ep___notes_schedule_create from './endpoints/notes/schedule/create.js'; +import * as ep___notes_schedule_delete from './endpoints/notes/schedule/delete.js'; +import * as ep___notes_schedule_list from './endpoints/notes/schedule/list.js'; import * as ep___notes_delete from './endpoints/notes/delete.js'; -import * as ep___notes_schedule_delete from './endpoints/notes/delete-schedule.js'; import * as ep___notes_favorites_create from './endpoints/notes/favorites/create.js'; import * as ep___notes_favorites_delete from './endpoints/notes/favorites/delete.js'; import * as ep___notes_featured from './endpoints/notes/featured.js'; @@ -622,10 +622,10 @@ const eps = [ ['notes/clips', ep___notes_clips], ['notes/conversation', ep___notes_conversation], ['notes/create', ep___notes_create], - ['notes/create-schedule', ep___notes_schedule_create], - ['notes/list-schedule', ep___notes_schedule_list], + ['notes/schedule/create', ep___notes_schedule_create], + ['notes/schedule/delete', ep___notes_schedule_delete], + ['notes/schedule/list', ep___notes_schedule_list], ['notes/delete', ep___notes_delete], - ['notes/delete-schedule', ep___notes_schedule_delete], ['notes/favorites/create', ep___notes_favorites_create], ['notes/favorites/delete', ep___notes_favorites_delete], ['notes/featured', ep___notes_featured], diff --git a/packages/backend/src/server/api/endpoints/notes/create-schedule.ts b/packages/backend/src/server/api/endpoints/notes/schedule/create.ts similarity index 99% rename from packages/backend/src/server/api/endpoints/notes/create-schedule.ts rename to packages/backend/src/server/api/endpoints/notes/schedule/create.ts index e9854639a8..37c6bd36a6 100644 --- a/packages/backend/src/server/api/endpoints/notes/create-schedule.ts +++ b/packages/backend/src/server/api/endpoints/notes/schedule/create.ts @@ -27,7 +27,7 @@ import { isPureRenote } from '@/misc/is-pure-renote.js'; import { QueueService } from '@/core/QueueService.js'; import { MiNoteSchedule } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; -import { ApiError } from '../../error.js'; +import { ApiError } from '../../../error.js'; export const meta = { tags: ['notes'], diff --git a/packages/backend/src/server/api/endpoints/notes/delete-schedule.ts b/packages/backend/src/server/api/endpoints/notes/schedule/delete.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/notes/delete-schedule.ts rename to packages/backend/src/server/api/endpoints/notes/schedule/delete.ts diff --git a/packages/backend/src/server/api/endpoints/notes/list-schedule.ts b/packages/backend/src/server/api/endpoints/notes/schedule/list.ts similarity index 100% rename from packages/backend/src/server/api/endpoints/notes/list-schedule.ts rename to packages/backend/src/server/api/endpoints/notes/schedule/list.ts diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue index a42f674be0..769a42fa06 100644 --- a/packages/frontend/src/components/MkNoteSimple.vue +++ b/packages/frontend/src/components/MkNoteSimple.vue @@ -40,7 +40,7 @@ const props = defineProps<{ }>(); async function deleteScheduleNote() { - await os.apiWithDialog('notes/delete-schedule', { noteId: props.note.id }) + await os.apiWithDialog('notes/schedule/delete', { noteId: props.note.id }) .then(() => { isDeleted.value = true; }); diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index cea8352c2c..4fa145c924 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -786,7 +786,7 @@ async function post(ev?: MouseEvent) { } posting = true; - os.api(postData.schedule ? 'notes/create-schedule' : 'notes/create', postData, token).then(() => { + os.api(postData.schedule ? 'notes/schedule/create' : 'notes/create', postData, token).then(() => { if (props.freezeAfterPosted) { posted = true; } else { diff --git a/packages/frontend/src/components/MkSchedulePostListDialog.vue b/packages/frontend/src/components/MkSchedulePostListDialog.vue index 90c3769c82..caa84d862f 100644 --- a/packages/frontend/src/components/MkSchedulePostListDialog.vue +++ b/packages/frontend/src/components/MkSchedulePostListDialog.vue @@ -41,7 +41,7 @@ const cancel = () => { }; onMounted(async () => { - notes.value = await os.api('notes/list-schedule'); + notes.value = await os.api('notes/schedule/list'); }); diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md index 87922ba791..4164435adb 100644 --- a/packages/misskey-js/etc/misskey-js.api.md +++ b/packages/misskey-js/etc/misskey-js.api.md @@ -1759,6 +1759,26 @@ export type Endpoints = { }; res: null; }; + 'notes/schedule/create': { + req: Partial & { + schedule: { + expiresAt: number; + }; + }; + res: { + createdNote: Note; + }; + }; + 'notes/schedule/delete': { + req: { + noteId: Note['id']; + }; + res: null; + }; + 'notes/schedule/list': { + req: TODO; + res: Note[]; + }; 'notes/favorites/create': { req: { noteId: Note['id']; @@ -3035,7 +3055,7 @@ type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+u // // src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts // src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts -// src/api.types.ts:632:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts +// src/api.types.ts:635:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts // src/entities.ts:116:2 - (ae-forgotten-export) The symbol "notificationTypes_2" needs to be exported by the entry point index.d.ts // src/entities.ts:627:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts // src/streaming.types.ts:33:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts diff --git a/packages/misskey-js/src/api.types.ts b/packages/misskey-js/src/api.types.ts index 54b175fcf1..30a507480a 100644 --- a/packages/misskey-js/src/api.types.ts +++ b/packages/misskey-js/src/api.types.ts @@ -509,6 +509,9 @@ export type Endpoints = { }; }; res: { createdNote: Note }; }; 'notes/delete': { req: { noteId: Note['id']; }; res: null; }; + 'notes/schedule/create': { req: Partial & { schedule: { expiresAt: number; } }; res: { createdNote: Note }; }; + 'notes/schedule/delete': { req: { noteId: Note['id']; }; res: null; }; + 'notes/schedule/list': { req: TODO; res: Note[]; }; 'notes/favorites/create': { req: { noteId: Note['id']; }; res: null; }; 'notes/favorites/delete': { req: { noteId: Note['id']; }; res: null; }; 'notes/featured': { req: TODO; res: Note[]; };