From aa5a4cdfbe4adcb2b3056f596cde96610c5c893d Mon Sep 17 00:00:00 2001 From: derpystuff <3515180-derpystuff@users.noreply.gitlab.com> Date: Sun, 17 Jul 2022 17:11:17 +0200 Subject: [PATCH] fluent emoji, apple emoji --- commands/message/utils/enlarge.js | 15 ++++++++++++--- labscore/api/endpoints.js | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/commands/message/utils/enlarge.js b/commands/message/utils/enlarge.js index 8bf16d9..b325b65 100644 --- a/commands/message/utils/enlarge.js +++ b/commands/message/utils/enlarge.js @@ -80,10 +80,19 @@ module.exports = { if(args.type.toUpperCase() == "TWITTER"){ targetEmoji = emojiCodepoint[0].replace('-fe0f', '') } - if(args.type.toUpperCase() == "FLUENT"){ - targetEmoji = emojiCodepoint[0].replace('-fe0f', '') + let emojiUrl; + switch(args.type.toUpperCase()){ + case "FLUENT": + emojiUrl = `https://raw.githubusercontent.com/justsomederpystuff/fluent-emoji/main/emoji/${targetEmoji}.png` + break; + case "APPLE": + emojiUrl = `https://raw.githubusercontent.com/iamcal/emoji-data/master/img-apple-160/${targetEmoji}.png` + break; + default: + emojiUrl = Static.HOST + Static[args.type.toUpperCase()](targetEmoji) + break; } - let emojiUrl = Static.HOST + Static[args.type.toUpperCase()](targetEmoji) + try{ let e = await superagent.get(emojiUrl) }catch(e){ diff --git a/labscore/api/endpoints.js b/labscore/api/endpoints.js index 9b4517c..6b5b879 100644 --- a/labscore/api/endpoints.js +++ b/labscore/api/endpoints.js @@ -53,8 +53,8 @@ const Static = Object.freeze({ HOST: Hosts.emoji, TWITTER: (codepoint) => { return `twemoji-JedKxRr7RNYrgV9Sauy8EGAu/${codepoint}.png` }, - FLUENT: (codepoint) => { return `fluent-6vbne6euaxy2y9f98iub2xtr/${codepoint}.png` }, - //APPLE: (codepoint) => { return `twemoji-JedKxRr7RNYrgV9Sauy8EGAu/${codepoint}.png` }, // TODO: host these in-house + FLUENT: (codepoint) => { return `` }, + APPLE: (codepoint) => { return `` }, MICROSOFT: (codepoint) => { return `microsoft-ZzRAzYE6LgxVTrQ5rvL7nLyC/${codepoint}.png` }, EMOJIONE: (codepoint) => { return `emojione-XghVAypW8jttjFL2tQFb2z7n/${codepoint}.png` }, GOOGLE: (codepoint) => { return `google-tqzSNjYw8MVMYfSBLTLTFgmw/${codepoint}.png` },