From 71c10ec1aee3d730422f7a8c9aaa271c5e262485 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Fri, 18 Sep 2020 07:36:12 +0100
Subject: [PATCH] komrade update!

---
 komrade/backend/komrades.py     |  2 +-
 komrade/backend/the_operator.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py
index 9dd7bd0..9cdc752 100644
--- a/komrade/backend/komrades.py
+++ b/komrade/backend/komrades.py
@@ -616,7 +616,7 @@ class KomradeX(Caller):
             self.log('!?!?',self.name,self.uri,post_id,'\n',self.privkey)
             msg_from_op_b = SMessage(
                 self.privkey.data,
-                Komrade(WORLD_NAME).pubkey.data
+                self.op.pubkey.data
             ).unwrap(msg_from_op_b_encr)
             self.log('decrypted??',msg_from_op_b)
         except (ThemisError,TypeError) as e:
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index df8f2ec..93c9f2e 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -655,13 +655,13 @@ class TheOperator(Operator):
         world=Komrade(WORLD_NAME)
 
         # (1) get inbox
-        inbox_obj=self.get_inbox_crypt(uri=world.uri)
+        inbox_obj=world.get_inbox_crypt()
         self.log('<-- inbox crypt',inbox_obj)
         inbox=inbox_obj.values
         self.log('<-- inbox crypt values',inbox)
 
         # (2) get msgs
-        res_msgs = self.get_msgs(inbox)
+        res_msgs = world.get_msgs(inbox)
         self.log('res_msgs =',res_msgs)
         if not res_msgs.get('success'):
             return {
@@ -796,11 +796,11 @@ class TheOperator(Operator):
         else:
             txt=f'''Komrade @{meet_from_name} would like to make your acquaintance.\n\nTheir public key is:\n{meet_from_uri.decode()}.'''
 
-        txt_encr = SMessage(
-            self.privkey.data,
-            b64dec(meet_uri)
-        ).wrap(txt)
-        self.log('txt -> encr',txt,txt_encr)
+        # txt_encr = SMessage(
+        #     self.privkey.data,
+        #     b64dec(meet_uri)
+        # ).wrap(txt)
+        # self.log('txt -> encr',txt,txt_encr)
         
         deliver_msg_d={
             'to':meet_uri,
@@ -809,7 +809,7 @@ class TheOperator(Operator):
             'from':self.uri,
             'from_name':self.name,
             
-            'msg':txt_encr,
+            'msg':txt,
 
             'type':'prompt',
             'prompt_id':'addcontact'