From ed894efa1a15298ef119b4cfd8235a788a4c983f Mon Sep 17 00:00:00 2001
From: Aleteoryx <45829905+winrg@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:23:46 -0400
Subject: [PATCH 1/2] Fix: Continue importing from file if single emoji import
 fails

---
 CHANGELOG.md                                  |  2 +-
 .../ImportCustomEmojisProcessorService.ts     | 41 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6359033c1b27..4bc409eddc6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 
 ### Server
 - ファイルがサイズの制限を超えてアップロードされた際にエラーを返さなかった問題を修正
-
+- Fix: Continue importing from file if single emoji import fails
 
 ## 2024.8.0
 
diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
index 171809d25c3a..349a59fbab08 100644
--- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
@@ -87,23 +87,30 @@ export class ImportCustomEmojisProcessorService {
 				await this.emojisRepository.delete({
 					name: emojiInfo.name,
 				});
-				const driveFile = await this.driveService.addFile({
-					user: null,
-					path: emojiPath,
-					name: record.fileName,
-					force: true,
-				});
-				await this.customEmojiService.add({
-					name: emojiInfo.name,
-					category: emojiInfo.category,
-					host: null,
-					aliases: emojiInfo.aliases,
-					driveFile,
-					license: emojiInfo.license,
-					isSensitive: emojiInfo.isSensitive,
-					localOnly: emojiInfo.localOnly,
-					roleIdsThatCanBeUsedThisEmojiAsReaction: [],
-				});
+				try {
+					const driveFile = await this.driveService.addFile({
+						user: null,
+						path: emojiPath,
+						name: record.fileName,
+						force: true,
+					});
+  				await this.customEmojiService.add({
+  					name: emojiInfo.name,
+  					category: emojiInfo.category,
+  					host: null,
+  					aliases: emojiInfo.aliases,
+  					driveFile,
+  					license: emojiInfo.license,
+  					isSensitive: emojiInfo.isSensitive,
+  					localOnly: emojiInfo.localOnly,
+  					roleIdsThatCanBeUsedThisEmojiAsReaction: [],
+  				});
+				} catch (e) {
+					if (e instanceof Error || typeof e === 'string') {
+						this.logger.error(`couldn't import ${emojiPath} for ${emojiInfo.name}: ${e}`);
+					}
+					continue;
+				}
 			}
 
 			cleanup();

From b59bc50c48ad7f1224fad9bf06b80be5c239c9d0 Mon Sep 17 00:00:00 2001
From: Aleteoryx <45829905+winrg@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:51:42 -0400
Subject: [PATCH 2/2] Fix indentation

---
 .../ImportCustomEmojisProcessorService.ts     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
index 349a59fbab08..9e1b8fee7034 100644
--- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
@@ -94,17 +94,17 @@ export class ImportCustomEmojisProcessorService {
 						name: record.fileName,
 						force: true,
 					});
-  				await this.customEmojiService.add({
-  					name: emojiInfo.name,
-  					category: emojiInfo.category,
-  					host: null,
-  					aliases: emojiInfo.aliases,
-  					driveFile,
-  					license: emojiInfo.license,
-  					isSensitive: emojiInfo.isSensitive,
-  					localOnly: emojiInfo.localOnly,
-  					roleIdsThatCanBeUsedThisEmojiAsReaction: [],
-  				});
+					await this.customEmojiService.add({
+						name: emojiInfo.name,
+						category: emojiInfo.category,
+						host: null,
+						aliases: emojiInfo.aliases,
+						driveFile,
+						license: emojiInfo.license,
+						isSensitive: emojiInfo.isSensitive,
+						localOnly: emojiInfo.localOnly,
+						roleIdsThatCanBeUsedThisEmojiAsReaction: [],
+					});
 				} catch (e) {
 					if (e instanceof Error || typeof e === 'string') {
 						this.logger.error(`couldn't import ${emojiPath} for ${emojiInfo.name}: ${e}`);