From b74b398aab4ea101f0aaddc14f8500b244b419be Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Tue, 15 Sep 2020 15:05:33 +0100 Subject: [PATCH] updates --- komrade/backend/komrades.py | 3 +++ komrade/backend/the_operator.py | 2 +- komrade/cli/cli.py | 7 ++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index 3390c89..5219257 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -383,6 +383,9 @@ class KomradeX(Caller): '/inbox/' ) + def delete_msg(self,post_id): + return self.delete_msgs([post_id]) + def delete_msgs(self,post_ids): inbox_ids = self.get_inbox_ids().get('inbox',[]) for post_id in post_ids: diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index 50b1cb9..a163901 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -551,7 +551,7 @@ from_komrade = {from_komrade} 'msg':{ - 'txt':f''''Komrade @{meet_name} would like to make your acquaintance. Their public key is {meet_uri}. Their QRcode is:\n{self.qr_str(meet_pubkey)}.''', + 'txt':f'''Komrade @{meet_name} would like to make your acquaintance. Their public key is {meet_uri.decode()}.''', 'type':'prompt', 'prompt_id':'addcontact', 'meet_name':meet_from_name, diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index da6b64d..36e94a6 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -194,10 +194,11 @@ class CLI(Logger): do_senduser = input(f'''\n\nSend this user your public key as well? [y/N]\n{self.komrade}: ''') if do_adduser.strip().lower()=='y': - self.komrade.save_uri_as_qrcode( + fnfn = self.komrade.save_uri_as_qrcode( meet_uri, meet_name ) + print(f'@Operator: The public key of @{meet_name} has been saved as a QRcode to {fnfn}. Text version: {self.komrade.qr_str(meet_uri)}') if do_senduser: print('working on it ...') @@ -232,8 +233,8 @@ class CLI(Logger): # print('DATA',msg.msg_d) if msg.data.get('prompt_id')=='addcontact': self.prompt_adduser(msg) - else: - do_pause() + + self.propmt_msg() clear_screen() self.help()