From c8922cc67f1b7e9f5f42b7be3b8a998eec6b2426 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 13 Oct 2024 10:53:47 +1300
Subject: [PATCH] link user profiles to their instances

---
 app/models.py                        |  8 ++++++++
 app/templates/instance/people.html   | 10 +++++++---
 app/templates/user/show_profile.html |  3 ++-
 app/user/routes.py                   |  9 +--------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/models.py b/app/models.py
index 41f992ba..0a6dbf4c 100644
--- a/app/models.py
+++ b/app/models.py
@@ -847,6 +847,14 @@ class User(UserMixin, db.Model):
         else:
             return self.public_url() + '/followers'
 
+    def instance_domain(self):
+        if self.ap_domain:
+            return self.ap_domain
+        if self.is_local():
+            return current_app.config['SERVER_NAME']
+        else:
+            return self.instance.domain
+
     def get_reset_password_token(self, expires_in=600):
         return jwt.encode(
             {'reset_password': self.id, 'exp': time() + expires_in},
diff --git a/app/templates/instance/people.html b/app/templates/instance/people.html
index 249c34bb..f70b5d66 100644
--- a/app/templates/instance/people.html
+++ b/app/templates/instance/people.html
@@ -20,13 +20,17 @@
         {% if people %}
             <table class="table table-striped">
                 <tr>
-                    <th>Name</th>
-                    <th>About</th>
+                    <th>{{ _('Name') }}</th>
+                    <th>{{ _('About') }}</th>
+                    <th>{{ _('Posts') }}</th>
+                    <th>{{ _('Comments') }}</th>
                 </tr>
                 {% for person in people %}
                     <tr>
-                        <td>{{ render_username(person) }}</td>
+                        <td valign="top">{{ render_username(person) }}</td>
                         <td>{{ person.about_html | safe if person.about_html }}</td>
+                        <td valign="top">{{ person.post_count }}</td>
+                        <td valign="top">{{ person.post_reply_count }}</td>
                     </tr>
                 {% endfor %}
             </table>
diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index a62a0eb5..2a1b9b39 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -89,7 +89,8 @@
         {% endif %}
 
         </div>
-        <p class="small">{{ _('Joined') }}: {{ arrow.get(user.created).humanize(locale=locale) }}<br />
+        <p class="small">{{ _('Instance') }}: <a href="{{ url_for('instance.instance_overview', instance_domain=user.instance_domain()) }}">{{ user.instance_domain() }}</a><br />
+            {{ _('Joined') }}: {{ arrow.get(user.created).humanize(locale=locale) }}<br />
             {% 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 />
diff --git a/app/user/routes.py b/app/user/routes.py
index 02eb9259..1ff279c3 100644
--- a/app/user/routes.py
+++ b/app/user/routes.py
@@ -34,14 +34,7 @@ import json as python_json
 @bp.route('/people', methods=['GET', 'POST'])
 @login_required
 def show_people():
-    if current_user.is_admin():
-        people = User.query.filter_by(ap_id=None, deleted=False, banned=False).all()
-    else:
-        people = User.query.filter_by(ap_id=None, deleted=False, banned=False, searchable=True).all()
-    return render_template('user/people.html', people=people, moderating_communities=moderating_communities(current_user.get_id()),
-                           joined_communities=joined_communities(current_user.get_id()),
-                           menu_topics=menu_topics(), site=g.site,
-                           title=_('People'))
+    return redirect(url_for('instance.instance_people', instance_domain=current_app.config['SERVER_NAME']))
 
 
 @bp.route('/user/<int:user_id>', methods=['GET'])