Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(backend): read:admin:show-userread:admin:show-users を統合 #13798

Merged
merged 4 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Note
- コントロールパネル内にあるサマリープロキシの設定個所がセキュリティから全般へ変更となります。
- 悪意のある第三者がリモートユーザーになりすましたアクティビティを受け取れてしまう問題を修正しました。詳しくは[GitHub security advisory](https://github.com/misskey-dev/misskey/security/advisories/GHSA-2vxv-pv3m-3wvj)をご覧ください。
- 管理者向け権限 `read:admin:show-users` は `read:admin:show-user` に統合されました。必要に応じてAPIトークンを再発行してください。

### General
- Enhance: URLプレビューの有効化・無効化を設定できるように #13569
Expand Down
4 changes: 0 additions & 4 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7935,10 +7935,6 @@ export interface Locale extends ILocale {
* ユーザーのプライベートな情報を見る
*/
"read:admin:show-user": string;
/**
* ユーザーのプライベートな情報を見る
*/
"read:admin:show-users": string;
/**
* ユーザーを凍結する
*/
Expand Down
1 change: 0 additions & 1 deletion locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,6 @@ _permissions:
"read:admin:server-info": "サーバーの情報を見る"
"read:admin:show-moderation-log": "モデレーションログを見る"
"read:admin:show-user": "ユーザーのプライベートな情報を見る"
"read:admin:show-users": "ユーザーのプライベートな情報を見る"
"write:admin:suspend-user": "ユーザーを凍結する"
"write:admin:unset-user-avatar": "ユーザーのアバターを削除する"
"write:admin:unset-user-banner": "ユーザーのバーナーを削除する"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const meta = {

requireCredential: true,
requireModerator: true,
kind: 'read:admin:show-users',
kind: 'read:admin:show-user',

res: {
type: 'array',
Expand Down
2 changes: 1 addition & 1 deletion packages/misskey-js/etc/misskey-js.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -2626,7 +2626,7 @@ type PagesUpdateRequest = operations['pages___update']['requestBody']['content']
function parse(acct: string): Acct;

// @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", "read:admin:show-users", "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: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'];
Expand Down
2 changes: 1 addition & 1 deletion packages/misskey-js/src/autogen/apiClientJSDoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ declare module '../api.js' {
/**
* No description provided.
*
* **Credential required**: *Yes* / **Permission**: *read:admin:show-users*
* **Credential required**: *Yes* / **Permission**: *read:admin:show-user*
*/
request<E extends 'admin/show-users', P extends Endpoints[E]['req']>(
endpoint: E,
Expand Down
4 changes: 2 additions & 2 deletions packages/misskey-js/src/autogen/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ export type paths = {
* admin/show-users
* @description No description provided.
*
* **Credential required**: *Yes* / **Permission**: *read:admin:show-users*
* **Credential required**: *Yes* / **Permission**: *read:admin:show-user*
*/
post: operations['admin___show-users'];
};
Expand Down Expand Up @@ -8647,7 +8647,7 @@ export type operations = {
* admin/show-users
* @description No description provided.
*
* **Credential required**: *Yes* / **Permission**: *read:admin:show-users*
* **Credential required**: *Yes* / **Permission**: *read:admin:show-user*
*/
'admin___show-users': {
requestBody: {
Expand Down
1 change: 0 additions & 1 deletion packages/misskey-js/src/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
'read:admin:server-info',
'read:admin:show-moderation-log',
'read:admin:show-user',
'read:admin:show-users',
'write:admin:suspend-user',
'write:admin:unset-user-avatar',
'write:admin:unset-user-banner',
Expand Down Expand Up @@ -138,8 +137,8 @@

export type ModerationLogPayloads = {
updateServerSettings: {
before: any | null;

Check warning on line 140 in packages/misskey-js/src/consts.ts

View workflow job for this annotation

GitHub Actions / lint (misskey-js)

Unexpected any. Specify a different type
after: any | null;

Check warning on line 141 in packages/misskey-js/src/consts.ts

View workflow job for this annotation

GitHub Actions / lint (misskey-js)

Unexpected any. Specify a different type
};
suspend: {
userId: string;
Expand All @@ -160,12 +159,12 @@
};
addCustomEmoji: {
emojiId: string;
emoji: any;

Check warning on line 162 in packages/misskey-js/src/consts.ts

View workflow job for this annotation

GitHub Actions / lint (misskey-js)

Unexpected any. Specify a different type
};
updateCustomEmoji: {
emojiId: string;
before: any;

Check warning on line 166 in packages/misskey-js/src/consts.ts

View workflow job for this annotation

GitHub Actions / lint (misskey-js)

Unexpected any. Specify a different type
after: any;

Check warning on line 167 in packages/misskey-js/src/consts.ts

View workflow job for this annotation

GitHub Actions / lint (misskey-js)

Unexpected any. Specify a different type
};
deleteCustomEmoji: {
emojiId: string;
Expand Down
Loading