mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chack for users path

alt-html-css
Bob Mottram 2020-12-30 12:14:02 +00:00
parent 9b3140aa1a
commit 8e8dda6370
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -2577,7 +2577,16 @@ class PubServer(BaseHTTPRequestHandler):
# are we already following the searched for handle? # are we already following the searched for handle?
if isFollowingActor(baseDir, nickname, domain, if isFollowingActor(baseDir, nickname, domain,
searchStr): searchStr):
actor = searchStr if not hasUsersPath(searchStr):
searchNickname = getNicknameFromActor(searchStr)
searchDomain, searchPort = \
getDomainFromActor(searchStr)
actor = \
httpPrefix + '://' + \
getFullDomain(searchDomain, searchPort) + \
'/users/' + searchNickname
else:
actor = searchStr
avatarUrl = \ avatarUrl = \
getAvatarImageUrl(self.server.session, getAvatarImageUrl(self.server.session,
baseDir, httpPrefix, baseDir, httpPrefix,
@ -2588,7 +2597,7 @@ class PubServer(BaseHTTPRequestHandler):
'?options=' + actor + ';1;' + \ '?options=' + actor + ';1;' + \
'/avatars/' + avatarUrl.replace('/', '-') '/avatars/' + avatarUrl.replace('/', '-')
print('profilePathStr: ' + profilePathStr) print('profilePathStr: ' + profilePathStr)
self._showPersonOptions(callingDomain, profilePathStr, self._showPersonOptions(callingDomain, profilePathStr,
baseDir, httpPrefix, baseDir, httpPrefix,
domain, domainFull, domain, domainFull,