From 067636c8af143597dfa0635a3801ed119d8a728d Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Thu, 17 Sep 2020 05:42:18 +0100
Subject: [PATCH] komrade update!

---
 komrade/backend/komrades.py     | 28 ++++++++++++++++------------
 komrade/backend/the_operator.py | 27 +++++++--------------------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py
index fb51b99..8ab3490 100644
--- a/komrade/backend/komrades.py
+++ b/komrade/backend/komrades.py
@@ -314,22 +314,26 @@ class KomradeX(Caller):
                 # me -> op
                 # op <- me
             # op -> others
-
-        self.log(to_name,Komrade(to_name))
+        to_komrade = Komrade(to_name)
+        self.log('posting to',to_name,to_komrade,to_komrade.uri)
         # make post data
+        
+
+        # encrypt
+        something_encr = SMessage(
+            self.privkey.data,
+            to_komrade.pubkey.data
+        ).wrap(something)
+
+        # make dict (do not use normal msg_d key names!)
         post_d = {
-            'from':self.uri,
-            'from_name':self.name,
-            'to_name':to_name,
-            'to':Komrade(to_name).uri,
-            'msg':something
+            'post_from':self.uri,
+            'post_from_name':self.name,
+            'post_to_name':to_name,
+            'post_to':to_komrade.uri,
+            'post_msg':something_encr
         }
         self.log('post_d =',post_d)
-
-        # make post into Message
-        post = Message(post_d)
-        post.encrypt()
-
         # enclose as message to operator
         self.ring_ring(
             post_d,
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index 76db35e..67b47a0 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -331,28 +331,15 @@ class TheOperator(Operator):
 
     def post(self,msg_to_op):
         self.log('post <-',msg_to_op.msg_d)
-        data = msg_to_op.data
-        posts_b = data.get('posts_b')
-        self.log('posts_b',posts_b)
-
-        # decode?
-        self.log('posts_b_l',posts_b.split(BSEP))
-
-        posts = pickle.loads(posts_b)
-        self.log('posts unpickled',posts)
-
-        # decrypt?
-        posts_decr = SMessage(
-            self.privkey.data,
-            msg_to_op.msg_d.get('from')
-        )
-        self.log('decrypted posts',posts_decr)
-
+        post_d = msg_to_op.msg_d
+        
+        # normally we'd deliver it to the person
+        # but here we need to deliver it to...
+        # everyone?
 
-        # msg_to_op.decrypt()
-        # self.log('decrypted msg to op',msg_to_op.msg_d)
-        # # decrypt?
+        self.log('contacts =',self.contacts())
 
+        
         return {
             'status':'Hold your horses.',
             'success':False,