Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent Cloudflare from treating handles as emails #572

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions templates/activities/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ <h1 class="above">Identities</h1>
<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>
Expand Down
2 changes: 2 additions & 0 deletions templates/admin/identities.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
7 changes: 6 additions & 1 deletion templates/admin/identity_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions templates/identity/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
</div>

<h1>{{ identity.html_name_or_handle }}</h1>
<!--email_off-->
<small>
@{{ identity.handle }}
<a title="Copy handle"
Expand All @@ -56,6 +57,7 @@ <h1>{{ identity.html_name_or_handle }}</h1>
<i class="fa-solid fa-copy"></i>
</a>
</small>
<!--/email_off-->
{% if identity.summary %}
<div class="bio">
{{ identity.safe_summary }}
Expand Down
4 changes: 4 additions & 0 deletions templates/settings/delete.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -25,7 +27,9 @@ <h1>Deleting {{ identity.handle }}</h1>

<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 %}
2 changes: 2 additions & 0 deletions templates/settings/follows.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down