Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/settings/theme.vue
This commit is contained in:
mattyatea 2024-02-09 10:14:24 +09:00
commit dfd491ff85
119 changed files with 1030 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/misskey-js/src/autogen/apiClientJSDoc.ts
View file

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T11:51:13.598Z
*/
import type { SwitchCaseResponseType } from '../api.js';
import type { Endpoints } from './endpoint.js';

5
packages/misskey-js/src/autogen/endpoint.ts
View file

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T11:51:13.595Z
*/
import type {
EmptyRequest,
EmptyResponse,

5
packages/misskey-js/src/autogen/entities.ts
View file

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T11:51:13.593Z
*/
import { operations } from './types.js';
export type EmptyRequest = Record<string, unknown> | undefined;

5
packages/misskey-js/src/autogen/models.ts
View file

@ -1,8 +1,3 @@
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T11:51:13.592Z
*/
import { components } from './types.js';
export type Error = components['schemas']['Error'];
export type UserLite = components['schemas']['UserLite'];

8
packages/misskey-js/src/autogen/types.ts
View file

@ -1,11 +1,6 @@
/* eslint @typescript-eslint/naming-convention: 0 */
/* eslint @typescript-eslint/no-explicit-any: 0 */
/*
* version: 2024.2.0-beta.8
* generatedAt: 2024-02-04T11:51:13.473Z
*/
/**
* This file was auto-generated by openapi-typescript.
* Do not make direct changes to the file.
@ -4423,6 +4418,7 @@ export type components = {
name: string;
category: string | null;
url: string;
localOnly?: boolean;
isSensitive?: boolean;
roleIdsThatCanBeUsedThisEmojiAsReaction?: string[];
};
@ -4663,6 +4659,7 @@ export type operations = {
hiddenTags: string[];
blockedHosts: string[];
sensitiveWords: string[];
prohibitedWords: string[];
bannedEmailDomains?: string[];
preservedUsernames: string[];
hcaptchaSecretKey: string | null;
@ -8418,6 +8415,7 @@ export type operations = {
hiddenTags?: string[] | null;
blockedHosts?: string[] | null;
sensitiveWords?: string[] | null;
prohibitedWords?: string[] | null;
themeColor?: string | null;
mascotImageUrl?: string | null;
bannerUrl?: string | null;