Continued:

- removed duplicate functions
- fixed __all__
- removed whitespace
- re-added set_detection_mode()

diff --git a/fba/__init__.py b/fba/__init__.py
index 155bf7613877fcd591adfb38b2619654de6c3233..80128852f62772c4da131cc2f3e86e24c0ca2971 100644 (file)
--- a/fba/__init__.py
+++ b/fba/__init__.py
@@ -15,7 +15,6 @@
 
 __all__ = [
     # Main packages:
-    'blacklist',
     'boot',
     'commands',
     'config',

diff --git a/fba/fba.py b/fba/fba.py
index db37abf699125098c845f36ca93e6c53a1b745e9..368de88a7374570f3d6a0c47f70f453120d1ce76 100644 (file)
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -25,6 +25,7 @@ from fba import federation
 from fba import network
 
 from fba.helpers import blacklist
+from fba.helpers import cookies
 
 from fba.models import instances
 

diff --git a/fba/helpers/__init__.py b/fba/helpers/__init__.py
index 91fed0392ce7eb654f6d9eb13b12cb6fc1e84466..473eed0a0773ceca4f0e5da95c1bfb2d8084449a 100644 (file)
--- a/fba/helpers/__init__.py
+++ b/fba/helpers/__init__.py
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 __all__ = [
+    'blacklist',
     'cache',
     'cookies',
     'dicts',

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 836a1ef7430f1c4be36e19680d4fc37eb01720ab..83402e72051ca5c68c19bd461564fc1787060a6e 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -383,7 +383,7 @@ def set_total_peers(domain: str, peers: list):
     _set_data("total_peers", domain, len(peers))
     # DEBUG: print("DEBUG: EXIT!")
 
-def set_nodeinfo_url(domain: str, url: list):
+def set_nodeinfo_url(domain: str, url: str):
     # DEBUG: print(f"DEBUG: domain='{domain}',url='{url}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
@@ -398,37 +398,7 @@ def set_nodeinfo_url(domain: str, url: list):
     _set_data("nodeinfo_url", domain, url)
     # DEBUG: print("DEBUG: EXIT!")
 
-def set_detection_mode(domain: str, url: list):
-    # DEBUG: print(f"DEBUG: domain='{domain}',url='{url}' - CALLED!")
-    if not isinstance(domain, str):
-        raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
-    elif domain == "":
-        raise ValueError("Parameter 'domain' is empty")
-    elif not isinstance(url, str):
-        raise ValueError("Parameter url[]='{type(url)}' is not 'list'")
-    elif url == "":
-        raise ValueError("Parameter 'url' is empty")
-
-    # Set timestamp
-    _set_data("detection_mode", domain, url)
-    # DEBUG: print("DEBUG: EXIT!")
-
-def set_detection_mode(domain: str, url: list):
-    # DEBUG: print(f"DEBUG: domain='{domain}',url='{url}' - CALLED!")
-    if not isinstance(domain, str):
-        raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
-    elif domain == "":
-        raise ValueError("Parameter 'domain' is empty")
-    elif not isinstance(url, str):
-        raise ValueError("Parameter url[]='{type(url)}' is not 'list'")
-    elif url == "":
-        raise ValueError("Parameter 'url' is empty")
-
-    # Set timestamp
-    _set_data("detection_mode", domain, url)
-    # DEBUG: print("DEBUG: EXIT!")
-
-def set_detection_mode(domain: str, mode: list):
+def set_detection_mode(domain: str, mode: str):
     # DEBUG: print(f"DEBUG: domain='{domain}',mode='{mode}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index 393f65964c0b789207a6627659d3f9ec20351a08..e6138c74deabeeeb00e85c07a8ed113fb667e59e 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -87,7 +87,7 @@ def fetch_blocks(domain: str) -> dict:
             continue
 
         blocked.append({
-            "domain": tidyup.domain(domaih),
+            "domain": tidyup.domain(blocked),
             "reason": tidyup.reason(line.find_all("td")[1].text)
         })
         # DEBUG: print("DEBUG: Next!")

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index 541dd55e7ad0b2a4689529876e23daacb14aad41..e8ca1e1adb1322afc7011f9d47be576d3c5d22d2 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -163,7 +163,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
             for header in headers:
                 # DEBUG: print(f"DEBUG: header[]={type(header)}")
                 content = header.contents[0]
- 
+
                 # DEBUG: print(f"DEBUG: content='{content}'")
                 if content in translations:
                     # DEBUG: print("DEBUG: Found header with blocked instances - BREAK!")