- row[] does already contain named keys, e.g. 'total_websites' so let's alias
the COUNT() statement to such key name which reduces some code
- renamed 'blocks_recorded' to 'total_blocks'
@router.get(config.get("base_url") + "/api/info.json", response_class=JSONResponse)
def api_info():
@router.get(config.get("base_url") + "/api/info.json", response_class=JSONResponse)
def api_info():
- database.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb', 'smithereen', 'vebinet')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_error_details IS NOT NULL)")
+ database.cursor.execute("SELECT (SELECT COUNT(domain) AS total_websites FROM instances), (SELECT COUNT(domain) AS supported_instances FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb', 'smithereen', 'vebinet')), (SELECT COUNT(blocker) FROM blocks) AS total_blocks, (SELECT COUNT(domain) AS erroneous_instances FROM instances WHERE last_error_details IS NOT NULL)")
row = database.cursor.fetchone()
row = database.cursor.fetchone()
- return JSONResponse(status_code=200, content={
- "total_websites" : row[0],
- "supported_instances": row[1],
- "blocks_recorded" : row[2],
- "erroneous_instances": row[3],
- })
+ return JSONResponse(status_code=200, content=row)
@router.get(config.get("base_url") + "/api/scoreboard.json", response_class=JSONResponse)
def api_scoreboard(mode: str, amount: int):
@router.get(config.get("base_url") + "/api/scoreboard.json", response_class=JSONResponse)
def api_scoreboard(mode: str, amount: int):
<tr>
<td>{{info.total_websites}}</td>
<td>{{info.supported_instances}}</td>
<tr>
<td>{{info.total_websites}}</td>
<td>{{info.supported_instances}}</td>
- <td>{{info.blocks_recorded}}</td>
+ <td>{{info.total_blocks}}</td>
<td>{{info.erroneous_instances}}</td>
</tr>
</tbody>
<td>{{info.erroneous_instances}}</td>
</tr>
</tbody>