feat: override domain header

src/components/icons/GlobeIcon.tsx

@@ -0,0 +1,5 @@
+import { Globe } from 'react-feather';
+
+export default function GlobeIcon({ ...props }) {
+  return <Globe size={15} {...props} />;
+}

src/components/icons/index.tsx

@@ -38,6 +38,7 @@ import InfoIcon from './InfoIcon';
 import FolderIcon from './FolderIcon';
 import FolderMinusIcon from './FolderMinusIcon';
 import FolderPlusIcon from './FolderPlusIcon';
+import GlobeIcon from './GlobeIcon';
 
 export {
   ActivityIcon,
@@ -80,4 +81,5 @@ export {
   FolderIcon,
   FolderMinusIcon,
   FolderPlusIcon,
+  GlobeIcon,
 };

src/components/pages/Manage/Flameshot.tsx

@@ -61,6 +61,12 @@ export default function Flameshot({ user, open, setOpen }) {
       delete extraHeaders['Original-Name'];
     }
 
+    if (values.overrideDomain && values.overrideDomain.trim() !== '') {
+      extraHeaders['Override-Domain'] = values.overrideDomain;
+    } else {
+      delete extraHeaders['Override-Domain'];
+    }
+
     for (const [key, value] of Object.entries(extraHeaders)) {
       curl.push('-H');
       curl.push(`"${key}: ${value}"`);

src/components/pages/Manage/GeneratorModal.tsx

@@ -10,13 +10,16 @@ import {
   Stack,
   Switch,
   Text,
+  TextInput,
   Title,
 } from '@mantine/core';
 import { useForm } from '@mantine/form';
-import { DownloadIcon } from 'components/icons';
+import { DownloadIcon, GlobeIcon } from 'components/icons';
 import Link from 'components/Link';
 import MutedText from 'components/MutedText';
-import { useState } from 'react';
+import { useReducer, useState } from 'react';
+
+const DEFAULT_OD_DESC = 'Override the default domain(s). Type in a URL, e.g https://example.com';
 
 export function GeneratorModal({ opened, onClose, title, onSubmit, ...other }) {
   const form = useForm({
@@ -30,6 +33,7 @@ export function GeneratorModal({ opened, onClose, title, onSubmit, ...other }) {
       wlCompositorNotSupported: false,
       noJSON: false,
       originalName: false,
+      overrideDomain: null,
     },
   });
 
@@ -40,6 +44,42 @@ export function GeneratorModal({ opened, onClose, title, onSubmit, ...other }) {
     form.setFieldValue('type', value);
   };
 
+  const [odState, setODState] = useReducer((state, newState) => ({ ...state, ...newState }), {
+    description: DEFAULT_OD_DESC,
+    error: '',
+    domain: '',
+  });
+
+  const handleOD = (e) => {
+    setODState({ error: '' });
+
+    if (e.currentTarget.value === '') {
+      setODState({ description: DEFAULT_OD_DESC, error: '', domain: null });
+      form.setFieldValue('overrideDomain', null);
+      return;
+    }
+
+    try {
+      const url = new URL(e.currentTarget.value);
+      setODState({
+        description: (
+          <>
+            {DEFAULT_OD_DESC}
+            <br />
+            <br />
+            Using domain &quot;<b>{url.hostname}</b>&quot;
+          </>
+        ),
+        error: '',
+        domain: url.hostname,
+      });
+      form.setFieldValue('overrideDomain', url.hostname);
+    } catch (e) {
+      setODState({ error: 'Invalid URL', domain: '' });
+      form.setFieldValue('overrideDomain', null);
+    }
+  };
+
   return (
     <Modal opened={opened} onClose={onClose} title={<Title order={3}>{title}</Title>} size='lg'>
       {other.desc && (
@@ -85,6 +125,14 @@ export function GeneratorModal({ opened, onClose, title, onSubmit, ...other }) {
           {...form.getInputProps('imageCompression')}
         />
 
+        <TextInput
+          label='Override Domain'
+          onChange={handleOD}
+          icon={<GlobeIcon />}
+          description={odState.description}
+          error={odState.error}
+        />
+
         <Stack my='md'>
           <Switch
             label='Zero Width Space'

src/components/pages/Manage/ShareX.tsx

@@ -79,6 +79,12 @@ export default function ShareX({ user, open, setOpen }) {
       delete config.Headers['Original-Name'];
     }
 
+    if (values.overrideDomain && values.overrideDomain.trim() !== '') {
+      config.Headers['Override-Domain'] = values.overrideDomain;
+    } else {
+      delete config.Headers['Override-Domain'];
+    }
+
     const pseudoElement = document.createElement('a');
     pseudoElement.setAttribute(
       'href',

src/components/pages/Upload/File.tsx

@@ -276,6 +276,7 @@ export default function File({ chunks: chunks_config }) {
       options.zeroWidth && req.setRequestHeader('Zws', 'true');
       options.format !== 'default' && req.setRequestHeader('Format', options.format);
       options.originalName && req.setRequestHeader('Original-Name', 'true');
+      options.overrideDomain && req.setRequestHeader('Override-Domain', options.overrideDomain);
 
       req.send(body);
     }
@@ -283,7 +284,7 @@ export default function File({ chunks: chunks_config }) {
 
   return (
     <>
-      <OptionsModal />
+      {OptionsModal}
       <Title mb='md'>Upload Files</Title>
 
       <Dropzone loading={loading} onDrop={(f) => setFiles([...files, ...f])}>

src/components/pages/Upload/Text.tsx

@@ -71,13 +71,14 @@ export default function Text() {
     options.zeroWidth && req.setRequestHeader('Zws', 'true');
     options.format !== 'default' && req.setRequestHeader('Format', options.format);
     options.originalName && req.setRequestHeader('Original-Name', 'true');
+    options.overrideDomain && req.setRequestHeader('Override-Domain', options.overrideDomain);
 
     req.send(body);
   };
 
   return (
     <>
-      <OptionsModal />
+      {OptionsModal}
       <Title mb='md'>Upload Text</Title>
 
       <Tabs defaultValue='text' variant='pills'>

src/components/pages/Upload/useUploadOptions.tsx

@@ -7,13 +7,13 @@ import {
   Select,
   Stack,
   Switch,
+  TextInput,
   Title,
 } from '@mantine/core';
-import { ClockIcon, ImageIcon, KeyIcon, TypeIcon, UserIcon } from 'components/icons';
+import { ClockIcon, ImageIcon, KeyIcon, TypeIcon, UserIcon, GlobeIcon } from 'components/icons';
 import React, { Dispatch, SetStateAction, useReducer, useState } from 'react';
 
-export default function useUploadOptions(): [
+export type UploadOptionsState = {
-  {
   expires: string;
   password: string;
   maxViews: number;
@@ -22,37 +22,57 @@ export default function useUploadOptions(): [
   embedded: boolean;
   format: string;
   originalName: boolean;
-  },
+  overrideDomain: string;
-  Dispatch<SetStateAction<boolean>>,
-  React.FC
-] {
-  const [state, setState] = useReducer((state, newState) => ({ ...state, ...newState }), {
-    expires: 'never',
-    password: '',
-    maxViews: 0,
-    compression: 'none',
-    zeroWidth: false,
-    embedded: false,
-    format: 'default',
-    originalName: false,
-  });
-
-  const [opened, setOpened] = useState(false);
-
-  const reset = () => {
-    setState({
-      expires: 'never',
-      password: '',
-      maxViews: 0,
-      compression: 'none',
-      zeroWidth: false,
-      embedded: false,
-      format: 'default',
-      originalName: false,
-    });
 };
 
-  const OptionsModal: React.FC = () => (
+const DEFAULT_OD_DESC = 'Override the default domain(s). Type in a URL, e.g https://example.com';
+
+export function OptionsModal({
+  opened,
+  setOpened,
+  state,
+  setState,
+  reset,
+}: {
+  opened: boolean;
+  setOpened: Dispatch<SetStateAction<boolean>>;
+  state: UploadOptionsState;
+  setState: Dispatch<SetStateAction<any>>;
+  reset: () => void;
+}) {
+  const [odState, setODState] = useReducer((state, newState) => ({ ...state, ...newState }), {
+    description: DEFAULT_OD_DESC,
+    error: '',
+  });
+
+  const handleOD = (e) => {
+    setODState({ error: '' });
+
+    if (e.currentTarget.value === '') {
+      setODState({ description: DEFAULT_OD_DESC, error: '' });
+      setState({ overrideDomain: '' });
+      return;
+    }
+
+    try {
+      const url = new URL(e.currentTarget.value);
+      setODState({
+        description: (
+          <>
+            {DEFAULT_OD_DESC}
+            <br />
+            <br />
+            Using domain &quot;<b>{url.hostname}</b>&quot;
+          </>
+        ),
+      });
+      setState({ overrideDomain: url.hostname });
+    } catch (e) {
+      setODState({ error: 'Invalid URL' });
+    }
+  };
+
+  return (
     <Modal title={<Title>Upload Options</Title>} size='lg' opened={opened} onClose={() => setOpened(false)}>
       <Stack>
         <NumberInput
@@ -134,6 +154,13 @@ export default function useUploadOptions(): [
           onChange={(e) => setState({ password: e.currentTarget.value })}
           icon={<KeyIcon />}
         />
+        <TextInput
+          label='Override Domain'
+          onChange={handleOD}
+          icon={<GlobeIcon />}
+          description={odState.description}
+          error={odState.error}
+        />
         <Group>
           <Switch
             label='Zero Width'
@@ -165,6 +192,47 @@ export default function useUploadOptions(): [
       </Stack>
     </Modal>
   );
-
+}
-  return [state, setOpened, OptionsModal];
+
+export default function useUploadOptions(): [UploadOptionsState, Dispatch<SetStateAction<boolean>>, any] {
+  const [state, setState] = useReducer((state, newState) => ({ ...state, ...newState }), {
+    expires: 'never',
+    password: '',
+    maxViews: 0,
+    compression: 'none',
+    zeroWidth: false,
+    embedded: false,
+    format: 'default',
+    originalName: false,
+    overrideDomain: '',
+  } as UploadOptionsState);
+
+  const [opened, setOpened] = useState(false);
+
+  const reset = () => {
+    setState({
+      expires: 'never',
+      password: '',
+      maxViews: 0,
+      compression: 'none',
+      zeroWidth: false,
+      embedded: false,
+      format: 'default',
+      originalName: false,
+      overrideDomain: '',
+    });
+  };
+
+  return [
+    state,
+    setOpened,
+    <OptionsModal
+      state={state}
+      setState={setState}
+      reset={reset}
+      opened={opened}
+      setOpened={setOpened}
+      key={1}
+    />,
+  ];
 }

src/pages/api/shorten.ts

@@ -56,27 +56,31 @@ async function handler(req: NextApiReq, res: NextApiRes) {
 
   logger.info(`User ${user.username} (${user.id}) shortenned a url ${url.destination} (${url.id})`);
 
-  if (config.discord?.shorten) {
+  let domain;
-    await sendShorten(
+  if (req.headers['override-domain']) {
-      user,
+    domain = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers['override-domain']}`;
-      url,
+  } else if (user.domains.length) {
-      `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}${
+    const randomDomain = user.domains[Math.floor(Math.random() * user.domains.length)];
-        zconfig.urls.route === '/' ? '/' : `${zconfig.urls.route}/`
+    domain = `${zconfig.core.return_https ? 'https' : 'http'}://${randomDomain}`;
-      }${req.body.vanity ? req.body.vanity : invis ? invis.invis : url.id}`
+  } else {
-    );
+    domain = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}`;
   }
 
-  const fullUrl = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}${
+  const responseUrl = `${domain}${zconfig.uploader.route === '/' ? '/' : zconfig.uploader.route}${
-    zconfig.urls.route === '/' ? '/' : zconfig.urls.route
+    req.body.vanity ? req.body.vanity : invis ? invis.invis : url.id
-  }/${req.body.vanity ? req.body.vanity : invis ? invis.invis : url.id}`;
+  }`;
+
+  if (config.discord?.shorten) {
+    await sendShorten(user, url, responseUrl);
+  }
 
   if (req.headers['no-json']) {
     res.setHeader('Content-Type', 'text/plain');
-    return res.end(fullUrl);
+    return res.end(responseUrl);
   }
 
   return res.json({
-    url: fullUrl,
+    url: responseUrl,
   });
 }
 

src/pages/api/upload.ts

@@ -171,32 +171,24 @@ async function handler(req: NextApiReq, res: NextApiRes) {
       await datasource.save(file.name, Buffer.from(chunks));
 
       logger.info(`User ${user.username} (${user.id}) uploaded ${file.name} (${file.id}) (chunked)`);
-      if (user.domains.length) {
+      let domain;
-        const domain = user.domains[Math.floor(Math.random() * user.domains.length)];
+      if (req.headers['override-domain']) {
-        response.files.push(
+        domain = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers['override-domain']}`;
-          `${domain}${zconfig.uploader.route === '/' ? '/' : zconfig.uploader.route}/${
+      } else if (user.domains.length) {
-            invis ? invis.invis : file.name
+        const randomDomain = user.domains[Math.floor(Math.random() * user.domains.length)];
-          }`
+        domain = `${zconfig.core.return_https ? 'https' : 'http'}://${randomDomain}`;
-        );
       } else {
-        response.files.push(
+        domain = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}`;
-          `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}${
-            zconfig.uploader.route === '/' ? '/' : zconfig.uploader.route
-          }/${invis ? invis.invis : file.name}`
-        );
       }
 
-      if (zconfig.discord?.upload) {
+      const responseUrl = `${domain}${zconfig.uploader.route === '/' ? '/' : zconfig.uploader.route}${
-        await sendUpload(
-          user,
-          file,
-          `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}/r/${
         invis ? invis.invis : file.name
-          }`,
+      }`;
-          `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}${
+
-            zconfig.uploader.route === '/' ? '/' : zconfig.uploader.route
+      response.files.push(responseUrl);
-          }/${invis ? invis.invis : file.name}`
+
-        );
+      if (zconfig.discord?.upload) {
+        await sendUpload(user, file, `${domain}/r/${invis ? invis.invis : file.name}`, responseUrl);
       }
 
       if (zconfig.exif.enabled && zconfig.exif.remove_gps && mimetype.startsWith('image/')) {
@@ -318,34 +310,24 @@ async function handler(req: NextApiReq, res: NextApiRes) {
     }
 
     logger.info(`User ${user.username} (${user.id}) uploaded ${fileUpload.name} (${fileUpload.id})`);
-    if (user.domains.length) {
+    let domain;
-      const domain = user.domains[Math.floor(Math.random() * user.domains.length)];
+    if (req.headers['override-domain']) {
-      response.files.push(
+      domain = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers['override-domain']}`;
-        `${domain}${zconfig.uploader.route === '/' ? '' : zconfig.uploader.route}/${
+    } else if (user.domains.length) {
-          invis ? invis.invis : fileUpload.name
+      const randomDomain = user.domains[Math.floor(Math.random() * user.domains.length)];
-        }`
+      domain = `${zconfig.core.return_https ? 'https' : 'http'}://${randomDomain}`;
-      );
     } else {
-      response.files.push(
+      domain = `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}`;
-        `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}${
-          zconfig.uploader.route === '/' ? '' : zconfig.uploader.route
-        }/${invis ? invis.invis : fileUpload.name}`
-      );
     }
 
-    logger.debug(`sent response: ${JSON.stringify(response)}`);
+    const responseUrl = `${domain}${zconfig.uploader.route === '/' ? '/' : zconfig.uploader.route}${
+      invis ? invis.invis : fileUpload.name
+    }`;
+
+    response.files.push(responseUrl);
 
     if (zconfig.discord?.upload) {
-      await sendUpload(
+      await sendUpload(user, fileUpload, `${domain}/r/${invis ? invis.invis : fileUpload.name}`, responseUrl);
-        user,
-        fileUpload,
-        `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}/r/${
-          invis ? invis.invis : fileUpload.name
-        }`,
-        `${zconfig.core.return_https ? 'https' : 'http'}://${req.headers.host}${
-          zconfig.uploader.route === '/' ? '' : zconfig.uploader.route
-        }/${invis ? invis.invis : fileUpload.name}`
-      );
     }
 
     if (zconfig.exif.enabled && zconfig.exif.remove_gps && fileUpload.mimetype.startsWith('image/')) {