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

No domain

main
Bob Mottram 2020-05-07 16:15:44 +01:00
parent 15c6953d08
commit f2fc17c4ca
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epicyon.py
View File

@ -1019,7 +1019,7 @@ if args.actor:
sys.exit() sys.exit()
nickname = args.actor.split('@')[0] nickname = args.actor.split('@')[0]
domain = args.actor.split('@')[1].replace('\n', '') domain = args.actor.split('@')[1].replace('\n', '')
wfCache = {} cachedWebfingers = {}
if args.http or domain.endswith('.onion'): if args.http or domain.endswith('.onion'):
httpPrefix = 'http' httpPrefix = 'http'
port = 80 port = 80
@ -1032,7 +1032,7 @@ if args.actor:
nickname = domain nickname = domain
wfRequest = webfingerHandle(session, nickname + '@' + domain, wfRequest = webfingerHandle(session, nickname + '@' + domain,
httpPrefix, wfCache, httpPrefix, cachedWebfingers,
None, __version__) None, __version__)
if not wfRequest: if not wfRequest:
print('Unable to webfinger ' + nickname + '@' + domain) print('Unable to webfinger ' + nickname + '@' + domain)

10
webinterface.py
View File

@ -5792,7 +5792,7 @@ def htmlProfileAfterSearch(recentPostsCache: {}, maxRecentPosts: int,
baseDir: str, path: str, httpPrefix: str, baseDir: str, path: str, httpPrefix: str,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
profileHandle: str, profileHandle: str,
session, wfRequest: {}, personCache: {}, session, cachedWebfingers: {}, personCache: {},
debug: bool, projectVersion: str) -> str: debug: bool, projectVersion: str) -> str:
"""Show a profile page after a search for a fediverse address """Show a profile page after a search for a fediverse address
""" """
@ -5841,12 +5841,12 @@ def htmlProfileAfterSearch(recentPostsCache: {}, maxRecentPosts: int,
wf = \ wf = \
webfingerHandle(session, webfingerHandle(session,
searchNickname + '@' + searchDomainFull, searchNickname + '@' + searchDomainFull,
httpPrefix, wfRequest, httpPrefix, cachedWebfingers,
domain, projectVersion) None, projectVersion)
if not wf: if not wf:
print('DEBUG: Unable to webfinger ' + print('DEBUG: Unable to webfinger ' +
searchNickname + '@' + searchDomainFull) searchNickname + '@' + searchDomainFull)
print('DEBUG: wfRequest ' + str(wfRequest)) print('DEBUG: cachedWebfingers ' + str(cachedWebfingers))
print('DEBUG: httpPrefix ' + httpPrefix) print('DEBUG: httpPrefix ' + httpPrefix)
print('DEBUG: domain ' + domain) print('DEBUG: domain ' + domain)
return None return None
@ -5979,7 +5979,7 @@ def htmlProfileAfterSearch(recentPostsCache: {}, maxRecentPosts: int,
profileStr += \ profileStr += \
individualPostAsHtml(recentPostsCache, maxRecentPosts, individualPostAsHtml(recentPostsCache, maxRecentPosts,
iconsDir, translate, None, baseDir, iconsDir, translate, None, baseDir,
session, wfRequest, personCache, session, cachedWebfingers, personCache,
nickname, domain, port, nickname, domain, port,
item, avatarUrl, False, False, item, avatarUrl, False, False,
httpPrefix, projectVersion, 'inbox', httpPrefix, projectVersion, 'inbox',