summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2023-01-22 15:13:03 +0000
committertamaina <tamaina@hotmail.co.jp>2023-01-22 15:13:03 +0000
commit0b2f945bb61fc5c3a33ab93d0134f4bfe3a05c9d (patch)
tree9a8dd7363d6fa5d3a15ad325f0a95f108d3c8863
parentwip (diff)
downloadmisskey-0b2f945bb61fc5c3a33ab93d0134f4bfe3a05c9d.tar.gz
misskey-0b2f945bb61fc5c3a33ab93d0134f4bfe3a05c9d.tar.bz2
misskey-0b2f945bb61fc5c3a33ab93d0134f4bfe3a05c9d.zip
wip
-rw-r--r--packages/backend/src/server/api/endpoints/admin/emoji/update.ts2
-rw-r--r--packages/frontend/src/custom-emojis.ts6
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 6c4c8d0e6e..22bedc7100 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -76,7 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
});
} else {
this.globalEventService.publishBroadcastStream('emojiDeleted', {
- emojis: [ emoji ],
+ emojis: [ await this.emojiEntityService.pack(emoji) ],
});
this.globalEventService.publishBroadcastStream('emojiAdded', {
diff --git a/packages/frontend/src/custom-emojis.ts b/packages/frontend/src/custom-emojis.ts
index 5b13176cd1..b080eca409 100644
--- a/packages/frontend/src/custom-emojis.ts
+++ b/packages/frontend/src/custom-emojis.ts
@@ -17,7 +17,9 @@ export const customEmojiCategories = computed<string[]>(() => {
fetchCustomEmojis();
stream.on('emojiAdded', emojiData => {
- customEmojis.value = [ emojiData.emoji, ...customEmojis.value ]
+ setTimeout(() => {
+ customEmojis.value = [ emojiData.emoji, ...customEmojis.value ]
+ }, 100);
});
stream.on('emojiUpdated', emojiData => {
@@ -25,7 +27,7 @@ stream.on('emojiUpdated', emojiData => {
});
stream.on('emojiDeleted', emojiData => {
- customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name))
+ customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name));
});
export async function fetchCustomEmojis() {