From f818931a4a640aa7fc0e95cb6327a6eea17dfb25 Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Wed, 11 Nov 2020 13:10:47 +0100
Subject: [PATCH] Redirect fixes

---
 src/modules/qmining/qmining.js | 27 ++++++++++++++++-----------
 submodules/qmining-page        |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/modules/qmining/qmining.js b/src/modules/qmining/qmining.js
index 8939c9d..08acaa2 100644
--- a/src/modules/qmining/qmining.js
+++ b/src/modules/qmining/qmining.js
@@ -80,14 +80,24 @@ function GetApp() {
   )
 
   let donateURL = ''
+  const donateURLFile = './data/donateURL'
 
-  try {
-    donateURL = utils.ReadFile('./data/donateURL')
-  } catch (err) {
-    logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
-    console.error(err)
+  function loadDonateURL() {
+    try {
+      donateURL = utils.ReadFile(donateURLFile).replace(/\n/g, '')
+    } catch (err) {
+      logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
+      console.error(err)
+    }
   }
 
+  loadDonateURL()
+
+  utils.WatchFile(donateURLFile, (newData) => {
+    logger.Log(`Donate URL changed: ${newData.replace(/\/n/g, '')}`)
+    loadDonateURL()
+  })
+
   // --------------------------------------------------------------
   // REDIRECTS
   // --------------------------------------------------------------
@@ -168,12 +178,7 @@ function GetApp() {
       }
       logger.DebugLog(`Qmining module ${redirect.from} redirect`, 'infos', 1)
 
-      res.redirect(
-        url.format({
-          pathname: `${redirect.to}`,
-          query: req.query,
-        })
-      )
+      res.redirect(redirect.to + url.format({ query: req.query }))
     })
   })
 
diff --git a/submodules/qmining-page b/submodules/qmining-page
index 15dde27..94ac828 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit 15dde276f6dc0c0c368e998a3d5d258d955c83e3
+Subproject commit 94ac828d0bcb819a655292952a3f6007af053c12