24 changed files with 35 additions and 21 deletions
--- a/server.py
+++ b/server.py
@ -25,11 +25,6 @@ if os.path.isfile('data/sites.json'):
    with open('data/sites.json') as file:
        sites = json.load(file)

-def getAddress():
-    global address
-    if address == '':
-        address = 'hs1qv3uu4amv87g7p7h49xez2pmzwjf92am0wzpnh4'
-    return address

 #Assets routes
@app.route('/assets/<path:path>')
@ -125,10 +120,14 @@ def index():
        return render_template('podcast.html')
    
    loaded = False
+    # Check if referrer is from handshake
    if request.referrer:
+        print(request.referrer,flush=True)
        # Check if referrer includes nathan.woodburn.au
        if "nathan.woodburn.au" in request.referrer:
            loaded = True
+    else:
+        print("No referrer",flush=True)
            

    # Check if cookie is set
@ -173,9 +172,7 @@ def index():
        handshake_scripts = ""

    if request.cookies.get('HNS'):
-            resp = make_response(render_template('index.html', handshake_scripts=handshake_scripts, HNS=request.cookies.get('HNS'), repo=repo, repo_description=repo_description, custom=custom,sites=sites), 200, {'Content-Type': 'text/html'})
-            resp.set_cookie('loaded', 'true', max_age=604800)
-            return resp
+            return render_template('index.html', handshake_scripts=handshake_scripts, HNS=request.cookies.get('HNS'), repo=repo, repo_description=repo_description, custom=custom,sites=sites)
    
    if address == '':
        address = getAddress()
@ -416,18 +413,12 @@ def catch_all(path):

    return render_template('404.html'), 404

-@app.route('/manifest.json')
-def manifest():
-    host = request.host
-    if host == 'nathan.woodburn.au':
-        return send_from_directory('templates', 'manifest.json')
-    
-    # Read as json
-    with open('templates/manifest.json') as file:
-        manifest = json.load(file)
-    scheme = request.scheme
-    manifest['start_url'] = f'{scheme}://{host}/'
-    return jsonify(manifest)
+def getAddress():
+    global address
+    if address == '':
+        address = 'hs1qv3uu4amv87g7p7h49xez2pmzwjf92am0wzpnh4'
+    return address
+

@app.route('/hnsdoh-acme', methods=['POST'])
 def hnsdoh_acme():
@ -475,6 +466,7 @@ def ID1_slash():
@app.route('/ID1/<path:path>')
 def ID1_path(path):
    # Proxy to ID1 url
+    print('https://id1.woodburn.au/ID1/' + path)
    req = requests.get('https://id1.woodburn.au/ID1/' + path)
    return make_response(req.content, 200, {'Content-Type': req.headers['Content-Type']})

--- a/templates/404.html
+++ b/templates/404.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/404">
    <meta property="og:url" content="https://nathan.woodburn.au/404">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/about.html
+++ b/templates/about.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/about">
    <meta property="og:url" content="https://nathan.woodburn.au/about">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/assets/js/loading.min.js
+++ b/templates/assets/js/loading.min.js
@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",(function(){const n=document.getElementById("loading-screen"),e=[{pre:'┌──(<span class="blue">nathan@NWTux</span>)-[<span class="white">~</span>]',message:"cd Git"},{pre:'┌──(<span class="blue">nathan@NWTux</span>)-[<span class="white">~/Git</span>]',message:"cd Nathanwoodburn.github.io"},{pre:'┌──(<span class="blue">nathan@NWTux</span>)-[<span class="white">~/Git/Nathanwoodburn.github.io</span>]',message:"python3 main.py"}],t=["Starting server with 1 workers and 2 threads","+0000] [1] [INFO] Starting gunicorn 22.0.0","+0000] [1] [INFO] Listening at: http://0.0.0.0:5000 (1)","+0000] [1] [INFO] Using worker: gthread","+0000] [8] [INFO] Booting worker with pid: 8"];let a=0;function s(e,t){const a=function(){const n=new Date;return`${n.getUTCFullYear()}-${String(n.getUTCMonth()+1).padStart(2,"0")}-${String(n.getUTCDate()).padStart(2,"0")} ${String(n.getUTCHours()).padStart(2,"0")}:${String(n.getUTCMinutes()).padStart(2,"0")}:${String(n.getUTCSeconds()).padStart(2,"0")}`}();for(let t=0;t<e.length;t++){const s=document.createElement("div");s.classList.add("loading-line"),s.innerHTML=0!==t?"["+a+e[t]:e[t],n.appendChild(s)}t()}function r(){window.location.reload()}!function i(){a<e.length?function(e,t){const a=document.createElement("div");a.classList.add("loading-pre"),a.innerHTML=e.pre,n.appendChild(a);const s=document.createElement("div");s.classList.add("loading-line"),s.innerHTML='└─<span class="blue">$</span> <span class="cursor"></span>',n.appendChild(s);let r=0;const i=setInterval((()=>{s.removeChild(s.querySelector(".cursor")),s.innerHTML+=e.message[r]+'<span class="cursor"></span>',r++,r===e.message.length&&(s.removeChild(s.querySelector(".cursor")),clearInterval(i),t())}),50)}(e[a],(()=>{a++,setTimeout(i,200)})):s(t,(()=>{setTimeout(r,200)}))}()}));
+document.addEventListener("DOMContentLoaded",(function(){const n=document.getElementById("loading-screen"),e=[{pre:'┌──(<span class="blue">nathan@NWTux</span>)-[<span class="white">~</span>]',message:"cd Git"},{pre:'┌──(<span class="blue">nathan@NWTux</span>)-[<span class="white">~/Git</span>]',message:"cd Nathanwoodburn.github.io"},{pre:'┌──(<span class="blue">nathan@NWTux</span>)-[<span class="white">~/Git/Nathanwoodburn.github.io</span>]',message:"python3 main.py"}],t=["Starting server with 1 workers and 2 threads","+0000] [1] [INFO] Starting gunicorn 22.0.0","+0000] [1] [INFO] Listening at: http://0.0.0.0:5000 (1)","+0000] [1] [INFO] Using worker: gthread","+0000] [8] [INFO] Booting worker with pid: 8"];let a=0;function s(e,t){const a=function(){const n=new Date;return`${n.getUTCFullYear()}-${String(n.getUTCMonth()+1).padStart(2,"0")}-${String(n.getUTCDate()).padStart(2,"0")} ${String(n.getUTCHours()).padStart(2,"0")}:${String(n.getUTCMinutes()).padStart(2,"0")}:${String(n.getUTCSeconds()).padStart(2,"0")}`}();console.log(a);for(let t=0;t<e.length;t++){const s=document.createElement("div");s.classList.add("loading-line"),s.innerHTML=0!==t?"["+a+e[t]:e[t],n.appendChild(s)}t()}function r(){window.location.reload()}!function i(){a<e.length?function(e,t){const a=document.createElement("div");a.classList.add("loading-pre"),a.innerHTML=e.pre,n.appendChild(a);const s=document.createElement("div");s.classList.add("loading-line"),s.innerHTML='└─<span class="blue">$</span> <span class="cursor"></span>',n.appendChild(s);let r=0;const i=setInterval((()=>{s.removeChild(s.querySelector(".cursor")),s.innerHTML+=e.message[r]+'<span class="cursor"></span>',r++,r===e.message.length&&(s.removeChild(s.querySelector(".cursor")),clearInterval(i),t())}),50)}(e[a],(()=>{a++,setTimeout(i,200)})):s(t,(()=>{setTimeout(r,200)}))}()}));
--- a/templates/donate.html
+++ b/templates/donate.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/donate">
    <meta property="og:url" content="https://nathan.woodburn.au/donate">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/gitpgp.html
+++ b/templates/gitpgp.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/gitpgp">
    <meta property="og:url" content="https://nathan.woodburn.au/gitpgp">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/index.html
+++ b/templates/index.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/">
    <meta property="og:url" content="https://nathan.woodburn.au/">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/link.html
+++ b/templates/link.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/link">
    <meta property="og:url" content="https://nathan.woodburn.au/link">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/loading.html
+++ b/templates/loading.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/loading">
    <meta property="og:url" content="https://nathan.woodburn.au/loading">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/now/24_02_18.html
+++ b/templates/now/24_02_18.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_02_18.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_02_18.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/24_02_25.html
+++ b/templates/now/24_02_25.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_02_25.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_02_25.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/24_04_19.html
+++ b/templates/now/24_04_19.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_04_19.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_04_19.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/24_05_20.html
+++ b/templates/now/24_05_20.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_05_20.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_05_20.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/24_05_28.html
+++ b/templates/now/24_05_28.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_05_28.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_05_28.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/24_06_06.html
+++ b/templates/now/24_06_06.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_06_06.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_06_06.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/24_06_17.html
+++ b/templates/now/24_06_17.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/24_06_17.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/24_06_17.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/old.html
+++ b/templates/now/old.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/old.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/old.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/now/template.html
+++ b/templates/now/template.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/now/template.html">
    <meta property="og:url" content="https://nathan.woodburn.au/now/template.html">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:card" content="summary">
    <meta name="twitter:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
    <meta property="og:image" content="https://nathan.woodburn.au/assets/img/profile.jpg">
--- a/templates/pgp.html
+++ b/templates/pgp.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/pgp">
    <meta property="og:url" content="https://nathan.woodburn.au/pgp">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/podcast.html
+++ b/templates/podcast.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/podcast">
    <meta property="og:url" content="https://nathan.woodburn.au/podcast">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta property="og:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:type" content="website">
    <meta property="og:title" content="Alliance Church Woden Valley Podcast">
--- a/templates/projects.html
+++ b/templates/projects.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/projects">
    <meta property="og:url" content="https://nathan.woodburn.au/projects">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
    <meta name="twitter:card" content="summary">
--- a/templates/resume.html
+++ b/templates/resume.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/resume">
    <meta property="og:url" content="https://nathan.woodburn.au/resume">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
--- a/templates/servers.html
+++ b/templates/servers.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/servers">
    <meta property="og:url" content="https://nathan.woodburn.au/servers">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">
    <meta name="twitter:card" content="summary">
--- a/templates/signalQR.html
+++ b/templates/signalQR.html
@ -8,6 +8,7 @@
    <meta name="theme-color" content="#97009a">
    <link rel="canonical" href="https://nathan.woodburn.au/signalQR">
    <meta property="og:url" content="https://nathan.woodburn.au/signalQR">
+    <meta http-equiv="onion-location" content="http://wdbrncwefot4hd7bdrz5rzb74mefay7zvrjn2vmkpdm44l7fwnih5ryd.onion">
    <meta name="twitter:description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta name="description" content="G'day, this is my personal website. You can find out about me or check out some of my projects.">
    <meta property="og:title" content="Nathan.Woodburn/">