Different actor format

master
Bob Mottram 2019-08-24 10:51:29 +01:00
parent 464f4f0790
commit 4eaaa186a1
1 changed files with 17 additions and 10 deletions

View File

@ -803,16 +803,23 @@ if args.dat:
httpPrefix='dat' httpPrefix='dat'
if args.actor: if args.actor:
if '@' not in args.actor: if '/@' in args.actor or '/users/' in args.actor or args.actor.startswith('http') or args.actor.startswith('dat'):
print('Syntax: --actor nickname@domain') # format: https://domain/@nick
sys.exit() args.actor=args.actor.replace('https://','').replace('http://','').replace('dat://','').replace('/@','/users/')
if args.actor.startswith('@'): nickname=args.actor.split('/users/')[1].replace('\n','')
args.actor=args.actor[1:] domain=args.actor.split('/users/')[0]
if '@' not in args.actor: else:
print('Syntax: --actor nickname@domain') # format: @nick@domain
sys.exit() if '@' not in args.actor:
nickname=args.actor.split('@')[0] print('Syntax: --actor nickname@domain')
domain=args.actor.split('@')[1].replace('\n','') sys.exit()
if args.actor.startswith('@'):
args.actor=args.actor[1:]
if '@' not in args.actor:
print('Syntax: --actor nickname@domain')
sys.exit()
nickname=args.actor.split('@')[0]
domain=args.actor.split('@')[1].replace('\n','')
wfCache={} wfCache={}
if args.http or domain.endswith('.onion'): if args.http or domain.endswith('.onion'):
httpPrefix='http' httpPrefix='http'