updates

komrade/backend/keymaker.py

@@ -145,6 +145,8 @@ class Keymaker(Logger):
     @property
     def pubkey(self): return self.keychain().get('pubkey')
     @property
+    def pubkey_b64(self): return b64encode(self.pubkey) #self.keychain().get('pubkey')
+    @property
     def privkey(self): return self.keychain().get('privkey')
     @property
     def adminkey(self): return self.keychain().get('adminkey')

komrade/backend/messages.py

@@ -35,6 +35,17 @@ class Message(Logger):
         if not self._from_whom or not self._to_whom:
             self.get_whoms()
 
+    def __repr__(self):
+        msg_d_str=dict_format(self.msg_d,tab=6)
+        return f"""    
+<MSG>
+    self.from_whom={self.from_whom}
+    self.to_whom={self.to_whom}
+    self.msg_d={msg_d_str}
+</MSG>
+        """
+
+
     @property
     def data(self):
         md={}
@@ -55,19 +66,7 @@ class Message(Logger):
         if new_msg:
             self.msg=self.msg_d['_msg']=new_msg
 
-    def __repr__(self):
+        
-        msg_d_str=dict_format(self.msg_d,tab=6)
-        return f"""
-    
-    <MSG>
-        self.from_whom={self.from_whom}
-        self.to_whom={self.to_whom}
-        self.msg_d={msg_d_str}
-    </MSG>
-
-        """
-
-
     def get_whom(self,name):
         from komrade.backend.operators import locate_an_operator
         return locate_an_operator(name)

komrade/backend/operators.py

@@ -130,8 +130,9 @@ class Operator(Keymaker):
 
     def __repr__(self):
         clsname=(type(self)).__name__
+        name = clsname+' '+self.name if self.name!=clsname else clsname
         keystr='+'.join(self.top_keys)
-        return f'[{clsname}] {self.name} ({keystr})'
+        return f'{name} [{self.uri}] ({keystr})'
 
     def locate_an_operator(self,name):
         if name == OPERATOR_NAME: