4
4
5
5
from . import config
6
6
from . import model
7
- from . import utils
8
7
9
8
import json
10
9
@@ -39,7 +38,7 @@ def _sub_conn_to_event(name, conn):
39
38
def _handle_subscribe_request (msg ):
40
39
""" handle a request to subscribe to events as a bot"""
41
40
for name in msg .dataviews ():
42
- name = utils . bytes_to_lower_str ( name )
41
+ name = name . decode ( 'utf-8' )
43
42
if name in ('all' , '*' ):
44
43
# subscribe to all events
45
44
for ev in EVENTS :
@@ -82,9 +81,9 @@ def _handle_find_request(msg):
82
81
if len (parts ) != 3 :
83
82
raise Exception ('3 arguments required: entity-kind, query-metric, query-value' )
84
83
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' )
88
87
89
88
_kinds = {'room' : _handle_find_room , 'user' : _handle_find_user }
90
89
@@ -98,8 +97,8 @@ def _handle_mod_ban(msg):
98
97
parts = msg .dataviews ()
99
98
if len (parts ) < 2 :
100
99
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' ))
103
102
room = model .Room (id = room_id )
104
103
user = model .User (id = user_id )
105
104
if not model .ban_user (None , room , user ):
0 commit comments