From 35a9d098980566c879b06e9da9cba7af5ac36b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B4=87=E5=B3=B0=20=E6=9C=94=E8=8F=AF?= Date: Fri, 22 Nov 2024 12:28:03 +0900 Subject: [PATCH] fix --- locales/index.d.ts | 4 ++++ locales/ja-JP.yml | 1 + .../server/api/endpoints/admin/update-proxy-account.ts | 3 +++ packages/backend/src/types.ts | 1 + packages/misskey-js/etc/misskey-js.api.md | 7 +++++-- packages/misskey-js/src/autogen/apiClientJSDoc.ts | 1 + packages/misskey-js/src/autogen/types.ts | 2 ++ packages/misskey-js/src/consts.ts | 9 +++++++++ packages/misskey-js/src/entities.ts | 3 +++ 9 files changed, 29 insertions(+), 2 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 0ae188f1f7..464ded2ea1 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -9874,6 +9874,10 @@ export interface Locale extends ILocale { * サーバー設定更新 */ "updateServerSettings": string; + /** + * ユーザーを更新 + */ + "updateUser": string; /** * ユーザーのモデレーションノート更新 */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 1b59708d85..71d583fde1 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -2618,6 +2618,7 @@ _moderationLogTypes: updateCustomEmoji: "カスタム絵文字更新" deleteCustomEmoji: "カスタム絵文字削除" updateServerSettings: "サーバー設定更新" + updateUser: "ユーザーを更新" updateUserNote: "ユーザーのモデレーションノート更新" deleteDriveFile: "ファイルを削除" deleteNote: "ノートを削除" diff --git a/packages/backend/src/server/api/endpoints/admin/update-proxy-account.ts b/packages/backend/src/server/api/endpoints/admin/update-proxy-account.ts index ee723cabc2..a26ac1197b 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-proxy-account.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-proxy-account.ts @@ -49,6 +49,7 @@ export const meta = { requireCredential: true, requireModerator: true, kind: 'write:admin:update-proxy-account', + secure: true, errors: { noSuchAvatar: { @@ -136,6 +137,8 @@ export const meta = { nullable: false, optional: false, ref: 'UserDetailed', }, + + required: [], } as const; export const paramDef = { diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts index 46f1985ecb..1120dd33ad 100644 --- a/packages/backend/src/types.ts +++ b/packages/backend/src/types.ts @@ -73,6 +73,7 @@ export const moderationLogTypes = [ 'updateServerSettings', 'suspend', 'unsuspend', + 'updateUser', 'updateUserNote', 'addCustomEmoji', 'updateCustomEmoji', diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md index 676e58a63a..73a06d8c1e 100644 --- a/packages/misskey-js/etc/misskey-js.api.md +++ b/packages/misskey-js/etc/misskey-js.api.md @@ -2476,6 +2476,9 @@ type ModerationLog = { } | { type: 'unsuspend'; info: ModerationLogPayloads['unsuspend']; +} | { + type: 'updateUser'; + info: ModerationLogPayloads['updateUser']; } | { type: 'updateUserNote'; info: ModerationLogPayloads['updateUserNote']; @@ -2620,7 +2623,7 @@ type ModerationLog = { }); // @public (undocumented) -export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost"]; +export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUser", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost"]; // @public (undocumented) type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json']; @@ -2888,7 +2891,7 @@ type PartialRolePolicyOverride = Partial<{ }>; // @public (undocumented) -export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse"]; +export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:update-proxy-account", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse"]; // @public (undocumented) type PingResponse = operations['ping']['responses']['200']['content']['application/json']; diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts index 2bab5e11e7..4640f258a4 100644 --- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts +++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts @@ -264,6 +264,7 @@ declare module '../api.js' { /** * No description provided. * + * **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties. * **Credential required**: *Yes* / **Permission**: *write:admin:update-proxy-account* */ request( diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index 50f424ebff..dd4b0c2dad 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -229,6 +229,7 @@ export type paths = { * admin/update-proxy-account * @description No description provided. * + * **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties. * **Credential required**: *Yes* / **Permission**: *write:admin:update-proxy-account* */ post: operations['admin___update-proxy-account']; @@ -6629,6 +6630,7 @@ export type operations = { * admin/update-proxy-account * @description No description provided. * + * **Internal Endpoint**: This endpoint is an API for the misskey mainframe and is not intended for use by third parties. * **Credential required**: *Yes* / **Permission**: *write:admin:update-proxy-account* */ 'admin___update-proxy-account': { diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts index c5911a70eb..be41f9812a 100644 --- a/packages/misskey-js/src/consts.ts +++ b/packages/misskey-js/src/consts.ts @@ -70,6 +70,7 @@ export const permissions = [ 'read:admin:table-stats', 'read:admin:user-ips', 'read:admin:meta', + 'write:admin:update-proxy-account', 'write:admin:reset-password', 'write:admin:resolve-abuse-user-report', 'write:admin:send-email', @@ -116,6 +117,7 @@ export const moderationLogTypes = [ 'updateServerSettings', 'suspend', 'unsuspend', + 'updateUser', 'updateUserNote', 'addCustomEmoji', 'updateCustomEmoji', @@ -200,6 +202,13 @@ export type ModerationLogPayloads = { userUsername: string; userHost: string | null; }; + updateUser: { + userId: string; + userUsername: string; + userHost: string | null; + before: MetaDetailed | null; + after: MetaDetailed | null; + }; updateUserNote: { userId: string; userUsername: string; diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts index dd88791ed0..88bf102d2e 100644 --- a/packages/misskey-js/src/entities.ts +++ b/packages/misskey-js/src/entities.ts @@ -54,6 +54,9 @@ export type ModerationLog = { } | { type: 'unsuspend'; info: ModerationLogPayloads['unsuspend']; +} | { + type: 'updateUser'; + info: ModerationLogPayloads['updateUser']; } | { type: 'updateUserNote'; info: ModerationLogPayloads['updateUserNote'];