No point in trying to retrieve remote diaspora content if no handle

federation/fetchers.py

@@ -3,7 +3,6 @@ import logging
 from typing import Optional, Callable
 
 from federation.entities.base import Profile
-from federation.utils.diaspora import parse_profile_diaspora_id
 
 logger = logging.getLogger("federation")
 

federation/utils/diaspora.py

@@ -9,6 +9,7 @@ from xrd import XRD
 
 from federation.inbound import handle_receive
 from federation.utils.network import fetch_document
+from federation.utils.text import validate_handle
 
 logger = logging.getLogger("federation")
 
@@ -217,6 +218,8 @@ def retrieve_and_parse_content(
         to fetch the profile and the key. Function must take handle as only parameter and return a public key.
     :returns: Entity object instance or ``None``
     """
+    if not validate_handle(handle):
+        return
     _username, domain = handle.split("@")
     url = get_fetch_content_endpoint(domain, entity_type, guid)
     document, status_code, error = fetch_document(url)