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

Less verbose

merge-requests/21/head
Bob Mottram 2021-03-14 20:55:37 +00:00
parent 041b6f0a8c
commit 6dc85f69dc
10 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epicyon.py
View File

@ -731,7 +731,7 @@ if args.json:
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
testJson = getJson(session, args.json, asHeader, None,
__version__, httpPrefix, None)
debug, __version__, httpPrefix, None)
pprint(testJson)
sys.exit()

4
inbox.py
View File

@ -253,8 +253,8 @@ def getPersonPubKey(baseDir: str, session, personUrl: str,
'Accept': 'application/activity+json; profile="' + profileStr + '"'
}
personJson = \
getJson(session, personUrl, asHeader, None, projectVersion,
httpPrefix, personDomain)
getJson(session, personUrl, asHeader, None, debug,
projectVersion, httpPrefix, personDomain)
if not personJson:
return None
pubKey = None

4
migrate.py
View File

@ -85,8 +85,8 @@ def _updateMovedHandle(baseDir: str, nickname: str, domain: str,
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
personJson = \
getJson(session, personUrl, asHeader, None, __version__,
httpPrefix, None)
getJson(session, personUrl, asHeader, None,
debug, __version__, httpPrefix, None)
if not personJson:
return ctr
if not personJson.get('movedTo'):

6
person.py
View File

@ -1225,8 +1225,8 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
}
personJson = \
getJson(session, personUrl, asHeader, None, __version__,
httpPrefix, None, 20, quiet)
getJson(session, personUrl, asHeader, None,
debug, __version__, httpPrefix, None, 20, quiet)
if personJson:
if not quiet:
pprint(personJson)
@ -1237,7 +1237,7 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
}
personJson = \
getJson(session, personUrl, asHeader, None,
__version__, httpPrefix, None)
debug, __version__, httpPrefix, None)
if not quiet:
if personJson:
pprint(personJson)

17
posts.py
View File

@ -183,7 +183,7 @@ def parseUserFeed(session, feedUrl: str, asHeader: {},
return None
feedJson = getJson(session, feedUrl, asHeader, None,
projectVersion, httpPrefix, domain)
False, projectVersion, httpPrefix, domain)
if not feedJson:
return None
@ -220,6 +220,7 @@ def getPersonBox(baseDir: str, session, wfRequest: {},
nickname: str, domain: str,
boxName='inbox',
sourceId=0) -> (str, str, str, str, str, str, str, str):
debug = False
profileStr = 'https://www.w3.org/ns/activitystreams'
asHeader = {
'Accept': 'application/activity+json; profile="' + profileStr + '"'
@ -229,7 +230,7 @@ def getPersonBox(baseDir: str, session, wfRequest: {},
return None, None, None, None, None, None, None
if not wfRequest.get('errors'):
personUrl = getUserUrl(wfRequest, sourceId, False)
personUrl = getUserUrl(wfRequest, sourceId, debug)
else:
if nickname == 'dev':
# try single user instance
@ -250,13 +251,13 @@ def getPersonBox(baseDir: str, session, wfRequest: {},
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
personJson = getJson(session, personUrl, asHeader, None,
projectVersion, httpPrefix, domain)
debug, projectVersion, httpPrefix, domain)
if not personJson:
asHeader = {
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
personJson = getJson(session, personUrl, asHeader, None,
projectVersion, httpPrefix, domain)
debug, projectVersion, httpPrefix, domain)
if not personJson:
print('Unable to get actor')
return None, None, None, None, None, None, None
@ -3537,7 +3538,7 @@ def getPublicPostDomains(session, baseDir: str, nickname: str, domain: str,
def downloadFollowCollection(followType: str,
session, httpPrefix,
actor: str, pageNumber=1,
noOfPages=1) -> []:
noOfPages=1, debug=False) -> []:
"""Returns a list of following/followers for the given actor
by downloading the json for their following/followers collection
"""
@ -3554,8 +3555,8 @@ def downloadFollowCollection(followType: str,
for pageCtr in range(noOfPages):
url = actor + '/' + followType + '?page=' + str(pageNumber + pageCtr)
followersJson = \
getJson(session, url, sessionHeaders, None, __version__,
httpPrefix, None)
getJson(session, url, sessionHeaders, None,
debug, __version__, httpPrefix, None)
if followersJson:
if followersJson.get('orderedItems'):
for followerActor in followersJson['orderedItems']:
@ -3913,7 +3914,7 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
postJsonObject['object'])
announcedJson = \
getJson(session, postJsonObject['object'], asHeader,
None, projectVersion, httpPrefix, domain)
None, debug, projectVersion, httpPrefix, domain)
if not announcedJson:
return None

8
session.py
View File

@ -84,11 +84,11 @@ def urlExists(session, url: str, timeoutSec=3,
return False
def getJson(session, url: str, headers: {}, params: {},
def getJson(session, url: str, headers: {}, params: {}, debug: bool,
version='1.2.0', httpPrefix='https',
domain='testdomain', timeoutSec=20, quiet=False) -> {}:
if not isinstance(url, str):
if not quiet:
if debug and not quiet:
print('url: ' + str(url))
print('ERROR: getJson failed, url should be a string')
return None
@ -114,7 +114,7 @@ def getJson(session, url: str, headers: {}, params: {},
sessionHeaders2 = sessionHeaders.copy()
if sessionHeaders2.get('Authorization'):
sessionHeaders2['Authorization'] = 'REDACTED'
if not quiet:
if debug and not quiet:
print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
'headers: ' + str(sessionHeaders2) + ' ' +
'params: ' + str(sessionParams))
@ -123,7 +123,7 @@ def getJson(session, url: str, headers: {}, params: {},
sessionHeaders2 = sessionHeaders.copy()
if sessionHeaders2.get('Authorization'):
sessionHeaders2['Authorization'] = 'REDACTED'
if not quiet:
if debug and not quiet:
print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
'headers: ' + str(sessionHeaders2) + ' ' +
'params: ' + str(sessionParams) + ' ')

2
speaker.py
View File

@ -279,7 +279,7 @@ def getSpeakerFromServer(baseDir: str, session,
domainFull + '/users/' + nickname + '/speaker'
speakerJson = \
getJson(session, url, headers, None,
getJson(session, url, headers, None, debug,
__version__, httpPrefix, domain, 20, True)
return speakerJson

4
webapp_profile.py
View File

@ -156,14 +156,14 @@ def htmlProfileAfterSearch(cssCache: {},
}
personUrl = httpPrefix + '://' + searchDomainFull
profileJson = \
getJson(session, personUrl, asHeader, None,
getJson(session, personUrl, asHeader, None, debug,
projectVersion, httpPrefix, domain)
if not profileJson:
asHeader = {
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
profileJson = \
getJson(session, personUrl, asHeader, None,
getJson(session, personUrl, asHeader, None, debug,
projectVersion, httpPrefix, domain)
if not profileJson:
print('DEBUG: No actor returned from ' + personUrl)

6
webapp_utils.py
View File

@ -441,7 +441,7 @@ def setBlogAddress(actorJson: {}, blogAddress: str) -> None:
def updateAvatarImageCache(session, baseDir: str, httpPrefix: str,
actor: str, avatarUrl: str,
personCache: {}, allowDownloads: bool,
force=False) -> str:
force=False, debug=False) -> str:
"""Updates the cached avatar for the given actor
"""
if not avatarUrl:
@ -502,8 +502,8 @@ def updateAvatarImageCache(session, baseDir: str, httpPrefix: str,
'Accept': 'application/ld+json; profile="' + prof + '"'
}
personJson = \
getJson(session, actor, sessionHeaders, None, __version__,
httpPrefix, None)
getJson(session, actor, sessionHeaders, None,
debug, __version__, httpPrefix, None)
if personJson:
if not personJson.get('id'):
return None

3
webfinger.py
View File

@ -74,7 +74,8 @@ def webfingerHandle(session, handle: str, httpPrefix: str,
}
try:
result = \
getJson(session, url, hdr, par, projectVersion,
getJson(session, url, hdr, par,
debug, projectVersion,
httpPrefix, fromDomain)
except Exception as e:
print(e)