From ef9f6a3ee999f69fe80996478283031920ae519e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 2 Jul 2025 01:28:00 +0200 Subject: [PATCH] Continued: - fixed some `Unnecessary "else" after "return"` messages --- daemon.py | 6 ++-- fba/commands.py | 72 ++++++++++++++++++++--------------------- fba/networks/misskey.py | 4 +-- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/daemon.py b/daemon.py index 5ec0226..0c73a22 100755 --- a/daemon.py +++ b/daemon.py @@ -17,13 +17,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import re -import validators - from datetime import datetime from email.utils import format_datetime from pathlib import Path +import re +import validators + import fastapi from fastapi import Request, HTTPException, Query from fastapi.responses import JSONResponse diff --git a/fba/commands.py b/fba/commands.py index 710485d..6483a29 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -128,9 +128,9 @@ def fetch_pixelfed_api(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) try: logger.debug("Checking CSRF from source_domain='%s' ...", source_domain) @@ -192,9 +192,9 @@ def fetch_bkali(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) domains = [] try: @@ -503,9 +503,9 @@ def fetch_observer(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) types = [] if args.software is None: @@ -640,9 +640,9 @@ def fetch_todon_wiki(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) blocklist = { "silenced": [], @@ -757,9 +757,9 @@ def fetch_cs(args: argparse.Namespace): if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) logger.info("Fetching federation.md from source_domain='%s' ...", source_domain) raw = network.fetch_url( @@ -930,9 +930,9 @@ def fetch_fbabot_atom(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) domains = [] @@ -1123,9 +1123,9 @@ def fetch_oliphant(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) # Base URL base_url = f"https://{source_domain}/oliphant/blocklists/raw/branch/main/blocklists" @@ -1199,9 +1199,9 @@ def fetch_fedipact(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) logger.info("Fetching / from source_domain='%s' ...", source_domain) response = network.fetch_url( @@ -1258,9 +1258,9 @@ def fetch_joinmobilizon(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) logger.info("Fetching instances from source_domain='%s' ...", source_domain) rows = network.fetch_json_rows( @@ -1305,9 +1305,9 @@ def fetch_joinmisskey(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) logger.info("Fetching /instances.json from source_domain='%s' ...", source_domain) rows = network.fetch_json_rows( @@ -1502,9 +1502,9 @@ def fetch_fedilist(args: argparse.Namespace) -> int: if sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 1 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) url = f"https://{source_domain}/instance/csv?onion=not" if args.software not in [None, ""]: @@ -1660,9 +1660,9 @@ def fetch_instances_social(args: argparse.Namespace) -> int: elif sources.is_recent(source_domain): logger.info("API from source_domain='%s' has recently being accessed - EXIT!", source_domain) return 2 - else: - logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) - sources.update(source_domain) + + logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain) + sources.update(source_domain) logger.info("Fetching list from source_domain='%s' ...", source_domain) rows = network.fetch_json_rows( diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py index 8070d4d..4c4b99d 100644 --- a/fba/networks/misskey.py +++ b/fba/networks/misskey.py @@ -259,8 +259,8 @@ def fetch_blocks(domain: str) -> list: "block_level": "silenced", }) else: - logger.debug("domain='%s',blocked='%s' is not marked suspended - SKIPPED!", domain, blocked) - continue + logger.debug("domain='%s',blocked='%s' is not marked suspended - SKIPPED!", domain, blocked) + continue logger.debug("count=%d", count) if count == 0: -- 2.39.5