From bb1064b250153c4c24de54291ace23138ca7c087 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Wed, 16 Sep 2020 14:38:15 +0100 Subject: [PATCH] updates --- komrade/backend/the_operator.py | 4 ++-- komrade/cli/cli.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index e124515..3eb1c1f 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -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 = { diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index e5f81cc..9fa4ace 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -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)