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

Announce option

master
Bob Mottram 2019-07-16 21:08:30 +01:00
parent a819c4ae57
commit 930cd963f8
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
epicyon.py
View File

@ -159,6 +159,8 @@ parser.add_argument('--maxposts', dest='archiveMaxPosts', type=str,default=None,
help='Maximum number of posts in in/outbox') help='Maximum number of posts in in/outbox')
parser.add_argument('--message', dest='message', type=str,default=None, \ parser.add_argument('--message', dest='message', type=str,default=None, \
help='Message content') help='Message content')
parser.add_argument('--repeat','--announce', dest='announce', type=str,default=None, \
help='Announce/repeat a url')
parser.add_argument('--sendto', nargs='+',dest='sendto', \ parser.add_argument('--sendto', nargs='+',dest='sendto', \
help='List of post recipients') help='List of post recipients')
parser.add_argument('--attach', dest='attach', type=str,default=None, \ parser.add_argument('--attach', dest='attach', type=str,default=None, \
@ -214,8 +216,8 @@ if args.tests:
if args.testsnetwork: if args.testsnetwork:
print('Network Tests') print('Network Tests')
#testPostMessageBetweenServers() testPostMessageBetweenServers()
#testFollowBetweenServers() testFollowBetweenServers()
testClientToServer() testClientToServer()
sys.exit() sys.exit()
@ -294,9 +296,6 @@ if args.message:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
if not os.path.isdir(baseDir+'/accounts/'+nickname+'@'+domain):
print(nickname+' is not an account on the system. use --addaccount if necessary.')
sys.exit()
session = createSession(domain,port,useTor) session = createSession(domain,port,useTor)
if not args.sendto: if not args.sendto:
print('Specify an account to sent to: --sendto [nickname@domain]') print('Specify an account to sent to: --sendto [nickname@domain]')
@ -338,7 +337,31 @@ if args.message:
# TODO detect send success/fail # TODO detect send success/fail
time.sleep(1) time.sleep(1)
sys.exit() sys.exit()
if args.announce:
if not nickname:
print('Specify a nickname with the --nickname option')
sys.exit()
if not args.password:
print('Specify a password with the --password option')
sys.exit()
session = createSession(domain,port,useTor)
personCache={}
cachedWebfingers={}
print('Sending announce/repeat of '+args.announce)
sendAnnounceViaServer(session,nickname,args.password,
domain,port, \
httpPrefix,args.announce, \
cachedWebfingers,personCache, \
True)
for i in range(10):
# TODO detect send success/fail
time.sleep(1)
sys.exit()
if args.follow and nickname: if args.follow and nickname:
if not os.path.isdir(baseDir+'/accounts/'+nickname+'@'+domain): if not os.path.isdir(baseDir+'/accounts/'+nickname+'@'+domain):
print(nickname+' is not an account on the system. use --addaccount if necessary.') print(nickname+' is not an account on the system. use --addaccount if necessary.')