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`} /> { @@ -40,7 +40,7 @@ const LogInArea = ({ windowId }) => { @@ -48,7 +48,7 @@ const LogInArea = ({ windowId }) => { @@ -56,7 +56,7 @@ const LogInArea = ({ windowId }) => { @@ -64,7 +64,7 @@ const LogInArea = ({ windowId }) => { 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`} /> ); } 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) { (0, 0) ${t`Double click on globe to go back.`} ${t`Loading...`} - ${scripts.map((script) => ``).join('')} + ${scripts.map((script) => ``).join('')}