From 6a820442f5714f3fee8e48e23cf2dd2c16d575a4 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sat, 3 Aug 2024 21:31:10 +1200
Subject: [PATCH] handle user names with mixed upper and lower case letters.
 fixes #272

---
 app/auth/routes.py                    |  2 +-
 app/templates/admin/users.html        | 20 ++++++++++----------
 app/templates/base.html               |  2 +-
 app/templates/user/_user_nav.html     |  2 +-
 app/templates/user/filters.html       |  2 +-
 app/templates/user/notifications.html |  2 +-
 app/templates/user/show_profile.html  |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/auth/routes.py b/app/auth/routes.py
index 73075105..2d52a683 100644
--- a/app/auth/routes.py
+++ b/app/auth/routes.py
@@ -136,7 +136,7 @@ def register():
                     application = UserRegistration(user_id=user.id, answer=form.question.data)
                     db.session.add(application)
                     for admin in Site.admins():
-                        notify = Notification(title='New registration', url='/admin/approve_registrations', user_id=admin.id,
+                        notify = Notification(title='New registration', url=f'/admin/approve_registrations?account={user.id}', user_id=admin.id,
                                           author_id=user.id)
                         admin.unread_notifications += 1
                         db.session.add(notify)
diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index e962a224..12bfbc99 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -19,16 +19,16 @@
         </form>
         <table class="table table-striped mt-1">
             <tr>
-               <th title="{{ _('Display name.') }}">Name</th>
-               <th>Local/Remote</th>
-               <th title="{{ _('Last seen.') }}">Seen</th>
-               <th title="{{ _('Attitude: Percentage of up votes vs. down votes the account made.') }}">Attitude</th>
-               <th title="{{ _('Reputation: The Karma of the account. Total up votes minus down votes they got.') }}">Rep</th>
-               <th>Banned</th>
-               <th title="{{ _('How often a user has been reported.') }}">Reports</th>
-               <th title="{{ _('IP address of last interaction.') }}">IP</th>
-               <th title="{{ _('Which website linked to PieFed when the user initially registered.') }}">Source</th>
-               <th>Actions</th>
+               <th title="{{ _('Display name.') }}">{{ _('Name') }}</th>
+               <th>{{ _('Local/Remote') }}</th>
+               <th title="{{ _('Last seen.') }}">{{ _('Seen') }}</th>
+               <th title="{{ _('Attitude: Percentage of up votes vs. down votes the account made.') }}">{{ _('Attitude') }}</th>
+               <th title="{{ _('Reputation: The Karma of the account. Total up votes minus down votes they got.') }}">{{ _('Reputation') }}</th>
+               <th>{{ _('Banned') }}</th>
+               <th title="{{ _('How often a user has been reported.') }}">{{ _('Reports') }}</th>
+               <th title="{{ _('IP address of last interaction.') }}">{{ _('IP and country code') }}</th>
+               <th title="{{ _('Which website linked to PieFed when the user initially registered.') }}">{{ _('Source') }}</th>
+               <th>{{ _('Actions') }}</th>
             </tr>
             {% for user in users.items %}
                 <tr>
diff --git a/app/templates/base.html b/app/templates/base.html
index ab6ccd10..aa13c8e1 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -204,7 +204,7 @@
                                 </ul>
                             </li>
                             <li class="nav-item dropdown{% if active_parent == 'account' %} active{% endif %}">
-                                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/u/{{ current_user.user_name.lower() }}" aria-haspopup="true" aria-expanded="false">{{ _('Account') }}</a>
+                                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/u/{{ current_user.link() }}" aria-haspopup="true" aria-expanded="false">{{ _('Account') }}</a>
                                 <ul class="dropdown-menu">
                                   <li><a class="dropdown-item{% if active_child == 'view_profile' %} active{% endif %}" href="/u/{{ current_user.link() }}">{{ _('View profile') }}</a></li>
                                   <li><a class="dropdown-item{% if active_child == 'edit_profile' %} active{% endif %}" href="/user/settings">{{ _('Edit profile & settings') }}</a></li>
diff --git a/app/templates/user/_user_nav.html b/app/templates/user/_user_nav.html
index 261743da..8a5e5021 100644
--- a/app/templates/user/_user_nav.html
+++ b/app/templates/user/_user_nav.html
@@ -4,7 +4,7 @@
             <a href="/user/settings" class="btn {{ 'btn-primary' if request.path == '/user/settings' else 'btn-outline-secondary' }}">
                 {{ _('Settings') }}
             </a>
-            <a href="/u/{{ current_user.user_name.lower() }}/profile" class="btn {{ 'btn-primary' if request.path.endswith('/profile') else 'btn-outline-secondary' }}">
+            <a href="/u/{{ current_user.link() }}/profile" class="btn {{ 'btn-primary' if request.path.endswith('/profile') else 'btn-outline-secondary' }}">
                 {{ _('Profile') }}
             </a>
             <a href="/user/settings/filters" class="btn {{ 'btn-primary' if request.path == '/user/settings/filters' else 'btn-outline-secondary' }}">
diff --git a/app/templates/user/filters.html b/app/templates/user/filters.html
index e9718bf9..2c4fc756 100644
--- a/app/templates/user/filters.html
+++ b/app/templates/user/filters.html
@@ -87,7 +87,7 @@
                     </tr>
                 {% for user in blocked_users %}
                     <tr>
-                        <td><a href="{{ url_for('activitypub.user_profile', actor=user.ap_id if user.ap_id is not none else user.user_name.lower()) }}">{{ user.display_name() }}</a></td>
+                        <td><a href="{{ url_for('activitypub.user_profile', actor=user.ap_id if user.ap_id is not none else user.user_name) }}">{{ user.display_name() }}</a></td>
                         <td><a class="no-underline confirm_first" href="{{ url_for('user.unblock_profile', actor=user.link()) }}" rel="nofollow"><span class="fe fe-delete"></span> {{ _('Unblock') }}</a></td>
                     </tr>
                 {% endfor %}
diff --git a/app/templates/user/notifications.html b/app/templates/user/notifications.html
index a6596542..4cf28aa8 100644
--- a/app/templates/user/notifications.html
+++ b/app/templates/user/notifications.html
@@ -51,7 +51,7 @@
             <div class="card-body">
                 <div class="row">
                     <div class="col-6">
-                        <a class="w-100 btn btn-primary" href="/u/{{ current_user.user_name.lower() }}/profile">{{ _('Profile') }}</a>
+                        <a class="w-100 btn btn-primary" href="/u/{{ current_user.link() }}/profile">{{ _('Profile') }}</a>
                     </div>
                     <div class="col-6">
                         <a class="w-100 btn btn-primary" href="/user/settings">{{ _('Settings') }}</a>
diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index c1b3984c..a3d9dbbe 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -154,7 +154,7 @@
                 <div class="card-body">
                     <div class="row">
                         <div class="col-6">
-                            <a class="w-100 btn btn-primary" href="/u/{{ user.user_name.lower() }}/profile">{{ _('Profile') }}</a>
+                            <a class="w-100 btn btn-primary" href="/u/{{ user.link() }}/profile">{{ _('Profile') }}</a>
                         </div>
                         <div class="col-6">
                             <a class="w-100 btn btn-primary" href="/user/settings">{{ _('Settings') }}</a>