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

Remove carriage return

master
Bob Mottram 2019-08-07 17:57:27 +01:00
parent 7f10e62e17
commit 5cd34b452e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manualapprove.py
View File

@ -61,17 +61,18 @@ def manualApproveFollowRequest(session,baseDir: str, \
with open(approveFollowsFilename, 'r') as approvefile: with open(approveFollowsFilename, 'r') as approvefile:
for handle in approvefile: for handle in approvefile:
if handle.startswith(approveHandle): if handle.startswith(approveHandle):
handle=handle.replace('\n','')
print('Test5: '+handle) print('Test5: '+handle)
port2=port port2=port
if ':' in handle: if ':' in handle:
port2=int(handle.split(':')[1].replace('\n','')) port2=int(handle.split(':')[1])
requestsDir=accountsDir+'/requests' requestsDir=accountsDir+'/requests'
followActivityfilename=requestsDir+'/'+handle+'.follow' followActivityfilename=requestsDir+'/'+handle+'.follow'
print('Test6: '+followActivityfilename) print('Test6: '+followActivityfilename)
if os.path.isfile(followActivityfilename): if os.path.isfile(followActivityfilename):
print('Test6') print('Test7')
with open(followActivityfilename, 'r') as fp: with open(followActivityfilename, 'r') as fp:
print('Test7') print('Test8')
followJson=commentjson.load(fp) followJson=commentjson.load(fp)
approveNickname=approveHandle.split('@')[0] approveNickname=approveHandle.split('@')[0]
approveDomain=approveHandle.split('@')[1].replace('\n','') approveDomain=approveHandle.split('@')[1].replace('\n','')
@ -79,7 +80,7 @@ def manualApproveFollowRequest(session,baseDir: str, \
if ':' in approveDomain: if ':' in approveDomain:
approvePort=approveDomain.split(':')[1] approvePort=approveDomain.split(':')[1]
approveDomain=approveDomain.split(':')[0] approveDomain=approveDomain.split(':')[0]
print('Test8: '+approveNickname+' '+approveDomain+' '+approvePort+' '+followJson['actor']) print('Test9: '+approveNickname+' '+approveDomain+' '+approvePort+' '+followJson['actor'])
followedAccountAccepts(session,baseDir,httpPrefix, \ followedAccountAccepts(session,baseDir,httpPrefix, \
nickname,domain,port, \ nickname,domain,port, \
approveNickname,approveDomain,approvePort, \ approveNickname,approveDomain,approvePort, \
@ -88,7 +89,7 @@ def manualApproveFollowRequest(session,baseDir: str, \
sendThreads,postLog, \ sendThreads,postLog, \
cachedWebfingers,personCache, \ cachedWebfingers,personCache, \
debug) debug)
print("Test9") print("Test10")
os.remove(followActivityfilename) os.remove(followActivityfilename)
else: else:
approvefilenew.write(handle) approvefilenew.write(handle)