updates

komrade/backend/komrades.py

@@ -305,7 +305,9 @@ class KomradeX(Caller):
         # enclosing
         msg_to_op = {
             'deliver_from':self.pubkey.data_b64,
+            'deliver_from_name':self.name,
             'deliver_to':someone.pubkey.data_b64,
+            'deliver_to_name':someone.name,
             'deliver_msg':direct_msg_data,
         }
 
@@ -391,18 +393,37 @@ class KomradeX(Caller):
         
 
         # it should be twice decrypted
-        msg_op2me = Message(
-            from_whom=Komrade('bez'),
+        msg_op2me_obj = Message(
+            from_whom=self.op,
             to_whom=self,
             msg=post_encr
         )
-        self.log('assuming this is the message:',msg_op2me)
+        self.log('assuming this is the message:',msg_op2me_obj)
 
         # decrypt
-        msg_op2me.decrypt()
+        msg_op2me_obj.decrypt()
 
-        self.log('msg_op2me is now')
-        return msg_op2me
+        # dict to/from/msg
+        msg_op2me = msg_op2me_obj.msg.msg_d
+        self.log('msg_op2me is now',msg_op2me)
+
+        # this really to me?
+        assert msg_op2me.get('to') == self.uri
+
+        # now try to decrypt?
+        msg2me = Message(
+            to_whom=self,
+            msg_d={
+                'from':msg_op2me.get('from'),
+                'msg': msg_op2me.get('msg')
+            }
+        )
+        # self.log('msg2me is now v1',msg2me)
+        msg2me.decrypt()
+        self.log('msg2me is now v2',msg2me.msg)
+
+
+        return msg2me
 
     
     def download_msgs(self,post_ids=[],inbox=None):

komrade/backend/the_operator.py

@@ -351,13 +351,19 @@ from_komrade = {from_komrade}
         msg_from_op = Message(
             from_whom=self,
             msg_d = {
-                'to':deliver_to,
+                'to':data.get('deliver_to'),
+                'to_name':data.get('deliver_to_name'),
+                
                 'msg':{
-                    'to':deliver_to,
-                    'from':deliver_from,
-                    'msg':deliver_msg,
-                    'status':'Someone (marked "from") would like to send you (marked "to") this message (marked "msg").'
-                }
+                    
+                    'to':data.get('deliver_to'),
+                    'to_name':data.get('deliver_to_name'),
+                    'from':data.get('deliver_from'),
+                    'from_name':data.get('deliver_from_name'),
+                    'msg':data.get('deliver_msg'),
+                },
+
+                'note':'Someone (marked "from") would like to send you (marked "to") this message (marked "msg").'
             }
         )