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

Get actor from path

main
Bob Mottram 2019-11-14 21:09:36 +00:00
parent 2835559d3e
commit b87e752d3b
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
daemon.py
View File

@ -1382,6 +1382,9 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.useTor) createSession(self.server.useTor)
self.server.actorRepeat=self.path.split('?actor=')[1]
if '?' in self.server.actorRepeat:
self.server.actorRepeat=self.server.actorRepeat.split('?')[0]
announceJson= \ announceJson= \
createAnnounce(self.server.session, \ createAnnounce(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
@ -1397,7 +1400,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.cachedWebfingers, \ self.server.cachedWebfingers, \
self.server.debug, \ self.server.debug, \
self.server.projectVersion) self.server.projectVersion)
if announceJson: if announceJson:
self._postToOutboxThread(announceJson) self._postToOutboxThread(announceJson)
self.server.GETbusy=False self.server.GETbusy=False
self._redirect_headers(actor+'/'+timelineStr+'?page='+ \ self._redirect_headers(actor+'/'+timelineStr+'?page='+ \
@ -1432,6 +1435,9 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.useTor) createSession(self.server.useTor)
self.server.actorRepeat=self.path.split('?actor=')[1]
if '?' in self.server.actorRepeat:
self.server.actorRepeat=self.server.actorRepeat.split('?')[0]
undoAnnounceActor= \ undoAnnounceActor= \
self.server.httpPrefix+'://'+self.server.domainFull+ \ self.server.httpPrefix+'://'+self.server.domainFull+ \
'/users/'+self.postToNickname '/users/'+self.postToNickname
@ -1541,13 +1547,16 @@ class PubServer(BaseHTTPRequestHandler):
likeActor= \ likeActor= \
self.server.httpPrefix+'://'+ \ self.server.httpPrefix+'://'+ \
self.server.domainFull+'/users/'+self.postToNickname self.server.domainFull+'/users/'+self.postToNickname
self.server.actorLiked=self.path.split('?actor=')[1]
if '?' in self.server.actorLiked:
self.server.actorLiked=self.server.actorLiked.split('?')[0]
likeJson= { likeJson= {
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
'type': 'Like', 'type': 'Like',
'actor': likeActor, 'actor': likeActor,
'object': likeUrl 'object': likeUrl
} }
self._postToOutboxThread(likeJson) self._postToOutbox(likeJson)
self.server.GETbusy=False self.server.GETbusy=False
self._redirect_headers(actor+'/'+timelineStr+ \ self._redirect_headers(actor+'/'+timelineStr+ \
'?page='+str(pageNumber),cookie) '?page='+str(pageNumber),cookie)
@ -1594,7 +1603,10 @@ class PubServer(BaseHTTPRequestHandler):
'object': likeUrl 'object': likeUrl
} }
} }
self._postToOutboxThread(undoLikeJson) self.server.actorLiked=self.path.split('?actor=')[1]
if '?' in self.server.actorLiked:
self.server.actorLiked=self.server.actorLiked.split('?')[0]
self._postToOutbox(undoLikeJson)
self.server.GETbusy=False self.server.GETbusy=False
self._redirect_headers(actor+'/'+timelineStr+ \ self._redirect_headers(actor+'/'+timelineStr+ \
'?page='+str(pageNumber),cookie) '?page='+str(pageNumber),cookie)
@ -1656,6 +1668,7 @@ class PubServer(BaseHTTPRequestHandler):
replyToList=[] replyToList=[]
replyPageNumber=1 replyPageNumber=1
shareDescription=None shareDescription=None
replytoActor=None
if htmlGET: if htmlGET:
# public reply # public reply
if '?replyto=' in self.path: if '?replyto=' in self.path:
@ -1671,6 +1684,8 @@ class PubServer(BaseHTTPRequestHandler):
replyPageStr=m.replace('page=','') replyPageStr=m.replace('page=','')
if replyPageStr.isdigit(): if replyPageStr.isdigit():
replyPageNumber=int(replyPageStr) replyPageNumber=int(replyPageStr)
if m.startswith('actor='):
replytoActor=m.replace('actor=','')
inReplyToUrl=mentionsList[0] inReplyToUrl=mentionsList[0]
self.path=self.path.split('?replyto=')[0]+'/newpost' self.path=self.path.split('?replyto=')[0]+'/newpost'
if self.server.debug: if self.server.debug:
@ -1690,6 +1705,8 @@ class PubServer(BaseHTTPRequestHandler):
replyPageStr=m.replace('page=','') replyPageStr=m.replace('page=','')
if replyPageStr.isdigit(): if replyPageStr.isdigit():
replyPageNumber=int(replyPageStr) replyPageNumber=int(replyPageStr)
if m.startswith('actor='):
replytoActor=m.replace('actor=','')
inReplyToUrl=mentionsList[0] inReplyToUrl=mentionsList[0]
self.path=self.path.split('?replyfollowers=')[0]+'/newfollowers' self.path=self.path.split('?replyfollowers=')[0]+'/newfollowers'
if self.server.debug: if self.server.debug:
@ -1709,6 +1726,8 @@ class PubServer(BaseHTTPRequestHandler):
replyPageStr=m.replace('page=','') replyPageStr=m.replace('page=','')
if replyPageStr.isdigit(): if replyPageStr.isdigit():
replyPageNumber=int(replyPageStr) replyPageNumber=int(replyPageStr)
if m.startswith('actor='):
replytoActor=m.replace('actor=','')
inReplyToUrl=mentionsList[0] inReplyToUrl=mentionsList[0]
if inReplyToUrl.startswith('sharedesc:'): if inReplyToUrl.startswith('sharedesc:'):
shareDescription= \ shareDescription= \