From 11736e6318182ab5b43430410a46059e5f46ad52 Mon Sep 17 00:00:00 2001
From: PhyrexTsai <x01ep23i@hotmail.com>
Date: Fri, 29 Jun 2018 13:57:41 +0800
Subject: [PATCH] Update to support pathnames on IPFS hash

As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url.

You can try the example below:
http://phyrextsai.eth/index.html
http://phyrextsai.eth/images/phyrex.jpg
---
 app/scripts/lib/ipfsContent.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/scripts/lib/ipfsContent.js b/app/scripts/lib/ipfsContent.js
index 46131b266..2ddbe5558 100644
--- a/app/scripts/lib/ipfsContent.js
+++ b/app/scripts/lib/ipfsContent.js
@@ -3,8 +3,12 @@ const resolver = require('./resolver.js')
 
 module.exports = function (provider) {
     extension.webRequest.onBeforeRequest.addListener(details => {
-        const name = details.url.substring(7, details.url.length - 1)
+        const urlhttpreplace = details.url.replace(/\w+?:\/\//, "")
+        const url = urlhttpreplace.replace(/[\\\/].*/g, "")
+        let domainhtml = urlhttpreplace.match(/[\\\/].*/g)
         let clearTime = null
+        let name = url.replace(/\/$/g, "")
+        if (domainhtml === null) domainhtml = [""]
         extension.tabs.getSelected(null, tab => {
             extension.tabs.update(tab.id, { url: 'loading.html' })
 
@@ -14,13 +18,13 @@ module.exports = function (provider) {
 
             resolver.resolve(name, provider).then(ipfsHash => {
                 clearTimeout(clearTime)
-                let url = 'https://ipfs.infura.io/ipfs/' + ipfsHash
+                let url = 'https://ipfs.infura.io/ipfs/' + ipfsHash + domainhtml[0]
                 return fetch(url, { method: 'HEAD' }).then(response => response.status).then(statusCode => {
                     if (statusCode !== 200) return extension.tabs.update(tab.id, { url: '404.html' })
                     extension.tabs.update(tab.id, { url: url })
                 })
                 .catch(err => {
-                    url = 'https://ipfs.infura.io/ipfs/' + ipfsHash
+                    url = 'https://ipfs.infura.io/ipfs/' + ipfsHash + domainhtml[0]
                     extension.tabs.update(tab.id, {url: url})
                     return err
                 })
@@ -32,5 +36,5 @@ module.exports = function (provider) {
             })
         })
         return { cancel: true }
-    }, {urls: ['*://*.eth/']})
+    }, {urls: ['*://*.eth/', '*://*.eth/*']})
 }