Metadata reports the number of accounts

main
Bob Mottram 2019-11-13 14:02:45 +00:00
parent afcd2e29ac
commit 4b53029376
2 changed files with 8 additions and 6 deletions

View File

@ -380,7 +380,7 @@ class PubServer(BaseHTTPRequestHandler):
return False
if self.server.debug:
print('DEBUG: nodeinfo '+self.path)
info=metaDataNodeInfo(self.server.registration,self.server.projectVersion)
info=metaDataNodeInfo(self.server.baseDir,self.server.registration,self.server.projectVersion)
if info:
msg=json.dumps(info).encode('utf-8')
self._set_headers('application/ld+json',len(msg),None)

View File

@ -9,10 +9,12 @@ __status__ = "Production"
import os
import json
import commentjson
from utils import noOfAccounts
def metaDataNodeInfo(registration: bool,version: str) -> {}:
def metaDataNodeInfo(baseDir: str,registration: bool,version: str) -> {}:
""" /nodeinfo/2.0 endpoint
"""
activeAccounts=noOfAccounts(baseDir)
nodeinfo = {
'openRegistrations': registration,
'protocols': ['activitypub'],
@ -25,7 +27,7 @@ def metaDataNodeInfo(registration: bool,version: str) -> {}:
'users': {
'activeHalfyear': 1,
'activeMonth': 1,
'total': 1
'total': activeAccounts
}
},
'version': '2.0'
@ -58,7 +60,7 @@ def metaDataInstance(instanceTitle: str, \
isBot=False
if adminActor['type']!='Person':
isBot=True
instance = {
'approval_required': False,
'contact_account': {'acct': adminActor['preferredUsername'],
@ -87,9 +89,9 @@ def metaDataInstance(instanceTitle: str, \
'registrations': registration,
'short_description': instanceDescriptionShort,
'stats': {
'domain_count': 1,
'domain_count': 2,
'status_count': 1,
'user_count': 1
'user_count': noOfAccounts(baseDir)
},
'thumbnail': httpPrefix+'://'+domainFull+'/login.png',
'title': instanceTitle,