summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-09-24 10:57:24 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-09-24 10:57:24 +0900
commit8e5a90589d9203a9f5abb2c4d67151c126915b11 (patch)
treeba7147c63f9282dcb6cd4e21daf4a694ad618e84 /packages/backend/src/core
parentimprove moderation log (diff)
downloadmisskey-8e5a90589d9203a9f5abb2c4d67151c126915b11.tar.gz
misskey-8e5a90589d9203a9f5abb2c4d67151c126915b11.tar.bz2
misskey-8e5a90589d9203a9f5abb2c4d67151c126915b11.zip
improve moderation log
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/CustomEmojiService.ts41
1 files changed, 36 insertions, 5 deletions
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index aa5490eba7..b14a8666e6 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -12,12 +12,13 @@ import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import type { MiEmoji } from '@/models/Emoji.js';
-import type { EmojisRepository, MiRole } from '@/models/_.js';
+import type { EmojisRepository, MiRole, MiUser } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js';
import { UtilityService } from '@/core/UtilityService.js';
import { query } from '@/misc/prelude/url.js';
import type { Serialized } from '@/server/api/stream/types.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
const parseEmojiStrRegexp = /^(\w+)(?:@([\w.-]+))?$/;
@@ -36,6 +37,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
private utilityService: UtilityService,
private idService: IdService,
private emojiEntityService: EmojiEntityService,
+ private moderationLogService: ModerationLogService,
private globalEventService: GlobalEventService,
) {
this.cache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12);
@@ -66,7 +68,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
isSensitive: boolean;
localOnly: boolean;
roleIdsThatCanBeUsedThisEmojiAsReaction: MiRole['id'][];
- }): Promise<MiEmoji> {
+ }, moderator?: MiUser): Promise<MiEmoji> {
const emoji = await this.emojisRepository.insert({
id: this.idService.genId(),
updatedAt: new Date(),
@@ -89,6 +91,13 @@ export class CustomEmojiService implements OnApplicationShutdown {
this.globalEventService.publishBroadcastStream('emojiAdded', {
emoji: await this.emojiEntityService.packDetailed(emoji.id),
});
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'addCustomEmoji', {
+ emojiId: emoji.id,
+ emoji: emoji,
+ });
+ }
}
return emoji;
@@ -104,7 +113,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
isSensitive?: boolean;
localOnly?: boolean;
roleIdsThatCanBeUsedThisEmojiAsReaction?: MiRole['id'][];
- }): Promise<void> {
+ }, moderator?: MiUser): Promise<void> {
const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
const sameNameEmoji = await this.emojisRepository.findOneBy({ name: data.name, host: IsNull() });
if (sameNameEmoji != null && sameNameEmoji.id !== id) throw new Error('name already exists');
@@ -140,6 +149,14 @@ export class CustomEmojiService implements OnApplicationShutdown {
emoji: updated,
});
}
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'updateCustomEmoji', {
+ emojiId: emoji.id,
+ before: emoji,
+ after: updated,
+ });
+ }
}
@bindThis
@@ -231,7 +248,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
}
@bindThis
- public async delete(id: MiEmoji['id']) {
+ public async delete(id: MiEmoji['id'], moderator?: MiUser) {
const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
await this.emojisRepository.delete(emoji.id);
@@ -241,16 +258,30 @@ export class CustomEmojiService implements OnApplicationShutdown {
this.globalEventService.publishBroadcastStream('emojiDeleted', {
emojis: [await this.emojiEntityService.packDetailed(emoji)],
});
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'deleteCustomEmoji', {
+ emojiId: emoji.id,
+ emoji: emoji,
+ });
+ }
}
@bindThis
- public async deleteBulk(ids: MiEmoji['id'][]) {
+ public async deleteBulk(ids: MiEmoji['id'][], moderator?: MiUser) {
const emojis = await this.emojisRepository.findBy({
id: In(ids),
});
for (const emoji of emojis) {
await this.emojisRepository.delete(emoji.id);
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'deleteCustomEmoji', {
+ emojiId: emoji.id,
+ emoji: emoji,
+ });
+ }
}
this.localEmojisCache.refresh();