From f1b1f2ec9972197ae4ef94b1ecb4558d165559d2 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sat, 12 Sep 2020 22:01:59 +0100 Subject: [PATCH] updates --- komrade/backend/messages.py | 8 ++++++-- komrade/utils.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py index 059866d..2a0dc26 100644 --- a/komrade/backend/messages.py +++ b/komrade/backend/messages.py @@ -40,6 +40,10 @@ class Message(Logger): self.from_name=self.from_whom.name if not self.to_name: self.to_name=self.to_whom.name + if not self.to_pub: + self.to_pub=self.to_whom.pubkey.data + if not self.from_pub: + self.from_pub=self.from_whom.pubkey.data def __repr__(self): msg_d_str=dict_format(self.msg_d,tab=6) @@ -49,10 +53,10 @@ class Message(Logger): msg=self.msg return f""" from: {self.from_name} - ({self.from_pubkey}) + ({self.from_pubkey.decode()}) to: {self.to_name} - ({self.to_pubkey}) + ({self.to_pubkey.decode()}) msg: {msg} """ diff --git a/komrade/utils.py b/komrade/utils.py index 8e951cf..f0e68cc 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -42,7 +42,7 @@ def dict_format(d, tab=0): if not isBase64(v): v=b64encode(v) v=v.decode() - v='\n'.join(tw.wrap(v,10)) + # v='\n'.join(tw.wrap(v,10)) return v s = ['{\n\n']