refactor: better emoji parsing (#458)

* refactor: update getGlobalEmojiUrl to parse Discord emoji syntax and inline emojis in titles/fields * Add animated to regex directly Co-authored-by: Jeroen Claassens <jeroen.claassens@live.nl> * chore: really ignore ignored worsd --------- Co-authored-by: Jeroen Claassens <jeroen.claassens@live.nl> Co-authored-by: Jeroen Claassens <support@favware.tech>
skyra-project · Aug 24, 2024 · 223dfc3 · 223dfc3
1 parent 62b1294
commit 223dfc3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/packages/core/src/components/discord-embed-field/DiscordEmbedField.ts b/packages/core/src/components/discord-embed-field/DiscordEmbedField.ts
@@ -132,7 +132,7 @@ export class DiscordEmbedField extends LitElement implements LightTheme {
 
 		return el.map((wordOrHtmlTemplate) => {
 			if (typeof wordOrHtmlTemplate === 'string') {
-				return html`<div>${wordOrHtmlTemplate}</div>`;
+				return html`<span>${wordOrHtmlTemplate}</span>`;
 			}
 
 			return wordOrHtmlTemplate;

diff --git a/packages/core/src/components/discord-embed/DiscordEmbed.ts b/packages/core/src/components/discord-embed/DiscordEmbed.ts
@@ -426,7 +426,7 @@ export class DiscordEmbed extends LitElement implements LightTheme {
 
 		return el.map((wordOrHtmlTemplate) => {
 			if (typeof wordOrHtmlTemplate === 'string') {
-				return html`<div>${wordOrHtmlTemplate}</div>`;
+				return html`<span>${wordOrHtmlTemplate}</span>`;
 			}
 
 			return wordOrHtmlTemplate;

diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
@@ -38,4 +38,22 @@ export const validateImageExtension = (url: string) => {
 		throw new DiscordComponentsError(`The url of an image for discord-image-attachment should match the regex ${IMAGE_EXTENSION}`);
 };
 
-export const getGlobalEmojiUrl = (emojiName: string): Emoji | undefined => getConfig().emojis?.[emojiName];
+const emojiRegex = /(?:<(?<animated>a)?:(?<name>\w{2,32}):)?(?<id>\d{17,21})>?/;
+export const getGlobalEmojiUrl = (emojiName: string): Emoji | undefined => {
+	const globalEmoji = getConfig().emojis?.[emojiName];
+	if (globalEmoji) return globalEmoji;
+
+	const match = emojiRegex.exec(emojiName);
+
+	if (match?.groups) {
+		const { name, id, animated } = match.groups;
+		const extension = animated ? 'gif' : 'png';
+
+		return {
+			name,
+			url: `https://cdn.discordapp.com/emojis/${id}.${extension}`
+		};
+	}
+
+	return undefined;
+};