Merge branch 'develop' into feature/2024.9.0
# Conflicts: # locales/en-US.yml # locales/ja-JP.yml # packages/backend/src/core/NoteCreateService.ts # packages/backend/src/core/NoteDeleteService.ts # packages/backend/src/core/NoteEditService.ts # packages/frontend-shared/js/config.ts # packages/frontend/src/boot/common.ts # packages/frontend/src/pages/following-feed.vue # packages/misskey-js/src/autogen/endpoint.ts
This commit is contained in:
commit
8a34d8e9d2
52 changed files with 1073 additions and 268 deletions
|
|
@ -2041,6 +2041,17 @@ declare module '../api.js' {
|
|||
credential?: string | null,
|
||||
): Promise<SwitchCaseResponseType<E, P>>;
|
||||
|
||||
/**
|
||||
* No description provided.
|
||||
*
|
||||
* **Credential required**: *Yes* / **Permission**: *read:following*
|
||||
*/
|
||||
request<E extends 'following/requests/sent', P extends Endpoints[E]['req']>(
|
||||
endpoint: E,
|
||||
params: P,
|
||||
credential?: string | null,
|
||||
): Promise<SwitchCaseResponseType<E, P>>;
|
||||
|
||||
/**
|
||||
* No description provided.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -281,6 +281,8 @@ import type {
|
|||
FollowingRequestsCancelResponse,
|
||||
FollowingRequestsListRequest,
|
||||
FollowingRequestsListResponse,
|
||||
FollowingRequestsSentRequest,
|
||||
FollowingRequestsSentResponse,
|
||||
FollowingRequestsRejectRequest,
|
||||
GalleryFeaturedRequest,
|
||||
GalleryFeaturedResponse,
|
||||
|
|
@ -777,6 +779,7 @@ export type Endpoints = {
|
|||
'following/requests/accept': { req: FollowingRequestsAcceptRequest; res: EmptyResponse };
|
||||
'following/requests/cancel': { req: FollowingRequestsCancelRequest; res: FollowingRequestsCancelResponse };
|
||||
'following/requests/list': { req: FollowingRequestsListRequest; res: FollowingRequestsListResponse };
|
||||
'following/requests/sent': { req: FollowingRequestsSentRequest; res: FollowingRequestsSentResponse };
|
||||
'following/requests/reject': { req: FollowingRequestsRejectRequest; res: EmptyResponse };
|
||||
'gallery/featured': { req: GalleryFeaturedRequest; res: GalleryFeaturedResponse };
|
||||
'gallery/popular': { req: EmptyRequest; res: GalleryPopularResponse };
|
||||
|
|
|
|||
|
|
@ -284,6 +284,8 @@ export type FollowingRequestsCancelRequest = operations['following___requests___
|
|||
export type FollowingRequestsCancelResponse = operations['following___requests___cancel']['responses']['200']['content']['application/json'];
|
||||
export type FollowingRequestsListRequest = operations['following___requests___list']['requestBody']['content']['application/json'];
|
||||
export type FollowingRequestsListResponse = operations['following___requests___list']['responses']['200']['content']['application/json'];
|
||||
export type FollowingRequestsSentRequest = operations['following___requests___sent']['requestBody']['content']['application/json'];
|
||||
export type FollowingRequestsSentResponse = operations['following___requests___sent']['responses']['200']['content']['application/json'];
|
||||
export type FollowingRequestsRejectRequest = operations['following___requests___reject']['requestBody']['content']['application/json'];
|
||||
export type GalleryFeaturedRequest = operations['gallery___featured']['requestBody']['content']['application/json'];
|
||||
export type GalleryFeaturedResponse = operations['gallery___featured']['responses']['200']['content']['application/json'];
|
||||
|
|
|
|||
|
|
@ -1780,6 +1780,15 @@ export type paths = {
|
|||
*/
|
||||
post: operations['following___requests___list'];
|
||||
};
|
||||
'/following/requests/sent': {
|
||||
/**
|
||||
* following/requests/sent
|
||||
* @description No description provided.
|
||||
*
|
||||
* **Credential required**: *Yes* / **Permission**: *read:following*
|
||||
*/
|
||||
post: operations['following___requests___sent'];
|
||||
};
|
||||
'/following/requests/reject': {
|
||||
/**
|
||||
* following/requests/reject
|
||||
|
|
@ -3985,6 +3994,7 @@ export type components = {
|
|||
hasUnreadChannel: boolean;
|
||||
hasUnreadNotification: boolean;
|
||||
hasPendingReceivedFollowRequest: boolean;
|
||||
hasPendingSentFollowRequest: boolean;
|
||||
unreadNotificationsCount: number;
|
||||
mutedWords: string[][];
|
||||
hardMutedWords: string[][];
|
||||
|
|
@ -16359,6 +16369,69 @@ export type operations = {
|
|||
};
|
||||
};
|
||||
};
|
||||
/**
|
||||
* following/requests/sent
|
||||
* @description No description provided.
|
||||
*
|
||||
* **Credential required**: *Yes* / **Permission**: *read:following*
|
||||
*/
|
||||
following___requests___sent: {
|
||||
requestBody: {
|
||||
content: {
|
||||
'application/json': {
|
||||
/** Format: misskey:id */
|
||||
sinceId?: string;
|
||||
/** Format: misskey:id */
|
||||
untilId?: string;
|
||||
/** @default 10 */
|
||||
limit?: number;
|
||||
};
|
||||
};
|
||||
};
|
||||
responses: {
|
||||
/** @description OK (with results) */
|
||||
200: {
|
||||
content: {
|
||||
'application/json': {
|
||||
/** Format: id */
|
||||
id: string;
|
||||
follower: components['schemas']['UserLite'];
|
||||
followee: components['schemas']['UserLite'];
|
||||
}[];
|
||||
};
|
||||
};
|
||||
/** @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'];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
/**
|
||||
* following/requests/reject
|
||||
* @description No description provided.
|
||||
|
|
@ -22404,6 +22477,16 @@ export type operations = {
|
|||
'application/json': {
|
||||
/** @default false */
|
||||
mutualsOnly?: boolean;
|
||||
/** @default false */
|
||||
filesOnly?: boolean;
|
||||
/** @default false */
|
||||
includeNonPublic?: boolean;
|
||||
/** @default false */
|
||||
includeReplies?: boolean;
|
||||
/** @default false */
|
||||
includeQuotes?: boolean;
|
||||
/** @default true */
|
||||
includeBots?: boolean;
|
||||
/** @default 10 */
|
||||
limit?: number;
|
||||
/** Format: misskey:id */
|
||||
|
|
@ -27336,7 +27419,15 @@ export type operations = {
|
|||
/** @default false */
|
||||
withReplies?: boolean;
|
||||
/** @default true */
|
||||
withRepliesToSelf?: boolean;
|
||||
/** @default true */
|
||||
withQuotes?: boolean;
|
||||
/** @default true */
|
||||
withRenotes?: boolean;
|
||||
/** @default true */
|
||||
withBots?: boolean;
|
||||
/** @default true */
|
||||
withNonPublic?: boolean;
|
||||
/** @default false */
|
||||
withChannelNotes?: boolean;
|
||||
/** @default 10 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue