Continued:

- moved translation list out of function (would reinitialized each time)

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index ebbe9a1bb877d9cd1520307793d4050e8effb0a3..638cf79d3b12e2787732b57fb33a46973a155973 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -33,6 +33,40 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 #logger.setLevel(logging.DEBUG)
 
+# Lemmy translations
+translations = [
+    "Blocked Instances".lower(),
+    "Instàncies bloquejades".lower(),
+    "Blocáilte Ásc".lower(),
+    "封锁实例".lower(),
+    "Blokované instance".lower(),
+    "Geblokkeerde instanties".lower(),
+    "Blockerade instanser".lower(),
+    "Instàncias blocadas".lower(),
+    "Istanze bloccate".lower(),
+    "Instances bloquées".lower(),
+    "Letiltott példányok".lower(),
+    "Instancias bloqueadas".lower(),
+    "Blokeatuta dauden instantziak".lower(),
+    "차단된 인스턴스".lower(),
+    "Peladen Yang Diblokir".lower(),
+    "Blokerede servere".lower(),
+    "Blokitaj nodoj".lower(),
+    "Блокирани Инстанции".lower(),
+    "Blockierte Instanzen".lower(),
+    "Estetyt instanssit".lower(),
+    "Instâncias bloqueadas".lower(),
+    "Zablokowane instancje".lower(),
+    "Blokované inštancie".lower(),
+    "المثلاء المحجوبون".lower(),
+    "Užblokuoti serveriai".lower(),
+    "ブロックしたインスタンス".lower(),
+    "Блокированные Инстансы".lower(),
+    "Αποκλεισμένοι διακομιστές".lower(),
+    "封鎖站台".lower(),
+    "Instâncias bloqueadas".lower(),
+]
+
 def fetch_peers(domain: str, origin: str) -> list:
     logger.debug("domain='%s',origin='%s' - CALLED!", domain, origin)
     domain_helper.raise_on(domain)
@@ -90,39 +124,6 @@ def fetch_blocks(domain: str) -> list:
     if not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked.")
 
-    translations = [
-        "Blocked Instances".lower(),
-        "Instàncies bloquejades".lower(),
-        "Blocáilte Ásc".lower(),
-        "封锁实例".lower(),
-        "Blokované instance".lower(),
-        "Geblokkeerde instanties".lower(),
-        "Blockerade instanser".lower(),
-        "Instàncias blocadas".lower(),
-        "Istanze bloccate".lower(),
-        "Instances bloquées".lower(),
-        "Letiltott példányok".lower(),
-        "Instancias bloqueadas".lower(),
-        "Blokeatuta dauden instantziak".lower(),
-        "차단된 인스턴스".lower(),
-        "Peladen Yang Diblokir".lower(),
-        "Blokerede servere".lower(),
-        "Blokitaj nodoj".lower(),
-        "Блокирани Инстанции".lower(),
-        "Blockierte Instanzen".lower(),
-        "Estetyt instanssit".lower(),
-        "Instâncias bloqueadas".lower(),
-        "Zablokowane instancje".lower(),
-        "Blokované inštancie".lower(),
-        "المثلاء المحجوبون".lower(),
-        "Užblokuoti serveriai".lower(),
-        "ブロックしたインスタンス".lower(),
-        "Блокированные Инстансы".lower(),
-        "Αποκλεισμένοι διακομιστές".lower(),
-        "封鎖站台".lower(),
-        "Instâncias bloqueadas".lower(),
-    ]
-
     blocklist = list()
 
     try:

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index 045b5061c807fa4547802e26edcef8243e4b31b5..8ec994db1bbfd9f765df6cee2bb63ae07cd72d08 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -208,8 +208,8 @@ def fetch_blocks(domain: str) -> list:
 
                 logger.debug("instance[host]='%s' - BEFORE!", instance["host"])
                 blocked = tidyup.domain(instance["host"])
-
                 logger.debug("blocked[%s]='%s' - AFTER!", type(blocked), blocked)
+
                 if blocked is None or blocked == "":
                     logger.warning("instance[host]='%s' is None or empty after tidyup.domain() - SKIPPED!", instance["host"])
                     continue

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index 475982cd18057d779cb797005d492d87faaa259f..773af21ed51edb1ff462da5f4f5150cd4fbc8a65 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -83,9 +83,7 @@ def fetch_peers(domain: str) -> list:
                         elif record[mode2]["host"] == domain:
                             logger.debug("record[%s]='%s' matches domain='%s' - SKIPPED!", mode2, record[mode2]["host"], domain)
                             continue
-
-                        logger.debug("record[%s][host]='%s'", mode2, record[mode2]["host"])
-                        if not domain_helper.is_wanted(record[mode2]["host"]):
+                        elif not domain_helper.is_wanted(record[mode2]["host"]):
                             logger.debug("record[%s][host]='%s' is not wanted - SKIPPED!", mode2, record[mode2]["host"])
                             continue
 

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 9e4eeb3b0091c73e08e79c6c84acdc19cb70c7be..a7c25184fef675e44cbc364252a5ec7413ec35a5 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -195,7 +195,10 @@ def fetch_blocks(domain: str) -> list:
             block_level = tidyup.domain(block_level) if block_level != "" else None
             logger.debug("block_level='%s' - AFTER!", block_level)
 
-            if block_level == "":
+            if block_level is None:
+                logger.warning("block_level is now None!")
+                continue
+            elif block_level == "":
                 logger.warning("block_level is now empty!")
                 continue
             elif block_level == "accept":