Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot 2025-02-10 09:52:35 -05:00
commit 363111f5de
8 changed files with 132 additions and 0 deletions

View file

@ -548,6 +548,17 @@ declare module '../api.js' {
credential?: string | null,
): Promise<SwitchCaseResponseType<E, P>>;
/**
* No description provided.
*
* **Credential required**: *Yes* / **Permission**: *write:admin:meta*
*/
request<E extends 'admin/gen-vapid-keys', P extends Endpoints[E]['req']>(
endpoint: E,
params: P,
credential?: string | null,
): Promise<SwitchCaseResponseType<E, P>>;
/**
* No description provided.
*

View file

@ -658,6 +658,7 @@ export type Endpoints = {
'admin/federation/remove-all-following': { req: AdminFederationRemoveAllFollowingRequest; res: EmptyResponse };
'admin/federation/update-instance': { req: AdminFederationUpdateInstanceRequest; res: EmptyResponse };
'admin/forward-abuse-user-report': { req: AdminForwardAbuseUserReportRequest; res: EmptyResponse };
'admin/gen-vapid-keys': { req: EmptyRequest; res: EmptyResponse };
'admin/get-index-stats': { req: EmptyRequest; res: AdminGetIndexStatsResponse };
'admin/get-table-stats': { req: EmptyRequest; res: AdminGetTableStatsResponse };
'admin/get-user-ips': { req: AdminGetUserIpsRequest; res: AdminGetUserIpsResponse };

View file

@ -459,6 +459,15 @@ export type paths = {
*/
post: operations['admin___forward-abuse-user-report'];
};
'/admin/gen-vapid-keys': {
/**
* admin/gen-vapid-keys
* @description No description provided.
*
* **Credential required**: *Yes* / **Permission**: *write:admin:meta*
*/
post: operations['admin___gen-vapid-keys'];
};
'/admin/get-index-stats': {
/**
* admin/get-index-stats
@ -8306,6 +8315,50 @@ export type operations = {
};
};
};
/**
* admin/gen-vapid-keys
* @description No description provided.
*
* **Credential required**: *Yes* / **Permission**: *write:admin:meta*
*/
'admin___gen-vapid-keys': {
responses: {
/** @description OK (without any results) */
204: {
content: never;
};
/** @description Client error */
400: {
content: {
'application/json': components['schemas']['Error'];
};
};
/** @description Authentication error */
401: {
content: {
'application/json': components['schemas']['Error'];
};
};
/** @description Forbidden error */
403: {
content: {
'application/json': components['schemas']['Error'];
};
};
/** @description I'm Ai */
418: {
content: {
'application/json': components['schemas']['Error'];
};
};
/** @description Internal server error */
500: {
content: {
'application/json': components['schemas']['Error'];
};
};
};
};
/**
* admin/get-index-stats
* @description No description provided.