From: Roland Häder Date: Wed, 25 Jun 2025 00:14:24 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ef49bcf4d82027416c62055d56072cbc3dbeab9;p=fba.git Continued: - added software 'zuiriben' as source for blocks --- diff --git a/fba/commands.py b/fba/commands.py index 62291a0..710485d 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -301,11 +301,11 @@ def fetch_blocks(args: argparse.Namespace) -> int: elif args.only_none: # Check only entries with total_blocked=None logger.debug("Checking only entries with total_blocked=None ...") - database.cursor.execute("SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'piefed', 'typecho', 'neko') AND nodeinfo_url IS NOT NULL AND total_blocks IS NULL ORDER BY last_blocked ASC, total_blocks DESC") + database.cursor.execute("SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'piefed', 'typecho', 'neko', 'zuiriben') AND nodeinfo_url IS NOT NULL AND total_blocks IS NULL ORDER BY last_blocked ASC, total_blocks DESC") else: # Re-check after "timeout" (aka. minimum interval) logger.debug("Checking any federating software with possible blocklist ...") - database.cursor.execute("SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'piefed', 'typecho', 'neko') AND nodeinfo_url IS NOT NULL ORDER BY last_blocked ASC, total_blocks DESC") + database.cursor.execute("SELECT domain, software, origin, nodeinfo_url FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'piefed', 'typecho', 'neko', 'zuiriben') AND nodeinfo_url IS NOT NULL ORDER BY last_blocked ASC, total_blocks DESC") # Load all rows rows = [dict(row) for row in database.cursor.fetchall()]