misc cleanups:

* add utils.bytes_to_lower_string
* allow subscribing to all events via sogs.sub

Author: majestrate

sogs/events.py

@@ -4,6 +4,7 @@
 
 from . import config
 from . import model
+from . import utils
 
 import json
 
@@ -25,26 +26,34 @@ def event_name_valid(eventname):
     return eventname.lower() in EVENTS
 
 
-def _handle_subscribe_request(msg):
-    """ handle a request to subscribe to events as a bot"""
-    parts = msg.dataviews()
-    name = None
-    if len(parts) == 1:
-        name = parts[0].decode('ascii').lower()
-    if name is None:
-        raise Exception('no event name provided')
-    if event_name_valid(name):
+def _sub_conn_to_event(name, conn):
+    """ subscribe a connection to an event type """
+    if not event_name_valid(name):
         raise Exception('invalid event name: {}'.format(name))
     pool = _pools.get(name)
     if msg.conn in pool:
         raise Exception('already subscribed to {}'.format(name))
-    pool.append(msg.conn)
+    pool.append(conn)
+
+
+def _handle_subscribe_request(msg):
+    """ handle a request to subscribe to events as a bot"""
+    for name in msg.dataviews():
+        name = utils.bytes_to_lower_str(name)
+        if name in ('all', '*'):
+            # subscribe to all events
+            for ev in EVENTS:
+                _sub_conn_to_event(ev, msg.conn)
+            return
+        _sub_conn_to_event(name, msg.conn)
+    else:
+        raise Exception("no events selected")
 
 
 def _handle_find_room(metric, query, encode=json.dumps):
     """ find a room """
     if metric == 'id':
-        room = model.Room(id=query)
+        room = model.Room(id=int(query))
     elif metric == 'token':
         room = model.Room(token=query)
     else:
@@ -60,7 +69,7 @@ def _handle_find_room(metric, query, encode=json.dumps):
 def _handle_find_user(metric, query, encode=json.dumps):
     """ find a user """
     if metric == 'id':
-        user = model.User(id=query)
+        user = model.User(id=int(query))
     elif metric == 'pubkey':
         user = model.User(session_id=query)
     else:
@@ -71,20 +80,15 @@ def _handle_find_user(metric, query, encode=json.dumps):
     return encode(reply)
 
 
-def _decode_str(data):
-    """ decode bytes to lowercase string """
-    return data.decode('utf-8').lower()
-
-
 def _handle_find_request(msg):
     """ finds a user / room by id / token / pubkey """
     parts = msg.dataviews()
     if len(parts) != 3:
         raise Exception('3 arguments required: entity-kind, query-metric, query-value')
 
-    kind = _decode_str(parts[0])
-    metric = _decode_str(parts[1])
-    query = _decode_str(parts[2])
+    kind = utils.bytes_to_lower_str(parts[0])
+    metric = utils.bytes_to_lower_str(parts[1])
+    query = utils.bytes_to_lower_str(parts[2])
 
     _kinds = {'room': _handle_find_room, 'user': _handle_find_user}
 
@@ -98,8 +102,8 @@ def _handle_mod_ban(msg):
     parts = msg.dataviews()
     if len(parts) < 2:
         raise Exception("Not enough arguments, need 2 arguments: user_id, room_id")
-    room_id = int(_decode_str(parts[1]))
-    user_id = int(_decode_str(parts[0]))
+    room_id = int(utils.bytes_to_lower_str(parts[1]))
+    user_id = int(utils.bytes_to_lower_str(parts[0]))
     room = model.Room(id=room_id)
     user = model.User(id=user_id)
     if not model.ban_user(None, room, user):

sogs/utils.py

@@ -15,6 +15,11 @@ def message_body(data: bytes):
     return msg.body
 
 
+def bytes_to_lower_str(data):
+    """ decode bytes to lowercase string """
+    return data.decode('utf-8').lower()
+
+
 def encode_base64(data: bytes):
     return base64.b64encode(data).decode()