use exported vars

ipfs · Dec 15, 2015 · fda78c3 · fda78c3
1 parent 236b680
commit fda78c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/gateways.js b/lib/gateways.js
@@ -9,6 +9,9 @@ var prefs = require('sdk/simple-prefs').prefs;
 var ioservice = Cc['@mozilla.org/network/io-service;1'].getService(Ci.nsIIOService);
 
 const IPFS_RESOURCE = /^https?:\/\/[^\/]+\/ip(f|n)s\//;
+
+exports.IPFS_RESOURCE = IPFS_RESOURCE;
+
 var PUBLIC_GATEWAY_HOSTS; // getPublicGatewayHostsRegex()
 var PUBLIC_GATEWAY_URI; // getDefaultPublicURI();
 var CUSTOM_GATEWAY_URI;
@@ -73,3 +76,6 @@ exports.customUri = function() {
 exports.publicUri = function() {
   return PUBLIC_GATEWAY_URI;
 };
+exports.publicHosts = function() {
+  return PUBLIC_GATEWAY_HOSTS;
+};
diff --git a/lib/redirects.js b/lib/redirects.js
@@ -12,11 +12,11 @@ var ipfsRequestObserver = {
     if (topic == 'http-on-modify-request') {
       let channel = subject.QueryInterface(Ci.nsIHttpChannel);
       let httpUrl = channel.URI.spec;
-      if (httpUrl.match(PUBLIC_GATEWAY_HOSTS) && httpUrl.match(IPFS_RESOURCE)) {
+      if (httpUrl.match(gw.publicHosts()) && httpUrl.match(gw.IPFS_RESOURCE)) {
         channel.setRequestHeader('x-ipfs-firefox-addon', 'true', false);
         if (prefs.useCustomGateway) {
           //console.info('Detected HTTP request to the public gateway: ' + channel.URI.spec);
-          let uri = ioservice.newURI(httpUrl.replace(PUBLIC_GATEWAY_HOSTS, CUSTOM_GATEWAY_URI.spec), null, null);
+          let uri = ioservice.newURI(httpUrl.replace(gw.publicHosts(), customUri().spec), null, null);
           //console.info('Redirecting to custom gateway: ' + uri.spec);
           channel.redirectTo(uri);
         }