diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index 80afdef..d309029 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -151,8 +151,9 @@ class Operator(Keymaker): def route_msg(self,msg_obj): # decrypt - if msg_obj.is_encrypted: - msg_obj.decrypt() + self.log('got msg_obj!',msg_obj) + # if msg_obj.is_encrypted: + # msg_obj.decrypt() # are there instructions for us? if msg_obj.route: # get result from routing @@ -163,19 +164,26 @@ class Operator(Keymaker): elif msg_obj.has_embedded_msg: embedded_msg = msg_obj.msg embedded_recipient = embedded_msg.to_whom + # whew, then we can make someone else take the phone self.log(f'passing msg onto {embedded_recipient} ...') - response = embedded_recipient.route_msg(embedded_msg) + # from komrade.backend.messages import Message # if response and type(response)==Message: # response = response.msg_d + self.log(f'passed msg onto {embedded_recipient}, got this response: {response} ...') + # otherwise what are we doing? else: response = msg_obj + + # turn msg back around? + resp_msg_obj = + # ??? - return response + # return response diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index ff939f5..700acd7 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -88,34 +88,6 @@ class TheOperator(Operator): return encr_data_b - # def route(self, msg_obj): - # if not msg_obj.route: - # # nothign explicitly requested yet? - # # can we pass the msg on? - # if msg_obj.has_embedded_msg: - - # self.route(msg_obj, route=msg_obj) - - # # self.log('my messages:',msg_obj.messages) - - - - # if not route: raise KomradeException('no route!') - - # # what we working with? - # self.log(f'route() got incoming msg data = {data} and route = {route}') - - # ## hard code the acceptable routes - # if route == 'forge_new_keys': - # return self.forge_new_keys(data) - # elif route == 'does_username_exist': - # return self.does_username_exist(data) - - # # otherwise, hang up and try again - # return OPERATOR_INTERCEPT_MESSAGE - - - ### ROUTES diff --git a/komrade/utils.py b/komrade/utils.py index 310303a..2cf592e 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -40,7 +40,8 @@ def dict_format(d, tab=0): else: v = repr(v) - s.append('%s%r: %s (%s),\n' % (' '*tab, k, v, type(v).__name__)) + # s.append('%s%r: %s (%s),\n' % (' '*tab, k, v, type(v).__name__)) + s.append('%s%r: %s,\n' % (' '*tab, k, v) s.append('%s}' % (' '*tab)) return ''.join(s)