Merge pull request #166 from jagerman/fix-room-delete-reactions

Fix room deletion when a room has reactions

Author: jagerman

sogs/model/room.py

@@ -183,7 +183,18 @@ def delete(self):
 
         This method does not authenticate.
         """
-        result = query("DELETE FROM rooms WHERE token = :t", t=self.token)
+
+        with db.transaction():
+            query(
+                """
+                DELETE FROM user_reactions WHERE reaction IN (
+                    SELECT id FROM reactions WHERE message IN (
+                        SELECT id FROM messages WHERE room = (
+                            SELECT id FROM rooms WHERE token = :t)))
+                """,
+                t=self.token,
+            )
+            result = query("DELETE FROM rooms WHERE token = :t", t=self.token)
         if result.rowcount != 1:
             raise NoSuchRoom(self.token)
 

tests/test_rooms.py

@@ -4,6 +4,7 @@
 from sogs.model.room import Room, get_rooms
 from sogs.model.file import File
 from sogs import config
+from request import sogs_put
 from util import pad64, from_now
 
 
@@ -64,6 +65,20 @@ def test_delete(room, room2):
     assert rooms[0].token == 'test-room'
 
 
+def test_delete_populated(room, room2, user, client):
+    assert len(get_rooms()) == 2
+
+    # Tests a bug where room deletion would fail if the room had reactions
+    m = room.add_post(user, "data 1".encode(), pad64("sig 1"))
+    r = sogs_put(client, f"/room/{room.token}/reaction/{m['id']}/🍆", {}, user)
+    assert r.status_code == 200
+    room.delete()
+
+    rooms = get_rooms()
+    assert len(rooms) == 1
+    assert rooms[0].token == 'room2'
+
+
 def test_info(room):
     inf = room.info
     assert inf['id'] == 1