161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 04:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[backend] Fix emojis with special characters

Browse Source 
This is an adaptation of 3968a6ca07 and ada577bde6

Co-authored-by: Johann150 <johann.galle@protonmail.com>
This commit is contained in:
Laura Hausmann 2024-01-04 23:54:40 +01:00
parent 299a20fb71
commit 197002df8a
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/backend/src/misc/populate-emojis.ts
View File

@ -41,13 +41,10 @@ function normalizeHost(
} }
function parseEmojiStr(emojiName: string, noteUserHost: string | null) { function parseEmojiStr(emojiName: string, noteUserHost: string | null) {
const match = emojiName.match(/^(\w+)(?:@([\w.-]+))?$/); // emojiName may be of the form `emoji@host`, turn it into a suitable form
if (!match) return { name: null, host: null }; const match = emojiName.split("@");
const name = match[0];
const name = match[1]; const host = toPunyNullable(normalizeHost(match[1], noteUserHost));
// ホスト正規化
const host = toPunyNullable(normalizeHost(match[2], noteUserHost));
return { name, host }; return { name, host };
} }

4
packages/backend/src/queue/processors/db/export-custom-emojis.ts
View File

@ -68,7 +68,9 @@ export async function exportCustomEmojis(
for (const emoji of customEmojis) { for (const emoji of customEmojis) {
const ext = mime.extension(emoji.type); const ext = mime.extension(emoji.type);
const fileName = emoji.name + (ext ? `.${ext}` : ""); // there are some restrictions on file names, so to be safe the files are
// named after their database id instead of the actual emoji name
const fileName = emoji.id + (ext ? '.' + ext : '');
const emojiPath = `${path}/${fileName}`; const emojiPath = `${path}/${fileName}`;
fs.writeFileSync(emojiPath, "", "binary"); fs.writeFileSync(emojiPath, "", "binary");
let downloaded = false; let downloaded = false;