From 7aa74035c39eb8b32471fc251081ca8e82e0c917 Mon Sep 17 00:00:00 2001
From: Airyz <36567925+Airyzz@users.noreply.github.com>
Date: Fri, 13 Jan 2023 18:04:15 +1030
Subject: [PATCH] Removed external CDN

---
 src/app/organisms/emoji-board/EmojiBoard.jsx | 10 +++----
 src/app/organisms/room/RoomViewCmdBar.jsx    |  4 +--
 src/util/twemojify.jsx                       | 29 ++++++++------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/app/organisms/emoji-board/EmojiBoard.jsx b/src/app/organisms/emoji-board/EmojiBoard.jsx
index f5374def..5da3b0f4 100644
--- a/src/app/organisms/emoji-board/EmojiBoard.jsx
+++ b/src/app/organisms/emoji-board/EmojiBoard.jsx
@@ -30,7 +30,7 @@ import PhotoIC from '../../../../public/res/ic/outlined/photo.svg';
 import BulbIC from '../../../../public/res/ic/outlined/bulb.svg';
 import PeaceIC from '../../../../public/res/ic/outlined/peace.svg';
 import FlagIC from '../../../../public/res/ic/outlined/flag.svg';
-import { getTwemojiCDN } from '../../../util/twemojify';
+import { getTwemojiBaseUrl } from '../../../util/twemojify';
 
 const ROW_EMOJIS_COUNT = 7;
 
@@ -38,7 +38,7 @@ const EmojiGroup = React.memo(({ name, groupEmojis }) => {
   function getEmojiBoard() {
     const emojiBoard = [];
     const totalEmojis = groupEmojis.length;
-    var cdn = getTwemojiCDN()
+
     for (let r = 0; r < totalEmojis; r += ROW_EMOJIS_COUNT) {
       const emojiRow = [];
       for (let c = r; c < r + ROW_EMOJIS_COUNT; c += 1) {
@@ -59,7 +59,7 @@ const EmojiGroup = React.memo(({ name, groupEmojis }) => {
                       hexcode: emoji.hexcode,
                       loading: 'lazy',
                     }),
-                    base: cdn,
+                    base: getTwemojiBaseUrl(),
                   },
                 ))
                 // This is a custom emoji, and should be render as an mxc
@@ -252,8 +252,6 @@ function EmojiBoard({ onSelect, searchRef }) {
     $emojiContent.children[tabIndex].scrollIntoView();
   }
 
-  var cdn = getTwemojiCDN()
-
   return (
     <div id="emoji-board" className="emoji-board">
       <ScrollView invisible>
@@ -337,7 +335,7 @@ function EmojiBoard({ onSelect, searchRef }) {
           </ScrollView>
         </div>
         <div ref={emojiInfo} className="emoji-board__content__info">
-          <div>{ parse(twemoji.parse('🙂', {base: cdn})) }</div>
+          <div>{ parse(twemoji.parse('🙂', {base: getTwemojiBaseUrl()})) }</div>
           <Text>:slight_smile:</Text>
         </div>
       </div>
diff --git a/src/app/organisms/room/RoomViewCmdBar.jsx b/src/app/organisms/room/RoomViewCmdBar.jsx
index b39e4b13..2438be16 100644
--- a/src/app/organisms/room/RoomViewCmdBar.jsx
+++ b/src/app/organisms/room/RoomViewCmdBar.jsx
@@ -5,7 +5,7 @@ import './RoomViewCmdBar.scss';
 import parse from 'html-react-parser';
 import twemoji from 'twemoji';
 
-import { getTwemojiCDN, twemojify } from '../../../util/twemojify';
+import { getTwemojiBaseUrl, twemojify } from '../../../util/twemojify';
 
 import initMatrix from '../../../client/initMatrix';
 import { getEmojiForCompletion } from '../emoji-board/custom-emoji';
@@ -60,7 +60,7 @@ function renderSuggestions({ prefix, option, suggestions }, fireCmd) {
             unicode: emoji.unicode,
             shortcodes: emoji.shortcodes?.toString(),
           }),
-          base: getTwemojiCDN()
+          base: getTwemojiBaseUrl()
         },
       ));
     }
diff --git a/src/util/twemojify.jsx b/src/util/twemojify.jsx
index 9c05e11f..5a666017 100644
--- a/src/util/twemojify.jsx
+++ b/src/util/twemojify.jsx
@@ -8,19 +8,9 @@ import { sanitizeText } from './sanitize';
 
 const Math = lazy(() => import('../app/atoms/math/Math'));
 
-const CDN_LOCAL = '/public/twemoji/assets/'
-const CDN_EXTERNAL = 'https://cdn.jsdelivr.net/gh/twitter/twemoji@14.0.2/assets/';
+const TWEMOJI_BASE_URL = '/public/twemoji/assets/'
 
-var use_local = false;
-
-export const getTwemojiCDN = () => {
-  if(window.__TAURI__ || use_local){
-    return CDN_LOCAL
-  }
-  else{
-    return CDN_EXTERNAL
-  }
-};
+export const getTwemojiBaseUrl = () => TWEMOJI_BASE_URL;
 
 const mathOptions = {
   replace: (node) => {
@@ -57,13 +47,16 @@ export function twemojify(text, opts, linkify = false, sanitize = true, maths =
     content = sanitizeText(content);
   }
   
-  if(opts){
-    opts.base = getTwemojiCDN()
-  } else {
-    opts = { base: getTwemojiCDN() }
+  let options = opts;
+
+  if(!options){
+    options = { base: getTwemojiBaseUrl() }
+  } 
+  else if(!options.base){
+    options.base = getTwemojiBaseUrl()
   }
-  
-  content = twemoji.parse(content, opts);
+
+  content = twemoji.parse(content, options);
   
   if (linkify) {
     content = linkifyHtml(content, {