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

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

5
packages/misskey-js/src/autogen/types.ts
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;