updates

komrade/backend/messages.py

@@ -146,7 +146,7 @@ class Message(Logger):
             self.msg = Message(decr_msg)
         
         # for now this should be rolled out individually ,like an onion
-        # ring_ring on client -> route_msg on server
+        # ring_ring on client -> pronto_pronto on server
         # so we don't need or want to decrypt all at once
         if recursive:
             self.msg.decrypt()

komrade/backend/operators.py

@@ -96,6 +96,9 @@ class Operator(Keymaker):
 
         return msg_obj
 
+    # def compose_reply(self,msg,another):
+
+
     def seal_msg(self,msg_d):
         # make sure encrypted
         self.log('sealing msg!:',dict_format(msg_d))
@@ -180,7 +183,7 @@ class Operator(Keymaker):
             return func(**data)
         
     
-    def route_msg(self, msg_obj):
+    def pronto_pronto(self, msg_obj):
         self.log(f'''
         >> {msg_obj}
         ''')
@@ -201,19 +204,23 @@ class Operator(Keymaker):
             # whew, then we can make someone else take the phone
             self.log(f'passing msg onto {embedded_recipient} ...')
             
-            response = embedded_recipient.route_msg(embedded_msg) 
+            response = embedded_recipient.pronto_pronto(embedded_msg) 
             self.log(f'passed msg onto {embedded_recipient}, got this response: {response} ...')
         # otherwise what are we doing?
         else: 
             raise KomradeException('No route, no embedded msg. What to do?')
         
         # set this to be the new msg
-        msg_obj.msg = msg_obj.msg_d['_msg'] = response
-        self.log('what msg_obj looks like now:',msg_obj)
-
-        # invert who's sending to whom!
-        msg_obj.mark_return_to_sender()
-
+        #msg_obj.msg = msg_obj.msg_d['_msg'] = response
+        #self.log('what msg_obj looks like now:',msg_obj)
+
+        # send new content back
+        resp_msg_obj = msg_obj.to_whom.compose_msg_to(
+            response,
+            msg_obj.from_whom
+        )
+        self.log('resp_msg_obj',resp_msg_obj)
+        
         # re-encrypt
         msg_obj.encrypt()
         self.log(f're-encrypted: {msg_obj}')

komrade/backend/the_operator.py

@@ -66,15 +66,9 @@ class TheOperator(Operator):
         self.log(f'Operator understood message: {msg_obj} {msg_obj.route}')
         
         # carry out message instructions
-        resp_msg_obj = self.route_msg(msg_obj) #,route=msg_obj.route)
+        resp_msg_obj = self.pronto_pronto(msg_obj) #,route=msg_obj.route)
         self.log('route_result <-',resp_msg_obj)
 
-        # should be encrypted already
-        assert resp_msg_obj.is_encrypted
-        # it should be pointing back from me to the telephone
-        assert resp_msg_obj.callee.pubkey==self.phone.pubkey
-        assert resp_msg_obj.caller.pubkey==self.pubkey
-        
         # send back down encrypted
         msg_sealed = self.seal_msg(resp_msg_obj.msg_d)