Continued:

- data['json'] now contains the reply

diff --git a/fba/federation.py b/fba/federation.py
index 8d5515e0ad8caf21e4c618c6d220eb66d4dae2ac..2a834b66f25b05c7dc56efd5f9b68585c8ca1784 100644 (file)
--- a/fba/federation.py
+++ b/fba/federation.py
@@ -333,27 +333,27 @@ def determine_software(domain: str, path: str = None) -> str:
     data = fetch_nodeinfo(domain, path)
 
     # DEBUG: print("DEBUG: data[]:", type(data))
-    if not isinstance(data, dict) or len(data) == 0:
+    if "error_message" in data:
         # DEBUG: print("DEBUG: Could not determine software type:", domain)
         return fetch_generator_from_path(domain)
 
     # DEBUG: print("DEBUG: data():", len(data), data)
-    if "status" in data and data["status"] == "error" and "message" in data:
-        print("WARNING: JSON response is an error:", data["message"])
-        instances.update_last_error(domain, data["message"])
+    if "status" in data["json"] and data["json"]["status"] == "error" and "message" in data["json"]:
+        print("WARNING: JSON response is an error:", data["json"]["message"])
+        instances.update_last_error(domain, data["json"]["message"])
         return fetch_generator_from_path(domain)
-    elif "message" in data:
+    elif "message" in data["json"]:
         print("WARNING: JSON response contains only a message:", data["message"])
-        instances.update_last_error(domain, data["message"])
+        instances.update_last_error(domain, data["json"]["message"])
         return fetch_generator_from_path(domain)
-    elif "software" not in data or "name" not in data["software"]:
+    elif "software" not in data["json"] or "name" not in data["json"]["software"]:
         # DEBUG: print(f"DEBUG: JSON response from domain='{domain}' does not include [software][name], fetching / ...")
         software = fetch_generator_from_path(domain)
 
         # DEBUG: print(f"DEBUG: Generator for domain='{domain}' is: {software}, EXIT!")
         return software
 
-    software = tidyup.domain(data["software"]["name"])
+    software = tidyup.domain(data["json"]["software"]["name"])
 
     # DEBUG: print("DEBUG: sofware after tidyup.domain():", software)
     if software in ["akkoma", "rebased"]: