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

Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop

Browse source 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/UserFollowingService.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
This commit is contained in:
mattyatea 2023-10-18 22:37:42 +09:00
commit c7c70c1c30
36 changed files with 1089 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/misskey-js/etc/misskey-js.api.md
View file

@ -284,6 +284,7 @@ type CustomEmoji = {
url: string;
category: string;
aliases: string[];
draft: boolean;
};
// @public (undocumented)

1
packages/misskey-js/src/entities.ts
View file

@ -312,6 +312,7 @@ export type CustomEmoji = {
url: string;
category: string;
aliases: string[];
draft: boolean;
};
export type LiteInstanceMetadata = {