From da9ab32cd4df892562e100daafd117b7b34fc04a Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Thu, 17 Sep 2020 06:25:59 +0100 Subject: [PATCH] komrade update! --- komrade/backend/komrades.py | 12 +++++++----- komrade/backend/the_operator.py | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index 592519d..5ed0c40 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -327,11 +327,13 @@ class KomradeX(Caller): # make dict (do not use normal msg_d key names!) post_d = { - 'deliver_from':self.uri, - 'deliver_from_name':self.name, - 'deliver_to_name':to_name, - 'deliver_to':to_komrade.uri, - 'deliver_msg':something_encr + 'post':{ + 'from':self.uri, + 'from_name':self.name, + 'to_name':to_name, + 'to':to_komrade.uri, + 'msg':something_encr + } } self.log('post_d =',post_d) # enclose as message to operator diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index ea7af3e..5854d1a 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -334,7 +334,8 @@ class TheOperator(Operator): def post(self,msg_to_op): self.log('post <-',msg_to_op.msg_d) - post_d = msg_to_op.msg_d + self.log('post data <-',msg_to_op.data) + post_d = msg_to_op.data.get('post') # normally we'd deliver it to the person # but here we need to deliver it to... @@ -375,7 +376,7 @@ class TheOperator(Operator): } } ) - self.log(f'prepared msg for {contact}: {msg_from_op.msg_d}') + self.log(f'prepared msg for {contact}: {msg_from_op.msg}') # encrypt msg_from_op.encrypt()