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

Block and unblock via c2s

master
Bob Mottram 2019-07-17 23:09:09 +01:00
parent 1e6bf28001
commit 21dc5ea802
2 changed files with 65 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blocking.py
View File

@ -124,11 +124,11 @@ def sendBlockViaServer(session,fromNickname: str,password: str,
return newBlockJson return newBlockJson
def sendUnblockViaServer(session,fromNickname: str,password: str, def sendUndoBlockViaServer(session,fromNickname: str,password: str,
fromDomain: str,fromPort: int, \ fromDomain: str,fromPort: int, \
httpPrefix: str,blockedUrl: str, \ httpPrefix: str,blockedUrl: str, \
cachedWebfingers: {},personCache: {}, \ cachedWebfingers: {},personCache: {}, \
debug: bool) -> {}: debug: bool) -> {}:
"""Creates a block via c2s """Creates a block via c2s
""" """
if not session: if not session:

72
epicyon.py
View File

@ -65,6 +65,8 @@ from media import archiveMedia
from delete import sendDeleteViaServer from delete import sendDeleteViaServer
from like import sendLikeViaServer from like import sendLikeViaServer
from like import sendUndoLikeViaServer from like import sendUndoLikeViaServer
from blocking import sendBlockViaServer
from blocking import sendUndoBlockViaServer
import argparse import argparse
def str2bool(v): def str2bool(v):
@ -766,25 +768,71 @@ if not os.path.isdir(baseDir+'/accounts/'+nickname+'@'+domain):
createPerson(baseDir,nickname,domain,port,httpPrefix,True,adminPassword) createPerson(baseDir,nickname,domain,port,httpPrefix,True,adminPassword)
if args.block: if args.block:
if not args.nickname: if not nickname:
print('Please specify a nickname') print('Specify a nickname with the --nickname option')
sys.exit() sys.exit()
if '@' not in args.block:
print('syntax: --block nickname@domain') if not args.password:
print('Specify a password with the --password option')
sys.exit() sys.exit()
if addBlock(baseDir,args.nickname,domain,args.block.split('@')[0],args.block.split('@')[1].replace('\n','')):
print(args.block+' is blocked by '+args.nickname) if '@' in args.block:
blockedDomain=args.block.split('@')[1].replace('\n','')
blockedNickname=args.block.split('@')[0]
blockedActor=httpPrefix+'://'+blockedDomain+'/users/'+blockedNickname
args.block=blockedActor
else:
if '/users/' not in args.block:
print(args.block+' does not look like an actor url')
sys.exit()
session = createSession(domain,port,useTor)
personCache={}
cachedWebfingers={}
print('Sending block of '+args.block)
sendBlockViaServer(session,nickname,args.password,
domain,port, \
httpPrefix,args.block, \
cachedWebfingers,personCache, \
True)
for i in range(10):
# TODO detect send success/fail
time.sleep(1)
sys.exit() sys.exit()
if args.unblock: if args.unblock:
if not args.nickname: if not nickname:
print('Please specify a nickname') print('Specify a nickname with the --nickname option')
sys.exit() sys.exit()
if '@' not in args.block:
print('syntax: --unblock nickname@domain') if not args.password:
print('Specify a password with the --password option')
sys.exit() sys.exit()
if removeBlock(baseDir,args.nickname,domain,args.block.split('@')[0],args.block.split('@')[1].replace('\n','')):
print('The block on '+args.block+' was removed by '+args.nickname) if '@' in args.unblock:
blockedDomain=args.unblock.split('@')[1].replace('\n','')
blockedNickname=args.unblock.split('@')[0]
blockedActor=httpPrefix+'://'+blockedDomain+'/users/'+blockedNickname
args.unblock=blockedActor
else:
if '/users/' not in args.unblock:
print(args.unblock+' does not look like an actor url')
sys.exit()
session = createSession(domain,port,useTor)
personCache={}
cachedWebfingers={}
print('Sending undo block of '+args.unblock)
sendUndoBlockViaServer(session,nickname,args.password,
domain,port, \
httpPrefix,args.unblock, \
cachedWebfingers,personCache, \
True)
for i in range(10):
# TODO detect send success/fail
time.sleep(1)
sys.exit() sys.exit()
if args.filterStr: if args.filterStr: