diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-06 10:39:41 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-06 10:39:41 +0000 |
| commit | d899eb30b16b71f4bc7e8da5f59e2a80b6dc27fd (patch) | |
| tree | fb665ba2b23a69d549a836161902113d06a67f21 | |
| parent | merge: Improve the check_connect script (!588) (diff) | |
| parent | delete old emoji file when replaced - fixes #608 (diff) | |
| download | sharkey-d899eb30b16b71f4bc7e8da5f59e2a80b6dc27fd.tar.gz sharkey-d899eb30b16b71f4bc7e8da5f59e2a80b6dc27fd.tar.bz2 sharkey-d899eb30b16b71f4bc7e8da5f59e2a80b6dc27fd.zip | |
merge: delete old emoji file when replaced - fixes #608 (!589)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/589
Closes #608
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
| -rw-r--r-- | packages/backend/src/core/CustomEmojiService.ts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index bfbc2b172d..eea0f9228d 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -142,6 +142,13 @@ export class CustomEmojiService implements OnApplicationShutdown { this.localEmojisCache.refresh(); + if (data.driveFile != null) { + const file = await this.driveFilesRepository.findOneBy({ url: emoji.originalUrl, userHost: emoji.host ? emoji.host : IsNull() }); + if (file && file.id != data.driveFile.id) { + await this.driveService.deleteFile(file, false, moderator ? moderator : undefined); + } + } + const packed = await this.emojiEntityService.packDetailed(emoji.id); if (emoji.name === data.name) { |