From acb11d1947e18dcd5eba1b89e21beb559693457d Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sun, 7 May 2023 12:40:49 -0400
Subject: [PATCH] Prevent Cloudflare from treating handles as emails

---
 templates/activities/home.html     | 2 ++
 templates/admin/identities.html    | 2 ++
 templates/admin/identity_edit.html | 7 ++++++-
 templates/identity/view.html       | 2 ++
 templates/settings/delete.html     | 4 ++++
 templates/settings/follows.html    | 2 ++
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/templates/activities/home.html b/templates/activities/home.html
index 3194798..270c3f4 100644
--- a/templates/activities/home.html
+++ b/templates/activities/home.html
@@ -12,7 +12,9 @@
                 <img src="{{ identity.local_icon_url.relative }}">
                 <span class="handle">
                     {{ identity.html_name_or_handle }}
+                    <!--email_off-->
                     <small>@{{ identity.handle }}</small>
+                    <!--/email_off-->
                 </span>
                 <button class="right secondary" _="on click go to url {{ identity.urls.view }} then halt">View</button>
                 <button class="right secondary" _="on click go to url {{ identity.urls.settings }} then halt">Settings</button>
diff --git a/templates/admin/identities.html b/templates/admin/identities.html
index 62c87e3..090055b 100644
--- a/templates/admin/identities.html
+++ b/templates/admin/identities.html
@@ -35,7 +35,9 @@
                 <td class="name">
                     <a href="{{ identity.urls.admin_edit }}" class="overlay"></a>
                     {{ identity.html_name_or_handle }}
+                    <!--email_off-->
                     <small>@{{ identity.handle }}</small>
+                    <!--/email_off-->
                 </td>
                 <td>
                     {% if identity.restriction == 1 %}
diff --git a/templates/admin/identity_edit.html b/templates/admin/identity_edit.html
index 2f9fa28..ff41338 100644
--- a/templates/admin/identity_edit.html
+++ b/templates/admin/identity_edit.html
@@ -3,7 +3,12 @@
 {% block subtitle %}{{ identity.name_or_handle }}{% endblock %}
 
 {% block settings_content %}
-    <h1>{{ identity.html_name_or_handle }} <small>{{ identity.handle }}</small></h1>
+    <h1>
+        {{ identity.html_name_or_handle }} 
+        <!--email_off-->
+        <small>@{{ identity.handle }}</small>
+        <!--/email_off-->
+    </h1>
     <form action="." method="POST">
         {% csrf_token %}
         <fieldset>
diff --git a/templates/identity/view.html b/templates/identity/view.html
index 0c59723..2c2b5b2 100644
--- a/templates/identity/view.html
+++ b/templates/identity/view.html
@@ -43,6 +43,7 @@
         </div>
 
         <h1>{{ identity.html_name_or_handle }}</h1>
+        <!--email_off-->
         <small>
             @{{ identity.handle }}
             <a title="Copy handle"
@@ -56,6 +57,7 @@
                 <i class="fa-solid fa-copy"></i>
             </a>
         </small>
+        <!--/email_off-->
         {% if identity.summary %}
             <div class="bio">
                 {{ identity.safe_summary }}
diff --git a/templates/settings/delete.html b/templates/settings/delete.html
index cdd58c5..aa51ad8 100644
--- a/templates/settings/delete.html
+++ b/templates/settings/delete.html
@@ -3,7 +3,9 @@
 {% block subtitle %}Token{% endblock %}
 
 {% block settings_content %}
+    <!--email_off-->
     <h1>Deleting {{ identity.handle }}</h1>
+    <!--/email_off-->
     <form action="." method="POST">
         {% csrf_token %}
         <fieldset>
@@ -25,7 +27,9 @@
 
         <div class="buttons">
             <a href="{% url "settings" handle=identity.handle %}" class="button secondary left">Cancel</a>
+            <!--email_off-->
             <button class="danger">Delete {{ identity.handle }}</button>
+            <!--/email_off-->
         </div>
     </form>
 {% endblock %}
diff --git a/templates/settings/follows.html b/templates/settings/follows.html
index 21998dd..184c5d7 100644
--- a/templates/settings/follows.html
+++ b/templates/settings/follows.html
@@ -30,7 +30,9 @@
                 <td class="name">
                     <a href="{{ other_identity.urls.view }}" class="overlay"></a>
                     {{ other_identity.html_name_or_handle }}
+                    <!--email_off-->
                     <small>@{{ other_identity.handle }}</small>
+                    <!--/email_off-->
                 </td>
                 <td class="stat">
                     {% if other_identity.id in outbound_ids %}