From 5396d44fa6d4aa667bb2bac794f074e3d83510e4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 24 Jun 2025 23:39:28 -0400 Subject: [PATCH] fix: delete_all and other now works with blindedId or not --- sogs/routes/rooms.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sogs/routes/rooms.py b/sogs/routes/rooms.py index 4487a71b..d300b386 100644 --- a/sogs/routes/rooms.py +++ b/sogs/routes/rooms.py @@ -318,7 +318,7 @@ def get_permission_info(room): return jsonify({k: addExtraPermInfo(v) for k, v in room.permissions.items()}) -@rooms.get("/room//permissions/") +@rooms.get("/room//permissions/") @auth.mod_required def get_user_permission_info(room, sid): """ @@ -352,7 +352,7 @@ def get_future_permission_info(room): return jsonify(room.future_permissions) -@rooms.get("/room//futurePermissions/") +@rooms.get("/room//futurePermissions/") @auth.mod_required def get_user_future_permissions(room, sid): """ @@ -368,7 +368,7 @@ def get_user_future_permissions(room, sid): return jsonify(room.user_future_permissions(user)) -@rooms.post("/room//permissions/") +@rooms.post("/room//permissions/") @auth.mod_required def set_permissions(room, sid): """ @@ -468,7 +468,7 @@ def set_permissions(room, sid): return jsonify(res) -@rooms.post("/room//futurePermissions/") +@rooms.post("/room//futurePermissions/") @auth.mod_required def set_future_permissions(room, sid): """ @@ -937,7 +937,7 @@ def serve_file_with_ignored_filename(room, fileId, filename): return serve_file(room=room, fileId=fileId) -@rooms.delete("/room//all/") +@rooms.delete("/room//all/") def delete_all_posts(room, sid): """ Deletes all posts from a room made by a user @@ -955,14 +955,18 @@ def delete_all_posts(room, sid): - 403 Forbidden — if the invoking user does not have access to the room. - 404 Not Found — if the user we are deleting posts from made no posts in this room. """ - user = muser.User(session_id=sid, autovivify=False) + + user = muser.User(session_id=sid, try_blinding=True, autovivify=False) + app.logger.warning(f"plop1: {user.session_id}") + deleted, _ = room.delete_all_posts(user, deleter=g.user) + if not deleted: abort(http.NOT_FOUND) return jsonify({}) -@rooms.delete("/rooms/all/") +@rooms.delete("/rooms/all/") def delete_user_posts_from_all_rooms(sid): """ Deletes all posts from all rooms by a given user. @@ -980,7 +984,7 @@ def delete_user_posts_from_all_rooms(sid): """ deletions = {} total = 0 - user = muser.User(session_id=sid, autovivify=False) + user = muser.User(session_id=sid, try_blinding=True, autovivify=False) for room in mroom.get_accessible_rooms(g.user): try: count, _ = room.delete_all_posts(user, deleter=g.user)