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

# Conflicts:
#	README.md
#	packages/backend/src/core/entities/AbuseUserReportEntityService.ts
#	packages/frontend/src/pages/admin/moderation.vue
This commit is contained in:
mattyatea 2024-05-31 21:18:45 +09:00
commit e86e8f6aa6
49 changed files with 466 additions and 178 deletions

View file

@ -3,6 +3,7 @@
"name": "misskey-js",
"version": "2024.3.1",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
"types": "./built/index.d.ts",
"exports": {
@ -30,7 +31,8 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/misskey-dev/misskey.js.git"
"url": "https://github.com/misskey-dev/misskey.git",
"directory": "packages/misskey-js"
},
"devDependencies": {
"@microsoft/api-extractor": "7.43.1",

View file

@ -4449,6 +4449,8 @@ export type components = {
isActive: boolean;
/** @default false */
hasUnreadNote: boolean;
/** @default false */
notify: boolean;
};
Clip: {
/**
@ -4831,6 +4833,7 @@ export type components = {
impressumUrl: string | null;
logoImageUrl: string | null;
privacyPolicyUrl: string | null;
inquiryUrl: string | null;
serverRules: string[];
themeColor: string | null;
policies: components['schemas']['RolePolicies'];
@ -4978,6 +4981,7 @@ export type operations = {
shortName: string | null;
objectStorageS3ForcePathStyle: boolean;
privacyPolicyUrl: string | null;
inquiryUrl: string | null;
repositoryUrl: string | null;
/**
* @deprecated
@ -8907,6 +8911,7 @@ export type operations = {
feedbackUrl?: string | null;
impressumUrl?: string | null;
privacyPolicyUrl?: string | null;
inquiryUrl?: string | null;
useObjectStorage?: boolean;
objectStorageBaseUrl?: string | null;
objectStorageBucket?: string | null;