make api/v3/instance return a list of admins. fixes #41

app/activitypub/routes.py

@@ -116,7 +116,7 @@ def nodeinfo2():
 
 
 @bp.route('/api/v3/site')
-@cache.cached(timeout=600)
+#@cache.cached(timeout=600)
 def lemmy_site():
     return jsonify(lemmy_site_data())
 

app/activitypub/util.py

@@ -60,6 +60,16 @@ def active_month():
         "SELECT COUNT(id) as c FROM \"user\" WHERE last_seen >= CURRENT_DATE - INTERVAL '1 month' AND ap_id is null AND verified is true AND banned is false AND deleted is false")).scalar()
 
 
+def active_week():
+    return db.session.execute(text(
+        "SELECT COUNT(id) as c FROM \"user\" WHERE last_seen >= CURRENT_DATE - INTERVAL '1 week' AND ap_id is null AND verified is true AND banned is false AND deleted is false")).scalar()
+
+
+def active_day():
+    return db.session.execute(text(
+        "SELECT COUNT(id) as c FROM \"user\" WHERE last_seen >= CURRENT_DATE - INTERVAL '1 day' AND ap_id is null AND verified is true AND banned is false AND deleted is false")).scalar()
+
+
 def local_posts():
     return db.session.execute(text('SELECT COUNT(id) as c FROM "post" WHERE instance_id = 1')).scalar()
 
@@ -67,6 +77,9 @@ def local_posts():
 def local_comments():
     return db.session.execute(text('SELECT COUNT(id) as c FROM "post_reply" WHERE instance_id = 1')).scalar()
 
+def local_communities():
+    return db.session.execute(text('SELECT COUNT(id) as c FROM "community" WHERE instance_id = 1')).scalar()
+
 
 def send_activity(sender: User, host: str, content: str):
     date = time.strftime('%a, %d %b %Y %H:%M:%S UTC', time.gmtime())
@@ -1316,65 +1329,17 @@ def lemmy_site_data():
         "counts": {
           "id": 1,
           "site_id": 1,
-          "users": 816,
+          "users": users_total(),
-          "posts": 3017,
+          "posts": local_posts(),
-          "comments": 19693,
+          "comments": local_comments(),
-          "communities": 7,
+          "communities": local_communities(),
-          "users_active_day": 21,
+          "users_active_day": active_day(),
-          "users_active_week": 49,
+          "users_active_week": active_week(),
-          "users_active_month": 85,
+          "users_active_month": active_month(),
-          "users_active_half_year": 312
+          "users_active_half_year": active_half_year()
         }
       },
-      "admins": [
+      "admins": [],
-        {
-          "person": {
-            "id": 2,
-            "name": "Dave",
-            "avatar": "https://lemmy.nz/pictrs/image/5eb39c6b-a1f0-4cba-9832-40a5d8ffb76a.png",
-            "banned": False,
-            "published": "2023-06-02T09:46:20.302035",
-            "actor_id": "https://lemmy.nz/u/Dave",
-            "local": True,
-            "deleted": False,
-            "matrix_user_id": "@bechorin:matrix.org",
-            "admin": True,
-            "bot_account": False,
-            "instance_id": 1
-          },
-          "counts": {
-            "id": 1,
-            "person_id": 2,
-            "post_count": 165,
-            "post_score": 1442,
-            "comment_count": 2624,
-            "comment_score": 10207
-          }
-        },
-        {
-          "person": {
-            "id": 15059,
-            "name": "idanoo",
-            "banned": False,
-            "published": "2023-06-08T22:13:43.366681",
-            "actor_id": "https://lemmy.nz/u/idanoo",
-            "local": True,
-            "deleted": False,
-            "matrix_user_id": "@idanoo:mtrx.nz",
-            "admin": True,
-            "bot_account": False,
-            "instance_id": 1
-          },
-          "counts": {
-            "id": 6544,
-            "person_id": 15059,
-            "post_count": 0,
-            "post_score": 0,
-            "comment_count": 5,
-            "comment_score": 10
-          }
-        }
-      ],
       "version": "1.0.0",
       "all_languages": [
         {
@@ -2302,14 +2267,31 @@ def lemmy_site_data():
         0,
         37
       ],
-      "taglines": [
+      "taglines": [],
-        {
-          "id": 19,
-          "local_site_id": 1,
-          "content": "Welcome to Lemmy NZ! [Don't be a dick](https://lemmy.nz/post/63098) ~ [FAQ](https://lemmy.nz/post/31318) ~ [NZ Community List ](https://lemmy.nz/post/63156) ~ [Join Matrix chatroom](https://lemmy.nz/post/169187)\n\n",
-          "published": "2023-06-28T09:53:58.605042"
-        }
-      ],
       "custom_emojis": []
     }
+    for admin in Site.admins():
+        person = {
+            "id": admin.id,
+            "name": admin.display_name(),
+            "avatar": 'https://' + current_app.config['SERVER_NAME'] + admin.avatar_thumbnail(),
+            "banned": admin.banned,
+            "published": admin.created.isoformat(),
+            "actor_id": admin.profile_id(),
+            "local": True,
+            "deleted": admin.deleted,
+            "matrix_user_id": admin.matrix_user_id,
+            "admin": True,
+            "bot_account": admin.bot,
+            "instance_id": 1
+        }
+        counts = {
+            "id": admin.id,
+            "person_id": admin.id,
+            "post_count": 0,
+            "post_score": 0,
+            "comment_count": 0,
+            "comment_score": 0
+        }
+        data['admins'].append({'person': person, 'counts': counts})
     return data

app/post/routes.py

@@ -76,7 +76,7 @@ def show_post(post_id: int):
         reply = PostReply(user_id=current_user.id, post_id=post.id, community_id=community.id, body=form.body.data,
                           body_html=markdown_to_html(form.body.data), body_html_safe=True,
                           from_bot=current_user.bot, up_votes=1, nsfw=post.nsfw, nsfl=post.nsfl,
-                          notify_author=form.notify_author.data)
+                          notify_author=form.notify_author.data, instance_id=1)
         if post.notify_author and current_user.id != post.user_id:
             notification = Notification(title=shorten_string(_('Reply from %(name)s on %(post_title)s',
                                                 name=current_user.display_name(),