diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-01-21 18:47:02 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-01-21 18:47:02 +0900 |
| commit | eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9 (patch) | |
| tree | a2d7fa54272590ce0a54abe51f4106f1134e2716 /packages/backend/src/queue/processors/db | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.tar.gz sharkey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.tar.bz2 sharkey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.zip | |
enhance: convert svg to png of custom emojis
Diffstat (limited to 'packages/backend/src/queue/processors/db')
| -rw-r--r-- | packages/backend/src/queue/processors/db/export-custom-emojis.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/queue/processors/db/import-custom-emojis.ts | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts index 92344430d6..0c06b12c9a 100644 --- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts +++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts @@ -72,7 +72,7 @@ export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promi let downloaded = false; try { - await downloadUrl(emoji.url, emojiPath); + await downloadUrl(emoji.originalUrl, emojiPath); downloaded = true; } catch (e) { // TODO: 何度か再試行 logger.error(e); diff --git a/packages/backend/src/queue/processors/db/import-custom-emojis.ts b/packages/backend/src/queue/processors/db/import-custom-emojis.ts index ba4e3f0c08..d2b0eb269a 100644 --- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts +++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts @@ -67,8 +67,9 @@ export async function importCustomEmojis(job: Bull.Job<DbUserImportJobData>, don category: emojiInfo.category, host: null, aliases: emojiInfo.aliases, - url: driveFile.url, - type: driveFile.type, + originalUrl: driveFile.url, + publicUrl: driveFile.webpublicUrl ?? driveFile.url, + type: driveFile.webpublicType ?? driveFile.type, }).then(x => Emojis.findOneOrFail(x.identifiers[0])); } |