From ae0a3db669da967e3155983a38adfd07a4f7b1ef Mon Sep 17 00:00:00 2001
From: Fedor Borshev <fedor@borshev.com>
Date: Sun, 14 Jan 2024 19:35:16 +0300
Subject: [PATCH] Confirmation webapp domain change

---
 src/templates/email/confirmation.txt         |  2 +-
 src/templates/html/confirmation_failure.html |  4 ++--
 src/web.py                                   | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/templates/email/confirmation.txt b/src/templates/email/confirmation.txt
index 809e264..27c5fbd 100644
--- a/src/templates/email/confirmation.txt
+++ b/src/templates/email/confirmation.txt
@@ -1,6 +1,6 @@
 Hey!
 
-To confirm your email with selfmailbot, please click the following link: https://selfmailbot.co/confirm/{{ user.confirmation }}/ or just copy following confirmation key and send it to selfmailbot in telegram chat:
+To confirm your email with selfmailbot, please click the following link: https://confirm.selfmailbot.co/{{ user.confirmation }}/ or just copy following confirmation key and send it to selfmailbot in telegram chat:
 
 {{ user.confirmation }}
 
diff --git a/src/templates/html/confirmation_failure.html b/src/templates/html/confirmation_failure.html
index 160c981..1b85415 100644
--- a/src/templates/html/confirmation_failure.html
+++ b/src/templates/html/confirmation_failure.html
@@ -5,7 +5,7 @@ <h1 class="title">
     Something went wrong :'(
 </h1>
 
-<p class="subtitle">
-  The good idea is to return to <a href="tg://resolve?domain=selfmailbot">selfmailbot</a> and try again. Feel free to contact us at <a href="mailto:me@selfmailbot.co">me@selfmailbot.co</a> for any questions.
+<p>
+  The good idea is to return to <a href="tg://resolve?domain=selfmailbot">selfmailbot</a> and try again.
 </p>
 {% endblock %}
diff --git a/src/web.py b/src/web.py
index 5f44c39..7be3986 100644
--- a/src/web.py
+++ b/src/web.py
@@ -14,7 +14,14 @@
 init_sentry()
 
 
-@app.route("/confirm/<key>/")
+@app.route("/healthcheck/")
+def healthcheck() -> str:
+    with kombu.Connection(os.getenv("CELERY_BROKER_URL")) as connection:
+        connection.connect()
+        return render_template("ok.html")
+
+
+@app.route("/<uuid:key>/")
 def confirm(key: str) -> str:
     user = get_user_by_confirmation_link(key)
 
@@ -25,10 +32,3 @@ def confirm(key: str) -> str:
     user.save()
 
     return render_template("confirmation_ok.html")
-
-
-@app.route("/healthcheck/")
-def healthcheck() -> str:
-    with kombu.Connection(os.getenv("CELERY_BROKER_URL")) as connection:
-        connection.connect()
-        return render_template("ok.html")