2
0
mirror of https://github.com/ComradCollective/Comrad synced 2024-11-05 21:20:51 +00:00
This commit is contained in:
quadrismegistus 2020-09-16 14:38:15 +01:00
parent 790200c8d9
commit bb1064b250
2 changed files with 7 additions and 3 deletions

View File

@ -544,9 +544,9 @@ from_komrade = {from_komrade}
qr_str = self.qr_str(meet_from_uri)
if returning:
txt=f'''Komrade @{meet_from_name} has agreed to make your acquaintance.\n\nTheir public key is:\n{meet_from_uri.decode()}.\n {qr_str}'''
txt=f'''Komrade @{meet_from_name} has agreed to make your acquaintance.\n\nTheir public key is:\n{meet_from_uri.decode()}.'''
else:
txt=f'''Komrade @{meet_from_name} would like to make your acquaintance.\n\nTheir public key is:\n{meet_from_uri.decode()}.\n {qr_str}'''
txt=f'''Komrade @{meet_from_name} would like to make your acquaintance.\n\nTheir public key is:\n{meet_from_uri.decode()}.'''
msg_from_op = Message(
msg_d = {

View File

@ -215,7 +215,11 @@ class CLI(Logger):
def meet(self,dat,returning=False):
if self.with_required_login():
name_or_pubkey = dat.strip().split()[0]
datl=dat.strip().split()
if not datl:
self.stat('Meet whom?')
return
name_or_pubkey = datl[0]
res = self.komrade.meet(name_or_pubkey,returning=returning)
status=res.get('status')
#msg = status if not res.get('success') else status+str(res)