summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5c62d30)
- added flooder to blacklist
- added more networks for peers at least: 'gotosocial', 'brighteon',
'wildebeest', 'bookwyrm'
@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')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_error_details IS NOT NULL)")
+ 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')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_error_details IS NOT NULL)")
row = database.cursor.fetchone()
return {
row = database.cursor.fetchone()
return {
# Loop through some instances
database.cursor.execute(
# Loop through some instances
database.cursor.execute(
- "SELECT domain, origin, software, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'lemmy', 'peertube', 'takahe') AND (last_instance_fetch IS NULL OR last_instance_fetch < ?) ORDER BY rowid DESC", [time.time() - config.get("recheck_instance")]
+ "SELECT domain, origin, software, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'friendica', 'misskey', 'lemmy', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm') AND (last_instance_fetch IS NULL OR last_instance_fetch < ?) ORDER BY rowid DESC", [time.time() - config.get("recheck_instance")]
)
rows = database.cursor.fetchall()
)
rows = database.cursor.fetchall()
"mastotroll.netz.org",
"lhr.life",
"localhost.run",
"mastotroll.netz.org",
"lhr.life",
"localhost.run",
# Testing/developing installations
"ngrok.io",
"ngrok-free.app",
# Testing/developing installations
"ngrok.io",
"ngrok-free.app",
elif software in ["hometown", "ecko"] or "mastodon" in software:
logger.debug("Setting mastodon: software='%s'", software)
software = "mastodon"
elif software in ["hometown", "ecko"] or "mastodon" in software:
logger.debug("Setting mastodon: software='%s'", software)
software = "mastodon"
- elif software in ["slipfox calckey", "calckey", "groundpolis", "foundkey", "cherrypick", "meisskey", "magnetar", "keybump", "dolphin", "calckey social", "azk.sns"] or ["shumihub", "мисскей"] in software:
+ elif software in ["slipfox calckey", "calckey", "groundpolis", "foundkey", "cherrypick", "meisskey", "magnetar", "keybump", "dolphin", "calckey social", "azk.sns"] or "shumihub" in software or "мисскей" in software:
logger.debug("Setting misskey: software='%s'", software)
software = "misskey"
elif software in ["runtube.re", "islameye"]:
logger.debug("Setting misskey: software='%s'", software)
software = "misskey"
elif software in ["runtube.re", "islameye"]: