From aa4d31e8068ad31bd528539d15920014ba820a50 Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Thu, 2 Jan 2025 12:26:27 +0100
Subject: [PATCH 1/6] allow to nagivate to banned users

---
 app/templates/admin/users.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index af7d5223..7d9e025d 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -42,7 +42,12 @@
                        <span class="{{ 'fe fe-chevron-up' if sort_by == 'user_name DESC' }}{{ 'fe fe-chevron-down' if sort_by == 'user_name ASC' }}"></span>
                    </button>
                </th>
-               <th>{{ _('Banned') }}</th>
+               <th>
+                   <button form="searchUsers" name="sort_by_btn" value="banned{{' ASC' if sort_by == 'banned DESC' else ' DESC' }}" class="btn" title="{{ _('This user has been banned.') }}">
+                       {{ _('Banned') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'banned ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'banned DESC' }}"></span>
+                   </button>
+               </th>
                <th>
                    <button form="searchUsers" name="sort_by_btn" value="reports{{' ASC' if sort_by == 'reports DESC' else ' DESC' }}" class="btn" title="{{ _('How often a user has been reported.') }}">
                        {{ _('Reports') }}

From 5e365a73ffa179222270083572fa52ba877d3ac9 Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Thu, 2 Jan 2025 12:55:04 +0100
Subject: [PATCH 2/6] show community activity and num local members

---
 app/templates/admin/communities.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/templates/admin/communities.html b/app/templates/admin/communities.html
index 8f8f3d0e..cffa75c0 100644
--- a/app/templates/admin/communities.html
+++ b/app/templates/admin/communities.html
@@ -32,11 +32,13 @@
                <th>Name</th>
                <th>Topic</th>
                <th>#&nbsp;Posts</th>
+               <th title="{{ _('Local members') }}">#&nbsp;Members</th>
                <th>Retention</th>
                <th>Layout</th>
                <th title="{{ _('Posts can be popular.') }}">Popular</th>
                <th title="{{ _('Posts show in the All feed.') }}">All</th>
                <th title="{{ _('Content warning, NSFW or NSFL set for community.') }}">Warning</th>
+               <th>{{ _('Active') }}</th>
                <th>Actions</th>
             </tr>
             {% for community in communities.items %}
@@ -45,11 +47,13 @@
                     !<a href="/c/{{ community.link() }}">{{ community.name }}</a><wbr />@<a href="{{ community.ap_profile_id }}">{{ community.ap_domain }}</a></td>
                     <td>{{ community.topic.name  }}</td>
                     <td>{{ community.post_count  }}</td>
+                    <td>{{ community.subscriptions_count }}</td>
                     <td>{{ community.content_retention if community.content_retention != -1 }}</td>
                     <td>{{ community.default_layout if community.default_layout }}</td>
                     <th>{{ '&check;'|safe if community.show_popular else '&cross;'|safe }}</th>
                     <th>{{ '&check;'|safe if community.show_all else '&cross;'|safe }}</th>
                     <th>{{ '&#x26A0;'|safe if community.nsfw or community.nsfl or community.content_warning else ''|safe }}</th>
+                    <td>{{ arrow.get(community.last_active).humanize(locale=locale) }}</td>
                     <td><a href="{{ url_for('admin.admin_community_edit', community_id=community.id) }}">Edit</a> |
                         <a href="{{ url_for('admin.admin_community_delete', community_id=community.id) }}" class="confirm_first">Delete</a>
                     </td>

From 979f3cef91ea96e80a44f9d46e6d7fe1a5493b16 Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Thu, 2 Jan 2025 13:16:17 +0100
Subject: [PATCH 3/6] sortable admin community list

---
 app/admin/routes.py                  |  12 ++-
 app/templates/admin/communities.html | 115 +++++++++++++++++++--------
 2 files changed, 90 insertions(+), 37 deletions(-)

diff --git a/app/admin/routes.py b/app/admin/routes.py
index 6514dccd..becf9478 100644
--- a/app/admin/routes.py
+++ b/app/admin/routes.py
@@ -884,17 +884,21 @@ def admin_communities():
 
     page = request.args.get('page', 1, type=int)
     search = request.args.get('search', '')
+    sort_by = request.args.get('sort_by', 'title ASC')
 
     communities = Community.query
     if search:
         communities = communities.filter(Community.title.ilike(f"%{search}%"))
-    communities = communities.order_by(Community.title).paginate(page=page, per_page=1000, error_out=False)
+    communities = communities.order_by(text('"community".' + sort_by))
+    communities = communities.paginate(page=page, per_page=1000, error_out=False)
 
-    next_url = url_for('admin.admin_communities', page=communities.next_num) if communities.has_next else None
-    prev_url = url_for('admin.admin_communities', page=communities.prev_num) if communities.has_prev and page != 1 else None
+    next_url = url_for('admin.admin_communities', page=communities.next_num, search=search, sort_by=sort_by) if communities.has_next else None
+    prev_url = url_for('admin.admin_communities', page=communities.prev_num, search=search, sort_by=sort_by) if communities.has_prev and page != 1 else None
 
     return render_template('admin/communities.html', title=_('Communities'), next_url=next_url, prev_url=prev_url,
-                           communities=communities, moderating_communities=moderating_communities(current_user.get_id()),
+                           communities=communities,
+                           search=search, sort_by=sort_by,
+                           moderating_communities=moderating_communities(current_user.get_id()),
                            joined_communities=joined_communities(current_user.get_id()),
                            menu_topics=menu_topics(),
                            site=g.site)
diff --git a/app/templates/admin/communities.html b/app/templates/admin/communities.html
index cffa75c0..cee65a02 100644
--- a/app/templates/admin/communities.html
+++ b/app/templates/admin/communities.html
@@ -12,8 +12,9 @@
         <h1>{{ title }}</h1>
         <div class="row">
             <div class="col">
-                <form method="get">
-                    <input type="search" name="search"> <input type="submit" name="submit" value="Search">
+                <form id="searchCommunities" method="get">
+                    <input type="search" name="search" placeholder="{{ _('Search') }}" value="{{ search }}"> 
+                    <input type="submit" name="submit" value="Search">
                 </form>
                 Result Filter:
                 <a href="{{ url_for('admin.admin_communities') }}">All</a> | 
@@ -27,39 +28,87 @@
             </div>
         </div>
 
-        <table class="table table-striped">
-            <tr>
-               <th>Name</th>
-               <th>Topic</th>
-               <th>#&nbsp;Posts</th>
-               <th title="{{ _('Local members') }}">#&nbsp;Members</th>
-               <th>Retention</th>
-               <th>Layout</th>
-               <th title="{{ _('Posts can be popular.') }}">Popular</th>
-               <th title="{{ _('Posts show in the All feed.') }}">All</th>
-               <th title="{{ _('Content warning, NSFW or NSFL set for community.') }}">Warning</th>
-               <th>{{ _('Active') }}</th>
-               <th>Actions</th>
-            </tr>
-            {% for community in communities.items %}
+        <div class="table-responsive-md mt-4">
+            <table class="communities_table table table-striped table-hover w-100">
                 <tr>
-                    <td>{{ render_communityname(community, add_domain=False) }}{% if community.banned %} (banned){% endif %}<br />
-                    !<a href="/c/{{ community.link() }}">{{ community.name }}</a><wbr />@<a href="{{ community.ap_profile_id }}">{{ community.ap_domain }}</a></td>
-                    <td>{{ community.topic.name  }}</td>
-                    <td>{{ community.post_count  }}</td>
-                    <td>{{ community.subscriptions_count }}</td>
-                    <td>{{ community.content_retention if community.content_retention != -1 }}</td>
-                    <td>{{ community.default_layout if community.default_layout }}</td>
-                    <th>{{ '&check;'|safe if community.show_popular else '&cross;'|safe }}</th>
-                    <th>{{ '&check;'|safe if community.show_all else '&cross;'|safe }}</th>
-                    <th>{{ '&#x26A0;'|safe if community.nsfw or community.nsfl or community.content_warning else ''|safe }}</th>
-                    <td>{{ arrow.get(community.last_active).humanize(locale=locale) }}</td>
-                    <td><a href="{{ url_for('admin.admin_community_edit', community_id=community.id) }}">Edit</a> |
-                        <a href="{{ url_for('admin.admin_community_delete', community_id=community.id) }}" class="confirm_first">Delete</a>
-                    </td>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="title{{' DESC' if sort_by == 'title ASC' else ' ASC' }}" class="btn" title="{{ _('Sort by name') }}">
+                           {{ _('Community') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'title DESC' }}{{ 'fe fe-chevron-down' if sort_by == 'title ASC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="topic_id{{' ASC' if sort_by == 'topic_id DESC' else ' DESC' }}" class="btn" title="{{ _('Topic') }}">
+                           {{ _('Topic') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'topic_id ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'topic_id DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="post_count{{' ASC' if sort_by == 'post_count DESC' else ' DESC' }}" class="btn" title="{{ _('Sort by post count') }}">
+                           {{ _('Posts') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'post_count ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'post_count DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="subscriptions_count{{' ASC' if sort_by == 'subscriptions_count DESC' else ' DESC' }}" class="btn" title="{{ _('Number of known subscribers') }}">
+                           {{ _('Members') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'subscriptions_count ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'subscriptions_count DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="content_retention{{' ASC' if sort_by == 'content_retention DESC' else ' DESC' }}" class="btn" title="{{ _('Content retention duration') }}">
+                           {{ _('Retention') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'content_retention ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'content_retention DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>{{ _('Layout') }}</th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="show_popular{{' ASC' if sort_by == 'show_popular DESC' else ' DESC' }}" class="btn" title="{{ _('Posts can be popular.') }}">
+                           {{ _('Popular') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'show_popular ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'show_popular DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="show_all{{' ASC' if sort_by == 'show_all DESC' else ' DESC' }}" class="btn" title="{{ _('Posts show in the All feed.') }}">
+                           {{ _('All') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'show_all ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'show_all DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="{{'nsfl ASC, nsfw ASC' if sort_by == 'nsfl DESC, nsfw DESC' else 'nsfl DESC, nsfw DESC' }}" class="btn" title="{{ _('Content warning, NSFW or NSFL set for community.') }}">
+                           {{ _('Warning') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'nsfl ASC, nsfw ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'nsfl DESC, nsfw DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>
+                       <button form="searchCommunities" name="sort_by" value="last_active{{' ASC' if sort_by == 'last_active DESC' else ' DESC' }}" class="btn" title="{{ _('Sort by recent activity') }}">
+                           {{ _('Active') }}
+                           <span class="{{ 'fe fe-chevron-up' if sort_by == 'last_active ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'last_active DESC' }}"></span>
+                       </button>
+                   </th>
+                   <th>{{ _('Actions') }}</th>
                 </tr>
-            {% endfor %}
-        </table>
+                {% for community in communities.items %}
+                    <tr>
+                        <td>{{ render_communityname(community, add_domain=False) }}{% if community.banned %} (banned){% endif %}<br />
+                        !<a href="/c/{{ community.link() }}">{{ community.name }}</a><wbr />@<a href="{{ community.ap_profile_id }}">{{ community.ap_domain }}</a></td>
+                        <td><span title="{{ _('Topic') }}">{{ community.topic.name  }}</span></td>
+                        <td><span title="{{ _('Number of posts') }}">{{ community.post_count  }}</span></td>
+                        <td><span title="{{ _('Number of known subscribers') }}">{{ community.subscriptions_count }}</span></td>
+                        <td><span title="{{ _('Content retention duration') }}">{{ community.content_retention if community.content_retention != -1 }}</span></td>
+                        <td><span title="{{ _('Layout') }}">{{ community.default_layout if community.default_layout }}</span></td>
+                        <td><span title="{{ _('Posts can be popular.') }}">{{ '&check;'|safe if community.show_popular else '&cross;'|safe }}</span></td>
+                        <td><span title="{{ _('Posts show in the All feed.') }}">{{ '&check;'|safe if community.show_all else '&cross;'|safe }}</span></td>
+                        <td><span title="{{ _('Content warning, NSFW or NSFL set for community.') }}">{{ '&#x26A0;'|safe if community.nsfw or community.nsfl or community.content_warning else ''|safe }}</span></td>
+                        <td><span title="{{ _('Last activity') }}">{{ arrow.get(community.last_active).humanize(locale=locale) }}</span></td>
+                        <td><a href="{{ url_for('admin.admin_community_edit', community_id=community.id) }}">{{ _('Edit') }}</a>,
+                            <a href="{{ url_for('community.community_moderate', actor=community.link()) }}">{{ _('Moderate') }}</a>,
+                            <a href="{{ url_for('admin.admin_community_delete', community_id=community.id) }}" class="confirm_first">{{ _('Delete') }}</a>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
         <nav aria-label="Pagination" class="mt-4" role="navigation">
                 {% if prev_url %}
                     <a href="{{ prev_url }}" class="btn btn-primary">

From 6b77192b7416178faa801daa206c1968df190bca Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Thu, 2 Jan 2025 15:36:46 +0100
Subject: [PATCH 4/6] sortable admin instances list

---
 app/admin/routes.py                | 11 ++--
 app/templates/admin/instances.html | 98 ++++++++++++++++++++++--------
 2 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/app/admin/routes.py b/app/admin/routes.py
index becf9478..d4297500 100644
--- a/app/admin/routes.py
+++ b/app/admin/routes.py
@@ -1525,9 +1525,10 @@ def admin_instances():
     page = request.args.get('page', 1, type=int)
     search = request.args.get('search', '')
     filter = request.args.get('filter', '')
+    sort_by = request.args.get('sort_by', 'domain ASC')
     low_bandwidth = request.cookies.get('low_bandwidth', '0') == '1'
 
-    instances = Instance.query.order_by(Instance.domain)
+    instances = Instance.query
 
     if search:
         instances = instances.filter(Instance.domain.ilike(f"%{search}%"))
@@ -1548,15 +1549,15 @@ def admin_instances():
         elif filter == 'blocked':
             instances = instances.join(BannedInstances, BannedInstances.domain == Instance.domain)
 
-    # Pagination
+    instances = instances.order_by(text('"instance".' + sort_by))
     instances = instances.paginate(page=page,
                                        per_page=250 if current_user.is_authenticated and not low_bandwidth else 50,
                                        error_out=False)
-    next_url = url_for('admin.admin_instances', page=instances.next_num) if instances.has_next else None
-    prev_url = url_for('admin.admin_instances', page=instances.prev_num) if instances.has_prev and page != 1 else None
+    next_url = url_for('admin.admin_instances', page=instances.next_num, search=search, filter=filter, sort_by=sort_by) if instances.has_next else None
+    prev_url = url_for('admin.admin_instances', page=instances.prev_num, search=search, filter=filter, sort_by=sort_by) if instances.has_prev and page != 1 else None
 
     return render_template('admin/instances.html', instances=instances,
-                           title=_(title), search=search,
+                           title=_(title), search=search, filter=filter, sort_by=sort_by,
                            next_url=next_url, prev_url=prev_url,
                            low_bandwidth=low_bandwidth, 
                            moderating_communities=moderating_communities(current_user.get_id()),
diff --git a/app/templates/admin/instances.html b/app/templates/admin/instances.html
index d6e841a8..44409ac0 100644
--- a/app/templates/admin/instances.html
+++ b/app/templates/admin/instances.html
@@ -10,8 +10,9 @@
 <div class="row">
     <div class="col">
         <h1>{{ title }}</h1>
-        <form method="get">
-            <input type="search" name="search"> <input type="submit" name="submit" value="Search">
+        <form id="searchInstances" method="get">
+            <input type="search" name="search" placeholder="{{ _('Search') }}" value="{{ search }}"> 
+            <input type="submit" name="submit" value="{{ _('Search') }}">
         </form>
         Status Filter:
         <a href="{{ url_for('admin.admin_instances', filter='online') }}">{{ _('Online') }}</a> |
@@ -21,41 +22,86 @@
         <a href="{{ url_for('admin.admin_instances', filter='blocked') }}">{{ _('Blocked') }}</a>
         <table class="table table-striped">
             <tr>
-               <th>{{ _('Domain') }}</th>
-               <th>{{ _('Software') }}</th>
-               <th>{{ _('Version') }}</th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="domain{{' DESC' if sort_by == 'domain ASC' else ' ASC' }}" class="btn" title="{{ _('Domain') }}">
+                       {{ _('Domain') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'domain DESC' }}{{ 'fe fe-chevron-down' if sort_by == 'domain ASC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="software{{' DESC' if sort_by == 'software ASC' else ' ASC' }}" class="btn" title="{{ _('Software') }}">
+                       {{ _('Software') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'software DESC' }}{{ 'fe fe-chevron-down' if sort_by == 'software ASC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="version{{' DESC' if sort_by == 'version ASC' else ' ASC' }}" class="btn" title="{{ _('Version') }}">
+                       {{ _('Version') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'version DESC' }}{{ 'fe fe-chevron-down' if sort_by == 'version ASC' }}"></span>
+                   </button>
+               </th>
                <th title="{{ _('Known Communities') }}">{{ _('Communities') }}</th>
                <th title="{{ _('Known Users') }}">{{ _('Users') }}</th>
                <th>{{ _('Posts') }}</th>
                <th>{{ _('Post Replies') }}</th>
-               <th>{{ _('Vote Weight') }}</th>
-               <th>{{ _('Trusted') }}</th>
-               <th title="{{ _('When an Activity was received from them') }}">{{ _('Seen') }}</th>
-               <th title="{{ _('When we successfully sent them an Activity') }}">{{ _('Sent') }}</th>
-               <th title="{{ _('How many times we failed to send (reset to 0 after every successful send)') }}">{{ _('Failed') }}</th>
-               <th title="{{ _('Instance Status - Online/Dormant/Gone Forever') }}">{{ _('Status') }}</th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="vote_weight{{' ASC' if sort_by == 'vote_weight DESC' else ' DESC' }}" class="btn" title="{{ _('Vote Weight') }}">
+                       {{ _('Vote Weight') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'vote_weight ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'vote_weight DESC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="trusted{{' ASC' if sort_by == 'trusted DESC' else ' DESC' }}" class="btn" title="{{ _('Trusted') }}">
+                       {{ _('Trusted') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'trusted ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'trusted DESC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="last_seen{{' ASC' if sort_by == 'last_seen DESC' else ' DESC' }}" class="btn" title="{{ _('When an Activity was received from them') }}">
+                       {{ _('Seen') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'last_seen ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'last_seen DESC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="last_successful_send{{' ASC' if sort_by == 'last_successful_send DESC' else ' DESC' }}" class="btn" title="{{ _('When we successfully sent them an Activity') }}">
+                       {{ _('Sent') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'last_successful_send ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'last_successful_send DESC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="failures{{' ASC' if sort_by == 'failures DESC' else ' DESC' }}" class="btn" title="{{ _('How many times we failed to send (reset to 0 after every successful send)') }}">
+                       {{ _('Failed') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'failures ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'failures DESC' }}"></span>
+                   </button>
+               </th>
+               <th>
+                   <button form="searchInstances" name="sort_by" value="{{'gone_forever ASC, dormant ASC' if sort_by == 'gone_forever DESC, dormant DESC' else 'gone_forever DESC, dormant DESC' }}" class="btn" title="{{ _('Instance Status - Online/Dormant/Gone Forever') }}">
+                       {{ _('Status') }}
+                       <span class="{{ 'fe fe-chevron-up' if sort_by == 'gone_forever ASC, dormant ASC' }}{{ 'fe fe-chevron-down' if sort_by == 'gone_forever DESC, dormant DESC' }}"></span>
+                   </button>
+               </th>
                <th> </th>
             </tr>
             {% for instance in instances.items %}
                 <tr>
-                    <td><a href="https://{{ instance.domain }}" rel="noopener nofollow noindex noreferrer">{{ instance.domain }}</a></td>
-                    <td>{{ instance.software  }}</td>
-                    <td>{{ instance.version if instance.version }}</td>
-                    <td>{{ instance.known_communities_count()  }}</td>
-                    <td>{{ instance.known_users_count()  }}</td>
-                    <td>{{ instance.post_count()  }}</td>
-                    <td>{{ instance.post_replies_count()  }}</td>
-                    <td>{{ instance.vote_weight  }}</td>
-                    <td>{{ _('Yes') if instance.trusted }}</td>
-                    <td>{{ arrow.get(instance.last_seen).humanize(locale=locale) if instance.last_seen }}</td>
-                    <td>{{ arrow.get(instance.last_successful_send).humanize(locale=locale) if instance.last_successful_send }}</td>
-                    <td>{{ instance.failures  }}</td>
+                    <td><span title="{{ _('Domain') }}"><a href="https://{{ instance.domain }}" rel="noopener nofollow noindex noreferrer">{{ instance.domain }}</a></span></td>
+                    <td><span title="{{ _('Software') }}">{{ instance.software  }}</span></td>
+                    <td><span title="{{ _('Version') }}">{{ instance.version if instance.version }}</span></td>
+                    <td><span title="{{ _('Known Communities') }}">{{ instance.known_communities_count()  }}</span></td>
+                    <td><span title="{{ _('Known Users') }}">{{ instance.known_users_count()  }}</span></td>
+                    <td><span title="{{ _('Posts') }}">{{ instance.post_count()  }}</span></td>
+                    <td><span title="{{ _('Post Replies') }}">{{ instance.post_replies_count()  }}</span></td>
+                    <td><span title="{{ _('Vote Weight') }}">{{ instance.vote_weight  }}</span></td>
+                    <td><span title="{{ _('Trusted') }}">{{ _('Yes') if instance.trusted }}</span></td>
+                    <td><span title="{{ _('Last Seen') }}">{{ arrow.get(instance.last_seen).humanize(locale=locale) if instance.last_seen }}</span></td>
+                    <td><span title="{{ _('Sent') }}">{{ arrow.get(instance.last_successful_send).humanize(locale=locale) if instance.last_successful_send }}</span></td>
+                    <td><span title="{{ _('Failed') }}">{{ instance.failures  }}</span></td>
                     {% if instance.gone_forever %}
-                        <td>{{ _('Gone forever') }}</td>
+                        <td><span title="{{ _('Status') }}">{{ _('Gone forever') }}</span></td>
                     {% elif instance.dormant %}
-                        <td>{{ _('Dormant') }}</td>
+                        <td><span title="{{ _('Status') }}">{{ _('Dormant') }}</span></td>
                     {% else %}
-                        <td>{{ _('Online') }}</td>
+                        <td><span title="{{ _('Status') }}">{{ _('Online') }}</span></td>
                     {% endif %}
                     <td><a href="{{ url_for('admin.admin_instance_edit', instance_id=instance.id) }}">{{ _('Edit') }}</a></td>
                 </tr>

From f84793244919c37d38a44706a12075ad921d9b0e Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Thu, 2 Jan 2025 16:37:42 +0100
Subject: [PATCH 5/6] add tooltips to table

---
 app/templates/admin/users.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index 7d9e025d..036e2905 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -76,15 +76,15 @@
             </tr>
             {% for user in users.items %}
                 <tr>
-                    <td>{{ render_username(user, add_domain=False) }}<br />
-                    <a href="/u/{{ user.link() }}">{{ user.user_name }}</a>{% if not user.is_local() %}<wbr />@<a href="{{ user.ap_profile_id }}">{{ user.ap_domain }}</a>{% endif %}</td>
-                    <td>{{ '<span class="red">Banned</span>'|safe if user.banned }}
+                    <td><span title="{{ _('Name') }}">{{ render_username(user, add_domain=False) }}<br />
+                    <a href="/u/{{ user.link() }}">{{ user.user_name }}</a>{% if not user.is_local() %}<wbr />@<a href="{{ user.ap_profile_id }}">{{ user.ap_domain }}</a>{% endif %}</span></td>
+                    <td><span title="{{ _('Banned') }}">{{ '<span class="red">Banned</span>'|safe if user.banned }}
                         {{ '<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>{% if user.attitude != 1 %}{{ (user.attitude * 100) | round | int }}%{% endif %}</td>
-                    <td>{% if user.reputation %}R {{ user.reputation | round | int }}{% endif %}</td>
-                    <td><span title="{{ user.last_seen }}">{{ arrow.get(user.last_seen).humanize(locale=locale) }}</span></td>
+                        {{ '<span class="red">Banned comments</span>'|safe if user.ban_comments }}</span></td>
+                    <td><span title="{{ _('Reports') }}">{{ user.reports if user.reports > 0 }}</span></td>
+                    <td><span title="{{ _('Attitude') }}">{% if user.attitude != 1 %}{{ (user.attitude * 100) | round | int }}%{% endif %}</span></td>
+                    <td><span title="{{ _('Reputation') }}">{% if user.reputation %}R {{ user.reputation | round | int }}{% endif %}</span></td>
+                    <td><span title="{{ _('Last Seen') }}: {{ user.last_seen }}">{{ arrow.get(user.last_seen).humanize(locale=locale) }}</span></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>,
                         <br />

From f50b9161b0b6999b9dceb76dfc71d045e4de4425 Mon Sep 17 00:00:00 2001
From: Hendrik L <hendrik+dev@xd0.de>
Date: Thu, 2 Jan 2025 16:39:02 +0100
Subject: [PATCH 6/6] show full timestamps

---
 app/templates/admin/communities.html | 2 +-
 app/templates/admin/instances.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin/communities.html b/app/templates/admin/communities.html
index cee65a02..55212c85 100644
--- a/app/templates/admin/communities.html
+++ b/app/templates/admin/communities.html
@@ -100,7 +100,7 @@
                         <td><span title="{{ _('Posts can be popular.') }}">{{ '&check;'|safe if community.show_popular else '&cross;'|safe }}</span></td>
                         <td><span title="{{ _('Posts show in the All feed.') }}">{{ '&check;'|safe if community.show_all else '&cross;'|safe }}</span></td>
                         <td><span title="{{ _('Content warning, NSFW or NSFL set for community.') }}">{{ '&#x26A0;'|safe if community.nsfw or community.nsfl or community.content_warning else ''|safe }}</span></td>
-                        <td><span title="{{ _('Last activity') }}">{{ arrow.get(community.last_active).humanize(locale=locale) }}</span></td>
+                        <td><span title="{{ _('Last activity') }}: {{ community.last_active }}">{{ arrow.get(community.last_active).humanize(locale=locale) }}</span></td>
                         <td><a href="{{ url_for('admin.admin_community_edit', community_id=community.id) }}">{{ _('Edit') }}</a>,
                             <a href="{{ url_for('community.community_moderate', actor=community.link()) }}">{{ _('Moderate') }}</a>,
                             <a href="{{ url_for('admin.admin_community_delete', community_id=community.id) }}" class="confirm_first">{{ _('Delete') }}</a>
diff --git a/app/templates/admin/instances.html b/app/templates/admin/instances.html
index 44409ac0..da5d1f1e 100644
--- a/app/templates/admin/instances.html
+++ b/app/templates/admin/instances.html
@@ -93,7 +93,7 @@
                     <td><span title="{{ _('Post Replies') }}">{{ instance.post_replies_count()  }}</span></td>
                     <td><span title="{{ _('Vote Weight') }}">{{ instance.vote_weight  }}</span></td>
                     <td><span title="{{ _('Trusted') }}">{{ _('Yes') if instance.trusted }}</span></td>
-                    <td><span title="{{ _('Last Seen') }}">{{ arrow.get(instance.last_seen).humanize(locale=locale) if instance.last_seen }}</span></td>
+                    <td><span title="{{ _('Last Seen') }}: {{ instance.last_seen }}">{{ arrow.get(instance.last_seen).humanize(locale=locale) if instance.last_seen }}</span></td>
                     <td><span title="{{ _('Sent') }}">{{ arrow.get(instance.last_successful_send).humanize(locale=locale) if instance.last_successful_send }}</span></td>
                     <td><span title="{{ _('Failed') }}">{{ instance.failures  }}</span></td>
                     {% if instance.gone_forever %}