Merge branch 'develop' into mahjong
This commit is contained in:
commit
10a112489d
72 changed files with 214 additions and 201 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* version: 2024.2.0-beta.8
|
||||
* generatedAt: 2024-01-31T01:54:12.227Z
|
||||
* generatedAt: 2024-02-01T07:26:02.481Z
|
||||
*/
|
||||
|
||||
import type { SwitchCaseResponseType } from '../api.js';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* version: 2024.2.0-beta.8
|
||||
* generatedAt: 2024-01-31T01:54:12.225Z
|
||||
* generatedAt: 2024-02-01T07:26:02.478Z
|
||||
*/
|
||||
|
||||
import type {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* version: 2024.2.0-beta.8
|
||||
* generatedAt: 2024-01-31T01:54:12.223Z
|
||||
* generatedAt: 2024-02-01T07:26:02.477Z
|
||||
*/
|
||||
|
||||
import { operations } from './types.js';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* version: 2024.2.0-beta.8
|
||||
* generatedAt: 2024-01-31T01:54:12.222Z
|
||||
* generatedAt: 2024-02-01T07:26:02.476Z
|
||||
*/
|
||||
|
||||
import { components } from './types.js';
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
/*
|
||||
* version: 2024.2.0-beta.8
|
||||
* generatedAt: 2024-01-31T01:54:12.139Z
|
||||
* generatedAt: 2024-02-01T07:26:02.396Z
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -3788,7 +3788,7 @@ export type components = {
|
|||
UserDetailedNotMe: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'];
|
||||
MeDetailed: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'] & components['schemas']['MeDetailedOnly'];
|
||||
UserDetailed: components['schemas']['UserDetailedNotMe'] | components['schemas']['MeDetailed'];
|
||||
User: components['schemas']['UserLite'] | components['schemas']['UserDetailed'] | components['schemas']['UserDetailedNotMe'] | components['schemas']['MeDetailed'];
|
||||
User: components['schemas']['UserLite'] | components['schemas']['UserDetailed'];
|
||||
UserList: {
|
||||
/**
|
||||
* Format: id
|
||||
|
|
@ -4191,8 +4191,8 @@ export type components = {
|
|||
followeeId: string;
|
||||
/** Format: id */
|
||||
followerId: string;
|
||||
followee?: components['schemas']['UserDetailed'];
|
||||
follower?: components['schemas']['UserDetailed'];
|
||||
followee?: components['schemas']['UserDetailedNotMe'];
|
||||
follower?: components['schemas']['UserDetailedNotMe'];
|
||||
};
|
||||
Muting: {
|
||||
/**
|
||||
|
|
@ -4206,7 +4206,7 @@ export type components = {
|
|||
expiresAt: string | null;
|
||||
/** Format: id */
|
||||
muteeId: string;
|
||||
mutee: components['schemas']['UserDetailed'];
|
||||
mutee: components['schemas']['UserDetailedNotMe'];
|
||||
};
|
||||
RenoteMuting: {
|
||||
/**
|
||||
|
|
@ -4218,7 +4218,7 @@ export type components = {
|
|||
createdAt: string;
|
||||
/** Format: id */
|
||||
muteeId: string;
|
||||
mutee: components['schemas']['UserDetailed'];
|
||||
mutee: components['schemas']['UserDetailedNotMe'];
|
||||
};
|
||||
Blocking: {
|
||||
/**
|
||||
|
|
@ -4230,7 +4230,7 @@ export type components = {
|
|||
createdAt: string;
|
||||
/** Format: id */
|
||||
blockeeId: string;
|
||||
blockee: components['schemas']['UserDetailed'];
|
||||
blockee: components['schemas']['UserDetailedNotMe'];
|
||||
};
|
||||
Hashtag: {
|
||||
/** @example misskey */
|
||||
|
|
@ -4883,9 +4883,9 @@ export type operations = {
|
|||
targetUserId: string;
|
||||
/** Format: id */
|
||||
assigneeId: string | null;
|
||||
reporter: components['schemas']['User'];
|
||||
targetUser: components['schemas']['User'];
|
||||
assignee?: components['schemas']['User'] | null;
|
||||
reporter: components['schemas']['UserDetailedNotMe'];
|
||||
targetUser: components['schemas']['UserDetailedNotMe'];
|
||||
assignee?: components['schemas']['UserDetailedNotMe'] | null;
|
||||
})[];
|
||||
};
|
||||
};
|
||||
|
|
@ -4940,7 +4940,7 @@ export type operations = {
|
|||
/** @description OK (with results) */
|
||||
200: {
|
||||
content: {
|
||||
'application/json': components['schemas']['User'];
|
||||
'application/json': components['schemas']['MeDetailed'];
|
||||
};
|
||||
};
|
||||
/** @description Client error */
|
||||
|
|
@ -5045,7 +5045,7 @@ export type operations = {
|
|||
/** @description OK (with results) */
|
||||
200: {
|
||||
content: {
|
||||
'application/json': components['schemas']['User'];
|
||||
'application/json': components['schemas']['UserDetailedNotMe'];
|
||||
};
|
||||
};
|
||||
/** @description Client error */
|
||||
|
|
@ -8193,7 +8193,7 @@ export type operations = {
|
|||
info: Record<string, never>;
|
||||
/** Format: id */
|
||||
userId: string;
|
||||
user: components['schemas']['UserDetailed'];
|
||||
user: components['schemas']['UserDetailedNotMe'];
|
||||
}[];
|
||||
};
|
||||
};
|
||||
|
|
@ -18351,7 +18351,7 @@ export type operations = {
|
|||
/** @description OK (with results) */
|
||||
200: {
|
||||
content: {
|
||||
'application/json': components['schemas']['UserDetailed'];
|
||||
'application/json': components['schemas']['MeDetailed'];
|
||||
};
|
||||
};
|
||||
/** @description Client error */
|
||||
|
|
@ -23011,7 +23011,7 @@ export type operations = {
|
|||
'application/json': {
|
||||
/** Format: misskey:id */
|
||||
id: string;
|
||||
user: components['schemas']['User'];
|
||||
user: components['schemas']['UserDetailed'];
|
||||
}[];
|
||||
};
|
||||
};
|
||||
|
|
@ -24806,7 +24806,7 @@ export type operations = {
|
|||
createdAt: string;
|
||||
/** Format: misskey:id */
|
||||
userId: string;
|
||||
user: components['schemas']['User'];
|
||||
user: components['schemas']['UserLite'];
|
||||
withReplies: boolean;
|
||||
}[];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { ModerationLogPayloads } from './consts.js';
|
||||
import { Announcement, EmojiDetailed, MeDetailed, MeDetailedOnly, Page, User, UserDetailed } from './autogen/models.js';
|
||||
import { Announcement, EmojiDetailed, MeDetailed, Page, User, UserDetailedNotMe } from './autogen/models.js';
|
||||
|
||||
export * from './autogen/entities.js';
|
||||
export * from './autogen/models.js';
|
||||
|
|
@ -19,7 +19,7 @@ export type ModerationLog = {
|
|||
id: ID;
|
||||
createdAt: DateString;
|
||||
userId: User['id'];
|
||||
user: UserDetailed | null;
|
||||
user: UserDetailedNotMe | null;
|
||||
} & ({
|
||||
type: 'updateServerSettings';
|
||||
info: ModerationLogPayloads['updateServerSettings'];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue