oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Merge tag '2023.9.1' into merge-upstream

Browse source
This commit is contained in:
riku6460 2023-09-27 04:56:47 +09:00
commit 3a57fb2b4b
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
39 changed files with 326 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/backend/src/core/CustomEmojiService.ts
View file

@ -138,11 +138,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
this.localEmojisCache.refresh();
const updated = await this.emojiEntityService.packDetailed(emoji.id);
const packed = await this.emojiEntityService.packDetailed(emoji.id);
if (emoji.name === data.name) {
this.globalEventService.publishBroadcastStream('emojiUpdated', {
emojis: [updated],
emojis: [packed],
});
} else {
this.globalEventService.publishBroadcastStream('emojiDeleted', {
@ -150,11 +150,12 @@ export class CustomEmojiService implements OnApplicationShutdown {
});
this.globalEventService.publishBroadcastStream('emojiAdded', {
emoji: updated,
emoji: packed,
});
}
if (moderator) {
const updated = await this.emojisRepository.findOneByOrFail({ id: id });
this.moderationLogService.log(moderator, 'updateCustomEmoji', {
emojiId: emoji.id,
before: emoji,