updates

komrade/backend/messages.py

@@ -127,19 +127,16 @@ class Message(Logger):
         self.log(f'attempting to decrypt {self}')
 
         # decrypt msg
-        self.msg = decr_msg_b = SMessage(
+        self.msg = self.msg_d['_msg'] = decr_msg_b = SMessage(
             self.to_whom.privkey,
             self.from_whom.pubkey
         ).unwrap(self.msg)
         self.log('Am I decrypted?',self)
 
         # unpickle        
-        self.msg = decr_msg = pickle.loads(decr_msg_b)
+        self.msg = self.msg_d['_msg'] = decr_msg = pickle.loads(decr_msg_b)
         self.log('unpickled:',self)
 
-        # save to d
-        self.msg_d['_msg'] = decr_msg
-
         # now, is the decrypted message itself a message?
         if is_valid_msg_d(decr_msg):
             self.log('this has a valid msg in its own right!',self)

komrade/backend/operators.py

@@ -221,17 +221,20 @@ class Operator(Keymaker):
         resp_msg_obj = get_resp_from(msg_obj.msg_d)
         self.log('resp_msg_obj <-',resp_msg_obj)
 
+        if resp_msg_obj.is_encrypted:
+            resp_msg_obj.decrypt()
+
         # route back?
-        route_result = self.route_msg(resp_msg_obj)
+        # route_result = self.route_msg(resp_msg_obj)
-        self.log('route_result 2?',route_result)
+        # self.log('route_result 2?',route_result)
 
         # decrypt?
-        from komrade.backend.messages import Message
+        # from komrade.backend.messages import Message
-        if type(route_result)==Message:
+        # if type(route_result)==Message:
-            if route_result.is_encrypted:
+            # if route_result.is_encrypted:
-                route_result.decrypt()
+                # route_result.decrypt()
 
-        return route_result
+        # return route_result
 
 
 

komrade/backend/people.py

@@ -35,6 +35,7 @@ class Persona(Caller):
             'name':self.name
         })
         self.log('answer??',answer)
+        return answer
 
 
     # login?