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

Tidying

main2
Bob Mottram 2019-10-04 15:15:46 +01:00
parent 80b62314ad
commit 128579f0dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inbox.py
View File

@ -1295,11 +1295,12 @@ def sendToGroupMembers(session,baseDir: str,handle: str,port: int,postJsonObject
if port!=80 and port !=443: if port!=80 and port !=443:
domain=domain+':'+str(port) domain=domain+':'+str(port)
# set sender # set sender
cc='https://www.w3.org/ns/activitystreams#Public'
postJsonObject['actor']=[httpPrefix+'://'+domain+'/users/'+nickname] postJsonObject['actor']=[httpPrefix+'://'+domain+'/users/'+nickname]
postJsonObject['to']=[httpPrefix+'://'+domain+'/users/'+nickname+'/followers'] postJsonObject['to']=[httpPrefix+'://'+domain+'/users/'+nickname+'/followers']
postJsonObject['cc']=[] postJsonObject['cc']=[cc]
postJsonObject['object']['to']=postJsonObject['to'] postJsonObject['object']['to']=postJsonObject['to']
postJsonObject['object']['cc']=postJsonObject['cc'] postJsonObject['object']['cc']=[cc]
# set subject # set subject
if not postJsonObject['object'].get('summary'): if not postJsonObject['object'].get('summary'):
postJsonObject['object']['summary']='General Discussion' postJsonObject['object']['summary']='General Discussion'
@ -1318,8 +1319,7 @@ def sendToGroupMembers(session,baseDir: str,handle: str,port: int,postJsonObject
memberDomain=memberDomain.split(':')[0] memberDomain=memberDomain.split(':')[0]
sendSignedJson(postJsonObject,session,baseDir, \ sendSignedJson(postJsonObject,session,baseDir, \
nickname,domain,port, \ nickname,domain,port, \
memberNickname,memberDomain,memberPort, \ memberNickname,memberDomain,memberPort,cc, \
'https://www.w3.org/ns/activitystreams#Public', \
httpPrefix,False,False,federationList, \ httpPrefix,False,False,federationList, \
sendThreads,postLog,cachedWebfingers, \ sendThreads,postLog,cachedWebfingers, \
personCache,debug,projectVersion) personCache,debug,projectVersion)