From 7a78dfd3e30c082b30def51ae6b1cd37138eec0e Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sat, 12 Nov 2022 12:04:23 +0000
Subject: [PATCH] site: onion location (#1356)

---
 website/.eleventy.js                       |  7 +++++++
 website/src/_includes/layouts/article.html |  7 ++++---
 website/src/_includes/layouts/main.html    | 10 ++++++++--
 website/src/blog.html                      |  2 +-
 website/src/contact.html                   |  1 -
 website/src/index.html                     |  1 -
 website/src/invitation.html                |  1 -
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/website/.eleventy.js b/website/.eleventy.js
index dad6d302ab..3b7170a8e3 100644
--- a/website/.eleventy.js
+++ b/website/.eleventy.js
@@ -4,7 +4,14 @@ const markdownItReplaceLink = require('markdown-it-replace-link')
 const slugify = require("slugify")
 const uri = require('fast-uri')
 
+const globalConfig = {
+  onionLocation: "https://isdb4l77sjqoy2qq7ipum6x3at6hyn3jmxfx4zdhc72ufbmuq4ilwkqd.onion",
+  siteLocation: "https://simplex.chat"
+}
+
 module.exports = function (ty) {
+  ty.addShortcode("cfg", (name) => globalConfig[name])
+
   // Keeps the same directory structure.
   ty.addPassthroughCopy("src/assets/")
   ty.addPassthroughCopy("src/fonts")
diff --git a/website/src/_includes/layouts/article.html b/website/src/_includes/layouts/article.html
index 8c18480e45..21c7575127 100644
--- a/website/src/_includes/layouts/article.html
+++ b/website/src/_includes/layouts/article.html
@@ -7,13 +7,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>SimpleX blog: {{ title }}</title>
     <meta name="Content-Type" content="text/html;charset=utf-8" />
+    <meta http-equiv="onion-location" content="{% cfg 'onionLocation' %}{{ permalink }}" />
+    <meta property="og:url" content="{% cfg 'siteLocation' %}{{ permalink }}" />
     <meta property="og:type" content="article" />
     <meta property="og:title" content="{{ title }}" />
-    <meta property="og:url" content="{{ permalink }}" />
     {% if image %}
-      <meta property="og:image" content="https://simplex.chat/blog/{{ image }}" />
+      <meta property="og:image" content="{% cfg 'siteLocation' %}/blog/{{ image }}" />
     {% else %}
-      <meta property="og:image" content="https://simplex.chat/img/share_simplex.png" />
+      <meta property="og:image" content="{% cfg 'siteLocation' %}/img/share_simplex.png" />
     {% endif %}
     <meta name="twitter:card" content="summary" />
     <link rel="icon" type="image/png" sizes="96x96" href="/img/favicon.ico" />
diff --git a/website/src/_includes/layouts/main.html b/website/src/_includes/layouts/main.html
index 1f687bd85e..cd585fb76c 100644
--- a/website/src/_includes/layouts/main.html
+++ b/website/src/_includes/layouts/main.html
@@ -7,12 +7,18 @@
         <title>{{ title }}</title>
         <meta name="description" content="{{ description }}"/>
         <meta name="Content-Type" content="text/html;charset=utf-8"/>
+        {% if path %}
+            <meta http-equiv="onion-location" content="{% cfg 'onionLocation' %}{{ path }}" />
+            <meta property="og:url" content="{% cfg 'siteLocation' %}{{ path }}" />
+        {% else %}
+            <meta http-equiv="onion-location" content="{% cfg 'onionLocation' %}/" />
+            <meta property="og:url" content="{% cfg 'siteLocation' %}/" />
+        {% endif %}
         <meta property="og:type" content="website"/>
         <meta property="og:title" content="{{ title }}"/>
         <meta property="og:description" content="{{ description }}"/>
-        <meta property="og:image" content="https://simplex.chat/img/share_simplex.png"/>
+        <meta property="og:image" content="{% cfg 'siteLocation' %}/img/share_simplex.png"/>
         <meta name="twitter:card" content="summary"/>
-        <meta property="og:url" content="{{ ogURL }}" />
         <link rel="icon" type="image/png" sizes="96x96" href="/img/favicon.ico"/>
         
         <link rel="stylesheet" href="/css/swiper-bundle.min.css">
diff --git a/website/src/blog.html b/website/src/blog.html
index 5de89a2eca..d0394e996c 100644
--- a/website/src/blog.html
+++ b/website/src/blog.html
@@ -2,7 +2,7 @@
 layout: layouts/main.html
 title: "SimpleX blog: the latest news"
 description: "SimpleX Chat - a private and encrypted messenger without any user IDs (not even random ones)! Make a private connection via link / QR code to send messages and make calls."
-ogURL: "https://simplex.chat/blog"
+path: /blog
 templateEngineOverride: njk
 active_blog: true
 ---
diff --git a/website/src/contact.html b/website/src/contact.html
index 1937ebf91f..1ca60bf6e9 100644
--- a/website/src/contact.html
+++ b/website/src/contact.html
@@ -2,7 +2,6 @@
 layout: layouts/main.html
 title: "SimpleX Chat - Contact"
 header: "You have been sent a link to connect on SimpleX Chat"
-ogURL: "https://simplex.chat/"
 templateEngineOverride: njk
 ---
 
diff --git a/website/src/index.html b/website/src/index.html
index 4645528701..e07cd3138f 100644
--- a/website/src/index.html
+++ b/website/src/index.html
@@ -2,7 +2,6 @@
 layout: layouts/main.html
 title: "SimpleX Chat: private and secure messenger without any user IDs (not even random)"
 description: "SimpleX Chat - a private and encrypted messenger without any user IDs (not even random ones)! Make a private connection via link / QR code to send messages and make calls."
-ogURL: "https://simplex.chat/"
 templateEngineOverride: njk
 active_home: true
 ---
diff --git a/website/src/invitation.html b/website/src/invitation.html
index 1f99e9aa3f..e66eccdd94 100644
--- a/website/src/invitation.html
+++ b/website/src/invitation.html
@@ -2,7 +2,6 @@
 layout: layouts/main.html
 title: "SimpleX Chat - Invitation"
 header: "You have been sent a link to connect on SimpleX Chat"
-ogURL: "https://simplex.chat/"
 templateEngineOverride: njk
 ---