indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2021-07-29 23:48:31 +01:00
parent 09fcc163bb
commit 883d48f934
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webfinger.py
View File

@ -67,8 +67,8 @@ def webfingerHandle(session, handle: str, httpPrefix: str,
return None return None
wfDomain = removeDomainPort(domain) wfDomain = removeDomainPort(domain)
wf = getWebfingerFromCache(nickname + '@' + wfDomain, wfHandle = nickname + '@' + wfDomain
cachedWebfingers) wf = getWebfingerFromCache(wfHandle, cachedWebfingers)
if wf: if wf:
if debug: if debug:
print('Webfinger from cache: ' + str(wf)) print('Webfinger from cache: ' + str(wf))
@ -78,7 +78,7 @@ def webfingerHandle(session, handle: str, httpPrefix: str,
'Accept': 'application/jrd+json' 'Accept': 'application/jrd+json'
} }
par = { par = {
'resource': 'acct:{}'.format(nickname + '@' + wfDomain) 'resource': 'acct:{}'.format(wfHandle)
} }
success = False success = False
try: try:
@ -93,7 +93,7 @@ def webfingerHandle(session, handle: str, httpPrefix: str,
pass pass
if not success: if not success:
par = { par = {
'resource': 'group:{}'.format(nickname + '@' + wfDomain) 'resource': 'group:{}'.format(wfHandle)
} }
try: try:
result = \ result = \
@ -107,8 +107,7 @@ def webfingerHandle(session, handle: str, httpPrefix: str,
return None return None
if result: if result:
storeWebfingerInCache(nickname + '@' + wfDomain, storeWebfingerInCache(wfHandle, result, cachedWebfingers)
result, cachedWebfingers)
else: else:
if debug: if debug:
print("WARN: Unable to webfinger " + url + ' ' + print("WARN: Unable to webfinger " + url + ' ' +