Fix proxy for URLs that include ampersands 😳

config/example-config.json

@@ -2,7 +2,7 @@
     "port": 8080,
     "blacklist": true,
     "domainlist": [
-        "tauntbot.tk",
+        "taunt.bot",
         "musickitten.net",
         "sanin.dev"
     ],

index.js

@@ -9,7 +9,8 @@ const btoa = require('btoa');
 const useragent = 'p2z';
 const cfgfile = './config/config.json';
 const LEADINGAMP = new RegExp('(https?://[^\\s]+\\?)&amp;([^<"\\s]+)', 'g');
-const MATCHURL = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:;%_\+.~#?&//=]*)/, 'g');
+const XMLENCODEDAMP = new RegExp('&amp;', 'g');
+const MATCHURL = new RegExp(/https:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:;%_\+.~#?&//=]*)/, 'g');
 const MATCHHEX = new RegExp('^[0-9a-fA-F]{1,3}$');
 const MATCHBIN = new RegExp('^[01]{1,12}$');
 const proxy = httpProxy.createProxyServer({
@@ -98,7 +99,7 @@ function fixUrls(feed) {
  */
 function proxifyUrls(feed, host) {
     return (config.deepproxy === true) ? feed.replace(MATCHURL, match => {
-        return `${host}/proxy/file${getFilename(match).ext}?url=${encodeURIComponent(btoa(match))}`;
+        return `${host}/proxy/file${getFilename(match).ext}?url=${encodeURIComponent(btoa(match.replace(XMLENCODEDAMP, '&')))}`;
     }) : feed;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "patreon-to-zune",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "converts Patreon podcast feeds for the Zune desktop software",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,6 @@
     "express": "4.17.1",
     "express-useragent": "1.0.15",
     "http-proxy": "1.18.1",
-    "phin": "3.5.1"
+    "phin": "3.6.0"
   }
 }