Private
Public Access
Neither participant could get rid of a DM at all -- Leave/Delete were both deliberately hidden for DMs during the initial build to sidestep an edge case (removing a membership would break find_or_create_dm's exactly-two-members assumption), but that left no way out whatsoever. RoomMembership.hidden_at is a per-viewer display flag, not a membership deletion: hiding a DM only sets it on your own membership row, so it disappears from just your sidebar without touching the other participant's copy or any messages. It's automatically cleared (reappearing) in two cases: a new message arrives in the room (broadcast_new_message), or find_or_create_dm resolves back to the same room because either person re-opens it from the People list -- both count as the conversation being active again. Also fixes two now-flaky tests (test_message_edit, test_reactions): broadcast_new_message doing more work before returning shifted timing enough to expose a pre-existing race where a per-user-channel frame (desktop_notification/unread_update) could legitimately arrive before a connection's own "joined" ack. Broadened their existing _recv() noise-filtering helper (already used for member_updated) to cover those types too, and used it at the two call sites that were reading raw receive_json() instead. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
147 lines
5.3 KiB
Python
147 lines
5.3 KiB
Python
import uuid
|
|
|
|
from app.schemas.user import UserCreate
|
|
from app.services.auth_service import register_user
|
|
|
|
|
|
def _unique(prefix: str) -> str:
|
|
return f"{prefix}-{uuid.uuid4().hex[:8]}"
|
|
|
|
|
|
_NOISE_TYPES = {"member_updated", "desktop_notification", "unread_update"}
|
|
|
|
|
|
def _recv(ws) -> dict:
|
|
"""Reads the next frame, transparently discarding presence/offline-
|
|
notify noise -- another connection in the same room going online/
|
|
offline, or a per-user-channel side effect of an earlier offline
|
|
member's own message, can legitimately arrive right as a connection is
|
|
established, before its own "joined" ack. Not what these tests are
|
|
about."""
|
|
while True:
|
|
msg = ws.receive_json()
|
|
if msg.get("type") not in _NOISE_TYPES:
|
|
return msg
|
|
|
|
|
|
def _register_ws(ws_client, username: str) -> dict:
|
|
async def _seed():
|
|
async with ws_client.session_factory() as session:
|
|
await register_user(
|
|
session,
|
|
UserCreate(username=username, email=f"{username}@example.com", password="password123"),
|
|
)
|
|
|
|
ws_client.portal.call(_seed)
|
|
resp = ws_client.post(
|
|
"/api/auth/login", json={"username_or_email": username, "password": "password123"}
|
|
)
|
|
assert resp.status_code == 200, resp.text
|
|
return resp.json()
|
|
|
|
|
|
def test_ws_edit_updates_content_and_broadcasts(ws_client):
|
|
username = _unique("alice")
|
|
_register_ws(ws_client, username=username)
|
|
room = ws_client.post("/api/rooms", json={"name": _unique("general")}).json()
|
|
|
|
with ws_client.websocket_connect("/ws/chat") as ws:
|
|
ws.send_json({"type": "join", "room_id": room["id"]})
|
|
assert ws.receive_json()["type"] == "joined"
|
|
|
|
ws.send_json({"type": "message", "room_id": room["id"], "content": "hello"})
|
|
message = ws.receive_json()
|
|
assert message["edited_at"] is None
|
|
|
|
ws.send_json(
|
|
{
|
|
"type": "edit",
|
|
"room_id": room["id"],
|
|
"message_id": message["id"],
|
|
"content": "hello, edited",
|
|
}
|
|
)
|
|
update = ws.receive_json()
|
|
assert update["type"] == "message_update"
|
|
assert update["id"] == message["id"]
|
|
assert update["content"] == "hello, edited"
|
|
assert update["edited_at"] is not None
|
|
|
|
resp = ws_client.get(f"/api/rooms/{room['id']}/messages")
|
|
history = resp.json()
|
|
edited = next(m for m in history if m["id"] == message["id"])
|
|
assert edited["content"] == "hello, edited"
|
|
assert edited["edited_at"] is not None
|
|
|
|
|
|
def test_ws_edit_rejects_non_author(ws_client):
|
|
alice = _register_ws(ws_client, username=_unique("alice"))
|
|
room = ws_client.post("/api/rooms", json={"name": _unique("general")}).json()
|
|
|
|
bob = _register_ws(ws_client, username=_unique("bob"))
|
|
ws_client.post(f"/api/rooms/{room['id']}/join")
|
|
|
|
ws_client.post(
|
|
"/api/auth/login", json={"username_or_email": alice["username"], "password": "password123"}
|
|
)
|
|
with ws_client.websocket_connect("/ws/chat") as alice_ws:
|
|
alice_ws.send_json({"type": "join", "room_id": room["id"]})
|
|
assert alice_ws.receive_json()["type"] == "joined"
|
|
alice_ws.send_json({"type": "message", "room_id": room["id"], "content": "hello"})
|
|
message = alice_ws.receive_json()
|
|
|
|
ws_client.post(
|
|
"/api/auth/login",
|
|
json={"username_or_email": bob["username"], "password": "password123"},
|
|
)
|
|
with ws_client.websocket_connect("/ws/chat") as bob_ws:
|
|
bob_ws.send_json({"type": "join", "room_id": room["id"]})
|
|
assert _recv(bob_ws)["type"] == "joined"
|
|
bob_ws.send_json(
|
|
{
|
|
"type": "edit",
|
|
"room_id": room["id"],
|
|
"message_id": message["id"],
|
|
"content": "hacked",
|
|
}
|
|
)
|
|
resp = bob_ws.receive_json()
|
|
assert resp["type"] == "error"
|
|
assert "own messages" in resp["detail"]
|
|
|
|
|
|
def test_edit_fans_out_across_instances(ws_client_factory):
|
|
instance1 = ws_client_factory()
|
|
instance2 = ws_client_factory()
|
|
|
|
alice = _register_ws(instance1, _unique("alice"))
|
|
room = instance1.post("/api/rooms", json={"name": _unique("general")}).json()
|
|
|
|
bob = _register_ws(instance2, _unique("bob"))
|
|
instance2.post(f"/api/rooms/{room['id']}/join")
|
|
|
|
with instance2.websocket_connect("/ws/chat") as bob_ws:
|
|
bob_ws.send_json({"type": "join", "room_id": room["id"]})
|
|
assert _recv(bob_ws)["type"] == "joined"
|
|
|
|
with instance1.websocket_connect("/ws/chat") as alice_ws:
|
|
alice_ws.send_json({"type": "join", "room_id": room["id"]})
|
|
assert alice_ws.receive_json()["type"] == "joined"
|
|
alice_ws.send_json({"type": "message", "room_id": room["id"], "content": "hi"})
|
|
message = alice_ws.receive_json()
|
|
assert _recv(bob_ws)["type"] == "message"
|
|
|
|
alice_ws.send_json(
|
|
{
|
|
"type": "edit",
|
|
"room_id": room["id"],
|
|
"message_id": message["id"],
|
|
"content": "hi, edited",
|
|
}
|
|
)
|
|
assert alice_ws.receive_json()["type"] == "message_update"
|
|
|
|
update = _recv(bob_ws)
|
|
assert update["type"] == "message_update"
|
|
assert update["content"] == "hi, edited"
|