Merge pull request #115 from Bilb/ban-unban-mod-alow-blinded-or-not

make ban/unban and mod endpoint accept blinded or not id

Author: jagerman

sogs/routes/converters.py

@@ -64,3 +64,4 @@ def to_python(self, value):
 app.url_map.converters['SessionID'] = (
     BlindSessionIDConverter if config.REQUIRE_BLIND_KEYS else AnySessionIDConverter
 )
+app.url_map.converters['AnySessionID'] = AnySessionIDConverter

sogs/routes/subrequest.py

@@ -88,11 +88,14 @@ def make_subrequest(
             app.logger.warning(
                 f"Sub-request for {method} {path} returned status {response.status_code}"
             )
-        return response, {
-            k.lower(): v
-            for k, v in response.get_wsgi_headers(subreq_env)
-            if k.lower() != 'content-length'
-        }
+        return (
+            response,
+            {
+                k.lower(): v
+                for k, v in response.get_wsgi_headers(subreq_env)
+                if k.lower() != 'content-length'
+            },
+        )
 
     except Exception:
         app.logger.warning(f"Sub-request for {method} {path} failed: {traceback.format_exc()}")

sogs/routes/users.py

@@ -74,7 +74,7 @@ def extract_rooms_or_global(req, admin=True):
     return (None, True)
 
 
-@users.post("/user/<SessionID:sid>/moderator")
+@users.post("/user/<AnySessionID:sid>/moderator")
 @auth.user_required
 def set_mod(sid):
     """
@@ -238,7 +238,7 @@ def set_mod(sid):
     return jsonify({})
 
 
-@users.post("/user/<SessionID:sid>/ban")
+@users.post("/user/<AnySessionID:sid>/ban")
 @auth.user_required
 def ban_user(sid):
     """
@@ -315,7 +315,7 @@ def ban_user(sid):
     return {}
 
 
-@users.post("/user/<SessionID:sid>/unban")
+@users.post("/user/<AnySessionID:sid>/unban")
 @auth.user_required
 def unban_user(sid):
     """

sogs/routes/views.py

@@ -47,11 +47,7 @@ def view_room(room):
     if not room.default_read:
         abort(http.FORBIDDEN)
 
-    return render_template(
-        "view_room.html",
-        room=room,
-        show_recent=config.HTTP_SHOW_RECENT,
-    )
+    return render_template("view_room.html", room=room, show_recent=config.HTTP_SHOW_RECENT)
 
 
 @views.get("/r/<Room:room>/invite.png")