From 2f716975e445d55d11db56e61d98a3aa05e30ae3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 17 Oct 2019 16:08:25 +0100
Subject: [PATCH] Use actor if webfinger fails

---
 epicyon.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epicyon.py b/epicyon.py
index 16992d6d4..96c1f2040 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -842,6 +842,7 @@ if args.dat:
     httpPrefix='dat'
 
 if args.actor:
+    originalActor=args.actor
     if '/@' in args.actor or '/users/' in args.actor or args.actor.startswith('http') or args.actor.startswith('dat'):
         # format: https://domain/@nick
         args.actor=args.actor.replace('https://','').replace('http://','').replace('dat://','').replace('/@','/users/')
@@ -883,12 +884,17 @@ if args.actor:
         print('Unable to webfinger '+nickname+'@'+domain)
         sys.exit()
 
+    personUrl=None
     if wfRequest.get('errors'):
         print('wfRequest error: '+str(wfRequest['errors']))
-        sys.exit()
+        if '/users/' in args.actor:
+            personUrl=originalActor
+        else:
+            sys.exit()
         
     asHeader = {'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'}
-    personUrl = getUserUrl(wfRequest)
+    if not personUrl:
+        personUrl = getUserUrl(wfRequest)
     if nickname==domain:
         personUrl=personUrl.replace('/users/','/actor/')
     #print('personUrl: '+personUrl)