summaryrefslogtreecommitdiff
path: root/packages/backend/src/queue/processors
diff options
context:
space:
mode:
authorYuri Lee <yuno@yunochi.com>2025-03-19 19:23:50 +0900
committerGitHub <noreply@github.com>2025-03-19 10:23:50 +0000
commit21dc7aebe7b4d8e4a5c6c1542e0ee7d2d64ffacf (patch)
treec9adeebf20efcf15bb96683a0e2afc1d844bcbac /packages/backend/src/queue/processors
parentNew Crowdin updates (#15667) (diff)
downloadsharkey-21dc7aebe7b4d8e4a5c6c1542e0ee7d2d64ffacf.tar.gz
sharkey-21dc7aebe7b4d8e4a5c6c1542e0ee7d2d64ffacf.tar.bz2
sharkey-21dc7aebe7b4d8e4a5c6c1542e0ee7d2d64ffacf.zip
Fix: Don't delete remote emoji when import zip (#15674)
* Fix: Don't delete remote emoji when import zip * Update packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com> --------- Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/queue/processors')
-rw-r--r--packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
index 725e1c8ba2..95fe0a2c6a 100644
--- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
@@ -6,6 +6,7 @@
import * as fs from 'node:fs';
import { Inject, Injectable } from '@nestjs/common';
import { ZipReader } from 'slacc';
+import { IsNull } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { EmojisRepository, DriveFilesRepository } from '@/models/_.js';
import type Logger from '@/logger.js';
@@ -86,6 +87,7 @@ export class ImportCustomEmojisProcessorService {
const emojiPath = outputPath + '/' + record.fileName;
await this.emojisRepository.delete({
name: emojiInfo.name,
+ host: IsNull(),
});
try {