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

Tidying

master
Bob Mottram 2019-06-28 20:36:39 +01:00
parent 9c2859b616
commit 7e99a5907f
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epicyon.py
View File

@ -28,8 +28,6 @@ runDaemon('mydomain.com',6227,False)
#testHttpsig() #testHttpsig()
#sys.exit() #sys.exit()
privateKeyPem,publicKeyPem,person,wfEndpoint=createPerson('testuser','mydomain.com',True,True)
sys.exit()
#pprint(person) #pprint(person)
#print('\n') #print('\n')
#pprint(wfEndpoint) #pprint(wfEndpoint)

19
posts.py
View File

@ -36,13 +36,8 @@ def getUserUrl(wfRequest) -> str:
return link['href'] return link['href']
return None return None
def parseUserFeed(feedUrl,asHeader) -> None: def parseUserFeed(session,feedUrl,asHeader) -> None:
session = requests.session() feed = getJson(session,feedUrl,asHeader,None)
session.proxies = {}
headers=asHeader
headers['User-agent'] = "HotJava/1.1.2 FCS"
session.cookies.clear()
feed = session.get(feedUrl, headers=asHeader).json()
if 'orderedItems' in feed: if 'orderedItems' in feed:
for item in feed['orderedItems']: for item in feed['orderedItems']:
@ -55,7 +50,7 @@ def parseUserFeed(feedUrl,asHeader) -> None:
nextUrl = feed['next'] nextUrl = feed['next']
if nextUrl: if nextUrl:
for item in parseUserFeed(nextUrl,asHeader): for item in parseUserFeed(session,nextUrl,asHeader):
yield item yield item
def getUserPosts(session,wfRequest,maxPosts,maxMentions,maxEmoji,maxAttachments,allowedDomains) -> {}: def getUserPosts(session,wfRequest,maxPosts,maxMentions,maxEmoji,maxAttachments,allowedDomains) -> {}:
@ -70,7 +65,7 @@ def getUserPosts(session,wfRequest,maxPosts,maxMentions,maxEmoji,maxAttachments,
feedUrl = userJson['outbox'] feedUrl = userJson['outbox']
i = 0 i = 0
for item in parseUserFeed(feedUrl,asHeader): for item in parseUserFeed(session,feedUrl,asHeader):
if not item.get('type'): if not item.get('type'):
continue continue
if item['type'] != 'Create': if item['type'] != 'Create':
@ -206,9 +201,3 @@ def createPublicPost(username: str, domain: str, https: bool, content: str, foll
} }
} }
return newPost return newPost
def postToInbox(session,postJson,inboxUrl: str):
"""Post a json message to the inbox of another person
"""
postResult = session.post(url = inboxUrl, data = postJson)
return postResult.text

6
session.py
View File

@ -27,3 +27,9 @@ def getJson(session,url: str,headers,params):
sessionHeaders['User-agent'] = "HotJava/1.1.2 FCS" sessionHeaders['User-agent'] = "HotJava/1.1.2 FCS"
session.cookies.clear() session.cookies.clear()
return session.get(url, headers=sessionHeaders, params=sessionParams).json() return session.get(url, headers=sessionHeaders, params=sessionParams).json()
def postJson(session,postJson,inboxUrl: str):
"""Post a json message to the inbox of another person
"""
postResult = session.post(url = inboxUrl, data = postJson)
return postResult.text