updates

komrade/backend/the_operator.py

@@ -524,60 +524,15 @@ from_komrade = {from_komrade}
         
         data=msg_to_op.data
         self.log('Op sees data:',dict_format(data))
-
-
-
         meet_pubkey = self.crypt_keys.get(
             data.get('meet_name'),
             '/pubkey/'
         )
         self.log('found in crypt:',meet_pubkey)
-
-        # msg = Message(
-        #     {
-        #         'to':meet_pubkey,
-        #         'to_name':data.get('meet_name'),
-        #         'from':self.uri,
-        #         'from_name':self.name,
-
-        #         'msg': {
-        #             'type':'introdution',
-
-        #             'status':f'''Komrade {data.get("name")} would like to make your acquaintance. Their public key is {data.get("pubkey")}.''',
-
-        #             'meet_name': data.get('name'),
-
-        #             'meet_pubkey': data.get('pubkey')
-        #         }
-        #     }
-        # )
         meet_name = data.get('meet_name')
-        # enclosed_msg_from_op = Message(
-        #     {
-        #         'to':meet_pubkey,
-        #         'to_name':meet_name,
-        #         'from':self.uri,
-        #         'from_name':self.name,
-        #         'msg':f''''Komrade @{meet_name} would like to make your acquaintance. Their public key is {meet_pubkey}. Their QRcode is:\n{self.qr_str(meet_pubkey)}.''',
-        #         'msg_type':'prompt'
-        #     }
-        # )
-        # self.log('enclosed msg from op:',enclosed_msg_from_op)
-        
-        # ## 
-        # enclosed_msg_from_op.encrypt()
-
-        # ## meta msg from op
-        # msg_from_op=Message(
-        #     {
-        #         'to':meet_pubkey,
-        #         'to_name':meet_name,
-        #         'from':self.uri,
-        #         'from_name':self.name,
-        #         'msg':enclosed_msg_from_op.msg_b,
-        #     }
-        # )
         meet_uri = b64enc(meet_pubkey)
+        meet_from_name = data.get('name')
+        meet_from_uri = data.get('pubkey')
         msg_from_op = Message(
             msg_d = {
                 'to':meet_uri,
@@ -593,8 +548,13 @@ from_komrade = {from_komrade}
 
                     'from':self.uri,
                     'from_name':self.name,
+
+                    'meet_name':meet_from_name,
+                    'meet':meet_from_uri,
                     
                     'msg':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)}.''',
+                    'msg_type':'prompt',
+                    'prompt_id':'addcontact',
                 }
             }
         )

komrade/cli/cli.py

@@ -183,6 +183,21 @@ class CLI(Logger):
                 inb = res.get('inbox',[])
                 print(f'@Operator: You have {len(unr)} unread messages, with {len(inb)} total in your inbox.\n')
 
+    def prompt_adduser(self,msg):
+        do_adduser = input(f'''\n\nAdd this user's public key to your addressbook? [Y/n]\n{self.komrade}: ''')
+        do_senduser = input(f'''\n\nSend this user your public key as well? [Y/n]\n{self.komrade}: ''')
+
+        if do_adduser:
+            meet_name = msg.data.get('meet_name')
+            meet_uri = msg.data.get('meet')
+            self.komrade.save_uri_as_qrcode(
+                meet_uri,
+                meet_name
+            )
+        if do_senduser:
+            print('working on it  ...')
+
+
     def read(self,dat):
         if self.with_required_login():
             res = self.komrade.inbox()
@@ -198,7 +213,11 @@ class CLI(Logger):
                 for i,msg in enumerate(msgs):
                     print(f'@Operator: Showing most recent messages first.\n\n\n  Message {i+1} of {len(msgs)}')
                     print(msg)
-                    do_pause()
+
+                    if msg.data.get('prompt_id')=='addcontact':
+                        self.prompt_adduser(msg)
+                    else:
+                        do_pause()
                     clear_screen()
                 self.help()