Skip to content

Commit 5396d44

Browse files
author
Audric Ackermann
committed
fix: delete_all and other now works with blindedId or not
1 parent 9497ddb commit 5396d44

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

sogs/routes/rooms.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def get_permission_info(room):
318318
return jsonify({k: addExtraPermInfo(v) for k, v in room.permissions.items()})
319319

320320

321-
@rooms.get("/room/<Room:room>/permissions/<SessionID:sid>")
321+
@rooms.get("/room/<Room:room>/permissions/<AnySessionID:sid>")
322322
@auth.mod_required
323323
def get_user_permission_info(room, sid):
324324
"""
@@ -352,7 +352,7 @@ def get_future_permission_info(room):
352352
return jsonify(room.future_permissions)
353353

354354

355-
@rooms.get("/room/<Room:room>/futurePermissions/<SessionID:sid>")
355+
@rooms.get("/room/<Room:room>/futurePermissions/<AnySessionID:sid>")
356356
@auth.mod_required
357357
def get_user_future_permissions(room, sid):
358358
"""
@@ -368,7 +368,7 @@ def get_user_future_permissions(room, sid):
368368
return jsonify(room.user_future_permissions(user))
369369

370370

371-
@rooms.post("/room/<Room:room>/permissions/<SessionID:sid>")
371+
@rooms.post("/room/<Room:room>/permissions/<AnySessionID:sid>")
372372
@auth.mod_required
373373
def set_permissions(room, sid):
374374
"""
@@ -468,7 +468,7 @@ def set_permissions(room, sid):
468468
return jsonify(res)
469469

470470

471-
@rooms.post("/room/<Room:room>/futurePermissions/<SessionID:sid>")
471+
@rooms.post("/room/<Room:room>/futurePermissions/<AnySessionID:sid>")
472472
@auth.mod_required
473473
def set_future_permissions(room, sid):
474474
"""
@@ -937,7 +937,7 @@ def serve_file_with_ignored_filename(room, fileId, filename):
937937
return serve_file(room=room, fileId=fileId)
938938

939939

940-
@rooms.delete("/room/<Room:room>/all/<SessionID:sid>")
940+
@rooms.delete("/room/<Room:room>/all/<AnySessionID:sid>")
941941
def delete_all_posts(room, sid):
942942
"""
943943
Deletes all posts from a room made by a user
@@ -955,14 +955,18 @@ def delete_all_posts(room, sid):
955955
- 403 Forbidden — if the invoking user does not have access to the room.
956956
- 404 Not Found — if the user we are deleting posts from made no posts in this room.
957957
"""
958-
user = muser.User(session_id=sid, autovivify=False)
958+
959+
user = muser.User(session_id=sid, try_blinding=True, autovivify=False)
960+
app.logger.warning(f"plop1: {user.session_id}")
961+
959962
deleted, _ = room.delete_all_posts(user, deleter=g.user)
963+
960964
if not deleted:
961965
abort(http.NOT_FOUND)
962966
return jsonify({})
963967

964968

965-
@rooms.delete("/rooms/all/<SessionID:sid>")
969+
@rooms.delete("/rooms/all/<AnySessionID:sid>")
966970
def delete_user_posts_from_all_rooms(sid):
967971
"""
968972
Deletes all posts from all rooms by a given user.
@@ -980,7 +984,7 @@ def delete_user_posts_from_all_rooms(sid):
980984
"""
981985
deletions = {}
982986
total = 0
983-
user = muser.User(session_id=sid, autovivify=False)
987+
user = muser.User(session_id=sid, try_blinding=True, autovivify=False)
984988
for room in mroom.get_accessible_rooms(g.user):
985989
try:
986990
count, _ = room.delete_all_posts(user, deleter=g.user)

0 commit comments

Comments
 (0)