sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request MisskeyIO#260 from MisskeyIO/merge-upstream

Browse Source 
Merge misskey-dev/develop
This commit is contained in:
まっちゃとーにゅ
2023-11-24 03:27:25 +09:00
committed by GitHub
parent 114c7fe6b3 b918e417f7
commit b7db189307
32 changed files with 370 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/misskey-js/src/api.types.ts
View File

@@ -436,7 +436,8 @@ export type Endpoints = {
injectFeaturedNote?: boolean;
receiveAnnouncementEmail?: boolean;
alwaysMarkNsfw?: boolean;
mutedWords?: string[][];
mutedWords?: (string[] | string)[];
hardMutedWords?: (string[] | string)[];
notificationRecieveConfig?: any;
emailNotificationTypes?: string[];
alsoKnownAs?: string[];

3
packages/misskey-js/src/entities.ts
View File

@@ -115,7 +115,8 @@ export type MeDetailed = UserDetailed & {
integrations: Record<string, any>;
isDeleted: boolean;
isExplorable: boolean;
mutedWords: string[][];
mutedWords: (string[] | string)[];
hardMutedWords: (string[] | string)[];
notificationRecieveConfig: {
[notificationType in typeof notificationTypes[number]]?: {
type: 'all';