From b4b82ea478fa8b311d9447448259b0f942e74b01 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Sun, 4 Sep 2022 03:28:27 +0200
Subject: [PATCH] remove ASSET_SERVER config

---
 README.md                                 |  1 -
 src/components/ChatMessage.jsx            |  6 +-----
 src/components/LanguageSelect.jsx         |  2 +-
 src/components/LogInArea.jsx              | 10 +++++-----
 src/components/ModWatchtools.jsx          |  2 +-
 src/components/embeds/DirectLinkMedia.jsx |  2 +-
 src/components/embeds/Matrix.jsx          |  2 +-
 src/components/embeds/Odysee.jsx          |  2 +-
 src/components/embeds/Telegram.jsx        |  2 +-
 src/components/embeds/TikTok.jsx          |  2 +-
 src/components/embeds/Twitter.jsx         |  2 +-
 src/components/embeds/YouTube.jsx         |  2 +-
 src/core/config.js                        |  2 --
 src/ssr/Globe.jsx                         |  3 +--
 src/ssr/Main.jsx                          |  5 ++---
 src/ssr/PopUp.jsx                         |  5 ++---
 16 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 068a188..4a99109 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,6 @@ Configuration takes place in the environment variables that are defined in ecosy
 
 | Variable          | Description                           | Example                   |
 |-------------------|:--------------------------------------|---------------------------|
-| ASSET_SERVER      | URL for assets                        | "http://localhost"        |
 | USE_PROXYCHECK    | Check users for Proxies               | 0                         |
 | PROXYCHECK_KEY    | Key for proxycheck.io                 | "asfas-xcsc-ewef-sdfsd"   |
 | APISOCKET_KEY     | Key for API Socket for SpecialAccess™ | "SDfasife3"               |
diff --git a/src/components/ChatMessage.jsx b/src/components/ChatMessage.jsx
index d3bc685..31786fd 100644
--- a/src/components/ChatMessage.jsx
+++ b/src/components/ChatMessage.jsx
@@ -50,11 +50,7 @@ function ChatMessage({
                 className="chatflag"
                 alt=""
                 title={country}
-                src={`${window.ssv.assetserver}/cf/${country}.gif`}
-                onError={(e) => {
-                  e.target.onerror = null;
-                  e.target.src = './cf/xx.gif';
-                }}
+                src={`/cf/${country}.gif`}
               />
               <span
                 className="chatname"
diff --git a/src/components/LanguageSelect.jsx b/src/components/LanguageSelect.jsx
index 579d36a..dfbbf7c 100644
--- a/src/components/LanguageSelect.jsx
+++ b/src/components/LanguageSelect.jsx
@@ -56,7 +56,7 @@ function LanguageSelect() {
         <img
           style={{ height: '1em', imageRendering: 'crisp-edges' }}
           alt=""
-          src={`${window.ssv.assetserver}/cf/${ccSel}.gif`}
+          src={`/cf/${ccSel}.gif`}
         />
       </span>
       <button
diff --git a/src/components/LogInArea.jsx b/src/components/LogInArea.jsx
index fcd45c1..b93f082 100644
--- a/src/components/LogInArea.jsx
+++ b/src/components/LogInArea.jsx
@@ -32,7 +32,7 @@ const LogInArea = ({ windowId }) => {
         <img
           style={logoStyle}
           width={32}
-          src={`${window.ssv.assetserver}/discordlogo.svg`}
+          src="/discordlogo.svg"
           alt="Discord"
         />
       </a>
@@ -40,7 +40,7 @@ const LogInArea = ({ windowId }) => {
         <img
           style={logoStyle}
           width={32}
-          src={`${window.ssv.assetserver}/googlelogo.svg`}
+          src="/googlelogo.svg"
           alt="Google"
         />
       </a>
@@ -48,7 +48,7 @@ const LogInArea = ({ windowId }) => {
         <img
           style={logoStyle}
           width={32}
-          src={`${window.ssv.assetserver}/facebooklogo.svg`}
+          src="/facebooklogo.svg"
           alt="Facebook"
         />
       </a>
@@ -56,7 +56,7 @@ const LogInArea = ({ windowId }) => {
         <img
           style={logoStyle}
           width={32}
-          src={`${window.ssv.assetserver}/vklogo.svg`}
+          src="/vklogo.svg"
           alt="VK"
         />
       </a>
@@ -64,7 +64,7 @@ const LogInArea = ({ windowId }) => {
         <img
           style={logoStyle}
           width={32}
-          src={`${window.ssv.assetserver}/redditlogo.svg`}
+          src="/redditlogo.svg"
           alt="Reddit"
         />
       </a>
diff --git a/src/components/ModWatchtools.jsx b/src/components/ModWatchtools.jsx
index 7134d98..c9c40a3 100644
--- a/src/components/ModWatchtools.jsx
+++ b/src/components/ModWatchtools.jsx
@@ -339,7 +339,7 @@ function ModWatchtools() {
                                 imageRendering: 'crisp-edges',
                               }}
                               alt={val}
-                              src={`${window.ssv.assetserver}/cf/${flag}.gif`}
+                              src={`/cf/${flag}.gif`}
                             /></td>
                           );
                         }
diff --git a/src/components/embeds/DirectLinkMedia.jsx b/src/components/embeds/DirectLinkMedia.jsx
index e632a22..55b2fe7 100644
--- a/src/components/embeds/DirectLinkMedia.jsx
+++ b/src/components/embeds/DirectLinkMedia.jsx
@@ -48,5 +48,5 @@ export default [
     return (videoExts.includes(ext) || imageExts.includes(ext));
   },
   null,
-  `${window.ssv.assetserver}/embico/direct.png`,
+  '/embico/direct.png',
 ];
diff --git a/src/components/embeds/Matrix.jsx b/src/components/embeds/Matrix.jsx
index 0ef1a06..e52f650 100644
--- a/src/components/embeds/Matrix.jsx
+++ b/src/components/embeds/Matrix.jsx
@@ -29,5 +29,5 @@ export default [
   React.memo(Matrix),
   (url) => url.includes('?type=video') || url.includes('?type=image'),
   null,
-  `${window.ssv.assetserver}/embico/matrix.png`,
+  '/embico/matrix.png',
 ];
diff --git a/src/components/embeds/Odysee.jsx b/src/components/embeds/Odysee.jsx
index de35a3a..2202fde 100644
--- a/src/components/embeds/Odysee.jsx
+++ b/src/components/embeds/Odysee.jsx
@@ -94,5 +94,5 @@ export default [
     urlPart = stripCol(stripQuery(urlPart));
     return urlPart;
   },
-  `${window.ssv.assetserver}/embico/odysee.png`,
+  '/embico/odysee.png',
 ];
diff --git a/src/components/embeds/Telegram.jsx b/src/components/embeds/Telegram.jsx
index 28e65c1..3476167 100644
--- a/src/components/embeds/Telegram.jsx
+++ b/src/components/embeds/Telegram.jsx
@@ -71,5 +71,5 @@ export default [
     title = title.substring(0, title.indexOf('/'));
     return title;
   },
-  `${window.ssv.assetserver}/embico/telegram.png`,
+  '/embico/telegram.png',
 ];
diff --git a/src/components/embeds/TikTok.jsx b/src/components/embeds/TikTok.jsx
index c324309..babf27c 100644
--- a/src/components/embeds/TikTok.jsx
+++ b/src/components/embeds/TikTok.jsx
@@ -56,5 +56,5 @@ export default [
   React.memo(TikTok),
   (url) => url.includes('/video/'),
   (url) => getUserFromUrl(url),
-  `${window.ssv.assetserver}/embico/tiktok.png`,
+  '/embico/tiktok.png',
 ];
diff --git a/src/components/embeds/Twitter.jsx b/src/components/embeds/Twitter.jsx
index ddb5605..b0c62dc 100644
--- a/src/components/embeds/Twitter.jsx
+++ b/src/components/embeds/Twitter.jsx
@@ -70,5 +70,5 @@ export default [
     title = title.substring(title.lastIndexOf('/') + 1);
     return title;
   },
-  `${window.ssv.assetserver}/embico/twitter.png`,
+  '/embico/twitter.png',
 ];
diff --git a/src/components/embeds/YouTube.jsx b/src/components/embeds/YouTube.jsx
index 81af61f..1fefd9b 100644
--- a/src/components/embeds/YouTube.jsx
+++ b/src/components/embeds/YouTube.jsx
@@ -45,5 +45,5 @@ export default [
   React.memo(YouTube),
   getIdFromURL,
   (url) => getIdFromURL(url),
-  `${window.ssv.assetserver}/embico/youtube.png`,
+  '/embico/youtube.png',
 ];
diff --git a/src/core/config.js b/src/core/config.js
index fae0a35..4bdbb2b 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -20,8 +20,6 @@ export const MAIL_ADDRESS = process.env.MAIL_ADDRESS
 const TILE_FOLDER_REL = process.env.TILE_FOLDER || 'tiles';
 export const TILE_FOLDER = path.join(__dirname, `./${TILE_FOLDER_REL}`);
 
-export const ASSET_SERVER = process.env.ASSET_SERVER || '.';
-
 export const USE_XREALIP = process.env.USE_XREALIP || false;
 
 export const BACKUP_URL = process.env.BACKUP_URL || null;
diff --git a/src/ssr/Globe.jsx b/src/ssr/Globe.jsx
index 6d39be1..e10cc49 100644
--- a/src/ssr/Globe.jsx
+++ b/src/ssr/Globe.jsx
@@ -9,7 +9,6 @@ import { getTTag } from '../core/ttag';
 
 /* this will be set by webpack */
 import { assets } from '../core/assets';
-import { ASSET_SERVER } from '../core/config';
 
 import globeCss from '../styles/globe.css';
 
@@ -46,7 +45,7 @@ function generateGlobePage(lang) {
         <div id="coorbox">(0, 0)</div>
         <div id="info">${t`Double click on globe to go back.`}</div>
         <div id="loading">${t`Loading...`}</div>
-        ${scripts.map((script) => `<script src="${ASSET_SERVER + script}"></script>`).join('')}
+        ${scripts.map((script) => `<script src="${script}"></script>`).join('')}
       </body>
     </html>
   `;
diff --git a/src/ssr/Main.jsx b/src/ssr/Main.jsx
index 54e1ff8..19e851d 100644
--- a/src/ssr/Main.jsx
+++ b/src/ssr/Main.jsx
@@ -9,7 +9,7 @@ import { langCodeToCC } from '../utils/location';
 import ttags, { getTTag } from '../core/ttag';
 import { styleassets, assets } from '../core/assets';
 
-import { ASSET_SERVER, BACKUP_URL } from '../core/config';
+import { BACKUP_URL } from '../core/config';
 
 /*
  * generate language list
@@ -22,7 +22,6 @@ const langs = Object.keys(ttags)
  * values that we pass to client scripts
  */
 const ssv = {
-  assetserver: ASSET_SERVER,
   availableStyles: styleassets,
   langs,
 };
@@ -66,7 +65,7 @@ function generateMainPage(lang) {
       <body>
         <div id="app">
         </div>
-        ${scripts.map((script) => `<script src="${ASSET_SERVER + script}"></script>`).join('')}
+        ${scripts.map((script) => `<script src="${script}"></script>`).join('')}
       </body>
     </html>
   `;
diff --git a/src/ssr/PopUp.jsx b/src/ssr/PopUp.jsx
index 419ab0d..69c2836 100644
--- a/src/ssr/PopUp.jsx
+++ b/src/ssr/PopUp.jsx
@@ -10,7 +10,7 @@ import ttags, { getTTag } from '../core/ttag';
 
 /* this will be set by webpack */
 import { styleassets, assets } from '../core/assets';
-import { ASSET_SERVER, BACKUP_URL } from '../core/config';
+import { BACKUP_URL } from '../core/config';
 
 /*
  * generate language list
@@ -23,7 +23,6 @@ const langs = Object.keys(ttags)
  * values that we pass to client scripts
  */
 const ssv = {
-  assetserver: ASSET_SERVER,
   availableStyles: styleassets,
   langs,
 };
@@ -67,7 +66,7 @@ function generatePopUpPage(lang) {
       <body>
         <div id="app">
         </div>
-        <script src="${ASSET_SERVER + script}"></script>
+        <script src="${script}"></script>
       </body>
     </html>
   `;