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

Fix tests

merge-requests/30/head
Bob Mottram 2021-09-14 14:05:10 +01:00
parent 41081af794
commit 5d8e975d3a
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
httpsig.py
View File

@ -210,8 +210,7 @@ def createSignedHeader(privateKeyPem: str, nickname: str,
dateStr = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime()) dateStr = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime())
if not withDigest: if not withDigest:
contentType = \ contentType = \
'application/activity+json, ' + \ 'application/activity+json'
'application/ld+json, application/jrd+json'
headers = { headers = {
'(request-target)': f'get {path}', '(request-target)': f'get {path}',
'host': headerDomain, 'host': headerDomain,

20
posts.py
View File

@ -509,14 +509,14 @@ def _getPosts(session, outboxUrl: str, maxPosts: int,
return personPosts return personPosts
profileStr = 'https://www.w3.org/ns/activitystreams' profileStr = 'https://www.w3.org/ns/activitystreams'
acceptStr = \ acceptStr = \
'application/activity+json, application/ld+json; ' + \ 'application/activity+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
} }
if '/outbox/' in outboxUrl: if '/outbox/' in outboxUrl:
acceptStr = \ acceptStr = \
'application/ld+json, application/activity+json; ' + \ 'application/ld+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
@ -719,14 +719,14 @@ def getPostDomains(session, outboxUrl: str, maxPosts: int,
return [] return []
profileStr = 'https://www.w3.org/ns/activitystreams' profileStr = 'https://www.w3.org/ns/activitystreams'
acceptStr = \ acceptStr = \
'application/activity+json, application/ld+json; ' + \ 'application/activity+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
} }
if '/outbox/' in outboxUrl: if '/outbox/' in outboxUrl:
acceptStr = \ acceptStr = \
'application/ld+json, application/activity+json; ' + \ 'application/ld+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
@ -782,14 +782,14 @@ def _getPostsForBlockedDomains(baseDir: str,
return {} return {}
profileStr = 'https://www.w3.org/ns/activitystreams' profileStr = 'https://www.w3.org/ns/activitystreams'
acceptStr = \ acceptStr = \
'application/activity+json, application/ld+json; ' + \ 'application/activity+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
} }
if '/outbox/' in outboxUrl: if '/outbox/' in outboxUrl:
acceptStr = \ acceptStr = \
'application/ld+json, application/activity+json; ' + \ 'application/ld+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
@ -3988,14 +3988,14 @@ def downloadFollowCollection(signingPrivateKeyPem: str,
prof = 'https://www.w3.org/ns/activitystreams' prof = 'https://www.w3.org/ns/activitystreams'
if '/channel/' not in actor or '/accounts/' not in actor: if '/channel/' not in actor or '/accounts/' not in actor:
acceptStr = \ acceptStr = \
'application/activity+json, application/ld+json; ' + \ 'application/activity+json; ' + \
'profile="' + prof + '"' 'profile="' + prof + '"'
sessionHeaders = { sessionHeaders = {
'Accept': acceptStr 'Accept': acceptStr
} }
else: else:
acceptStr = \ acceptStr = \
'application/ld+json, application/activity+json; ' + \ 'application/ld+json; ' + \
'profile="' + prof + '"' 'profile="' + prof + '"'
sessionHeaders = { sessionHeaders = {
'Accept': acceptStr 'Accept': acceptStr
@ -4344,7 +4344,7 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
else: else:
profileStr = 'https://www.w3.org/ns/activitystreams' profileStr = 'https://www.w3.org/ns/activitystreams'
acceptStr = \ acceptStr = \
'application/activity+json, application/ld+json; ' + \ 'application/activity+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr
@ -4352,7 +4352,7 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
if '/channel/' in postJsonObject['actor'] or \ if '/channel/' in postJsonObject['actor'] or \
'/accounts/' in postJsonObject['actor']: '/accounts/' in postJsonObject['actor']:
acceptStr = \ acceptStr = \
'application/ld+json, application/activity+json; ' + \ 'application/ld+json; ' + \
'profile="' + profileStr + '"' 'profile="' + profileStr + '"'
asHeader = { asHeader = {
'Accept': acceptStr 'Accept': acceptStr

1
webfinger.py
View File

@ -159,7 +159,6 @@ def createWebfingerEndpoint(nickname: str, domain: str, port: int,
profilePageHref = httpPrefix + '://' + domain + \ profilePageHref = httpPrefix + '://' + domain + \
'/about/more?instance_actor=true' '/about/more?instance_actor=true'
actor = localActorUrl(httpPrefix, nickname, domain)
account = { account = {
"aliases": [ "aliases": [
httpPrefix + "://" + domain + "/@" + personName, httpPrefix + "://" + domain + "/@" + personName,