From e007f1435965419f13479a3a46e5c5937388d195 Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Wed, 18 Dec 2024 00:30:15 +0100
Subject: [PATCH] move IP and Referer into user profile page

---
 app/templates/admin/users.html       | 6 +-----
 app/templates/admin/users_trash.html | 6 +-----
 app/templates/user/show_profile.html | 2 ++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index 17b0e90e..3a50a508 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -25,8 +25,6 @@
                <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 %}
@@ -45,8 +43,6 @@
                         {{ '<span class="red">Banned posts</span>'|safe if user.ban_posts }}
                         {{ '<span class="red">Banned comments</span>'|safe if user.ban_comments }}</td>
                     <td>{{ user.reports if user.reports > 0 }} </td>
-                    <td>{{ user.ip_address if user.ip_address }}<br />{{ user.ip_address_country if user.ip_address_country }}</td>
-                    <td>{{ user.referrer if user.referrer }} </td>
                     <td><a href="{{ url_for('admin.admin_user_edit', user_id=user.id) }}">Edit</a> |
                         <a href="{{ url_for('admin.admin_user_delete', user_id=user.id) }}" class="confirm_first">Delete</a>
                     </td>
@@ -74,4 +70,4 @@
     </div>
 </div>
 <hr />
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/app/templates/admin/users_trash.html b/app/templates/admin/users_trash.html
index 4eae558c..2257353f 100644
--- a/app/templates/admin/users_trash.html
+++ b/app/templates/admin/users_trash.html
@@ -27,8 +27,6 @@
                <th>Rep</th>
                <th>Banned</th>
                <th>Reports</th>
-               <th>IP</th>
-               <th>Source</th>
                <th>Actions</th>
             </tr>
             {% for user in users.items %}
@@ -45,8 +43,6 @@
                     <td>{% if user.reputation %}R {{ user.reputation | round | int }}{% endif %}</td>
                     <td>{{ '<span class="red">Banned</span>'|safe if user.banned }} </td>
                     <td>{{ user.reports if user.reports > 0 }} </td>
-                    <td>{{ user.ip_address if user.ip_address }} </td>
-                    <td>{{ user.referrer if user.referrer }} </td>
                     <td><a href="{{ url_for('admin.admin_user_edit', user_id=user.id) }}">Edit</a> |
                         <a href="{{ url_for('admin.admin_user_delete', user_id=user.id) }}" class="confirm_first">Delete</a>
                     </td>
@@ -74,4 +70,4 @@
     </div>
 </div>
 <hr />
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index 4d0f33cf..28a7304b 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -108,6 +108,8 @@
             {% if user.is_instance_admin() or (user.is_local() and user.is_admin()) %}<span class="red">({{ _('Admin') }})</span>{% endif %}<br />
             {% if user.is_admin() or user.is_staff() %}{{ _('Role permissions') }}: {% if user.is_admin() %}{{ _('Admin') }}{% endif %} {% if user.is_staff() %}{{ _('Staff') }}{% endif %}<br />{% endif %}
             {{ _('Joined') }}: {{ arrow.get(user.created).humanize(locale=locale) }}<br />
+            {% if current_user.is_authenticated and current_user.is_admin() %}{{ _('Referer') }}: <span title="{{ _('Which website linked to PieFed when the user initially registered.') }}">{{ user.referrer if user.referrer }}</span><br />{% endif %}
+            {% if current_user.is_authenticated and current_user.is_admin() %}{{ _('IP and country code') }}: <span title="{{ _('IP address of last interaction.') }}">{{ user.ip_address if user.ip_address }}{% if user.ip_address_country %} ({{ user.ip_address_country }}){% endif %}</span><br />{% endif %}
             {% if current_user.is_authenticated and current_user.is_admin() and user.last_seen %}{{ _('Active') }}: {{ arrow.get(user.last_seen).humanize(locale=locale) }}<br />{% endif %}
             {% if user.bot %}
                 {{ _('Bot Account') }}<br />