From 6ea8ac7835777489e1bcddf2118ccc2c939b3e3c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 4 Aug 2019 21:06:25 +0100 Subject: [PATCH] Include port number in domain during search --- daemon.py | 2 +- webinterface.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index f9107364..6d8ab9ea 100644 --- a/daemon.py +++ b/daemon.py @@ -1839,7 +1839,7 @@ class PubServer(BaseHTTPRequestHandler): searchStr=searchParams.split('searchtext=')[1] if '&' in searchStr: searchStr=searchStr.split('&')[0] - searchStr=searchStr.replace('+',' ').replace('%40','@').strip() + searchStr=searchStr.replace('+',' ').replace('%40','@').replace('%3A',':').strip() if '@' in searchStr: print('Search: '+searchStr) nickname=getNicknameFromActor(self.path) diff --git a/webinterface.py b/webinterface.py index 5d47030c..d33090e5 100644 --- a/webinterface.py +++ b/webinterface.py @@ -1047,10 +1047,10 @@ def htmlProfileAfterSearch(baseDir: str,path: str,httpPrefix: str, \ profileStr='' with open(baseDir+'/epicyon-profile.css', 'r') as cssFile: - wf = webfingerHandle(session,searchNickname+'@'+searchDomain,httpPrefix,wfRequest) + wf = webfingerHandle(session,searchNickname+'@'+searchDomainFull,httpPrefix,wfRequest) if not wf: if debug: - print('DEBUG: Unable to webfinger '+searchNickname+'@'+searchDomain) + print('DEBUG: Unable to webfinger '+searchNickname+'@'+searchDomainFull) return None asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} personUrl = getUserUrl(wf)