From fbfad9fbf5e061cb7c658dada3c4014c9796021c Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Thu, 10 Nov 2022 23:42:43 -0700
Subject: Inbound and outbound follows basic working

---
 users/shortcuts.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'users/shortcuts.py')

diff --git a/users/shortcuts.py b/users/shortcuts.py
index 8e20a09..0726218 100644
--- a/users/shortcuts.py
+++ b/users/shortcuts.py
@@ -19,7 +19,10 @@ def by_handle_or_404(request, handle, local=True, fetch=False) -> Identity:
     else:
         username, domain = handle.split("@", 1)
         # Resolve the domain to the display domain
-        domain = Domain.get_remote_domain(domain).domain
+        domain_instance = Domain.get_domain(domain)
+        if domain_instance is None:
+            domain_instance = Domain.get_remote_domain(domain)
+        domain = domain_instance.domain
     identity = Identity.by_username_and_domain(
         username,
         domain,
-- 
cgit v1.2.3