misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into merge/2024-02-03

Browse source 
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot 2025-02-07 11:54:29 -05:00
commit f36029f795
24 changed files with 512 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4244,6 +4244,9 @@ export type components = {
/** Format: date-time */
lastUsed: string;
}[];
defaultCW: string | null;
/** @enum {string} */
defaultCWPriority: 'default' | 'parent' | 'defaultParent' | 'parentDefault';
};
UserDetailedNotMe: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'];
MeDetailed: components['schemas']['UserLite'] & components['schemas']['UserDetailedNotMeOnly'] & components['schemas']['MeDetailedOnly'];
@ -22777,6 +22780,9 @@ export type operations = {
};
emailNotificationTypes?: string[];
alsoKnownAs?: string[];
defaultCW?: string | null;
/** @enum {string} */
defaultCWPriority?: 'default' | 'parent' | 'defaultParent' | 'parentDefault';
};
};
};