44
55from . import config
66from . import model
7- from . import utils
87
98import json
109
@@ -39,7 +38,7 @@ def _sub_conn_to_event(name, conn):
3938def _handle_subscribe_request (msg ):
4039 """ handle a request to subscribe to events as a bot"""
4140 for name in msg .dataviews ():
42- name = utils . bytes_to_lower_str ( name )
41+ name = name . decode ( 'utf-8' )
4342 if name in ('all' , '*' ):
4443 # subscribe to all events
4544 for ev in EVENTS :
@@ -82,9 +81,9 @@ def _handle_find_request(msg):
8281 if len (parts ) != 3 :
8382 raise Exception ('3 arguments required: entity-kind, query-metric, query-value' )
8483
85- kind = utils . bytes_to_lower_str ( parts [0 ])
86- metric = utils . bytes_to_lower_str ( parts [1 ])
87- query = utils . bytes_to_lower_str ( parts [2 ])
84+ kind = parts [0 ]. decode ( 'utf-8' )
85+ metric = parts [1 ]. decode ( 'utf-8' )
86+ query = parts [2 ]. decode ( 'utf-8' )
8887
8988 _kinds = {'room' : _handle_find_room , 'user' : _handle_find_user }
9089
@@ -98,8 +97,8 @@ def _handle_mod_ban(msg):
9897 parts = msg .dataviews ()
9998 if len (parts ) < 2 :
10099 raise Exception ("Not enough arguments, need 2 arguments: user_id, room_id" )
101- room_id = int (utils . bytes_to_lower_str ( parts [1 ]))
102- user_id = int (utils . bytes_to_lower_str ( parts [0 ]))
100+ room_id = int (parts [1 ]. decode ( 'utf-8' ))
101+ user_id = int (parts [0 ]. decode ( 'utf-8' ))
103102 room = model .Room (id = room_id )
104103 user = model .User (id = user_id )
105104 if not model .ban_user (None , room , user ):
0 commit comments