feat: Add Chat UX improvements with notifications and @mention support
- Add ActionBar component with expandable toolbar for mobile - Add @mention functionality with autocomplete dropdown - Add browser notification system (push, sound, vibration) - Add NotificationSettings modal for user preferences - Add mention badges on room list cards - Add ReportPreview with Markdown rendering and copy/download - Add message copy functionality with hover actions - Add backend mentions field to messages with Alembic migration - Add lots field to rooms, remove templates - Optimize WebSocket database session handling - Various UX polish (animations, accessibility) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
egg
@@ -6,7 +6,7 @@ from typing import Optional
|
||||
from datetime import datetime
|
||||
import json
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.database import get_db, get_db_context
|
||||
from app.core.config import get_settings
|
||||
from app.modules.auth.dependencies import get_current_user
|
||||
from app.modules.auth.services.session_service import session_service
|
||||
@@ -87,15 +87,17 @@ async def websocket_endpoint(
|
||||
3. Connection added to pool
|
||||
4. User joined event broadcast to room
|
||||
5. Client can send/receive messages
|
||||
|
||||
Note: Uses short-lived database sessions for each operation to prevent
|
||||
connection pool exhaustion with many concurrent WebSocket connections.
|
||||
"""
|
||||
db: Session = next(get_db())
|
||||
|
||||
try:
|
||||
# Authenticate token via session lookup
|
||||
if not token:
|
||||
await websocket.close(code=4001, reason="Authentication required")
|
||||
return
|
||||
# Authenticate and get user info using short-lived session
|
||||
if not token:
|
||||
await websocket.close(code=4001, reason="Authentication required")
|
||||
return
|
||||
|
||||
# Authenticate token and check membership with short session
|
||||
with get_db_context() as db:
|
||||
user_session = session_service.get_session_by_token(db, token)
|
||||
if not user_session:
|
||||
await websocket.close(code=4001, reason="Invalid or expired token")
|
||||
@@ -103,55 +105,59 @@ async def websocket_endpoint(
|
||||
|
||||
user_id = user_session.username
|
||||
|
||||
# Check room membership
|
||||
# Check room membership and cache the role
|
||||
membership = get_user_room_membership(db, room_id, user_id)
|
||||
if not membership and not is_system_admin(user_id):
|
||||
await websocket.close(code=4001, reason="Not a member of this room")
|
||||
return
|
||||
|
||||
# Connect to WebSocket manager
|
||||
conn_info = await manager.connect(websocket, room_id, user_id)
|
||||
# Cache membership role for permission checks (avoid holding DB reference)
|
||||
user_role = membership.role if membership else None
|
||||
|
||||
# Broadcast user joined event
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
SystemMessageBroadcast(
|
||||
event=SystemEventType.USER_JOINED,
|
||||
user_id=user_id,
|
||||
room_id=room_id,
|
||||
timestamp=datetime.utcnow()
|
||||
).dict(),
|
||||
exclude_user=user_id
|
||||
)
|
||||
# Connect to WebSocket manager (no DB needed)
|
||||
conn_info = await manager.connect(websocket, room_id, user_id)
|
||||
|
||||
try:
|
||||
while True:
|
||||
# Receive message from client
|
||||
data = await websocket.receive_text()
|
||||
message_data = json.loads(data)
|
||||
# Broadcast user joined event (no DB needed)
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
SystemMessageBroadcast(
|
||||
event=SystemEventType.USER_JOINED,
|
||||
user_id=user_id,
|
||||
room_id=room_id,
|
||||
timestamp=datetime.utcnow()
|
||||
).dict(),
|
||||
exclude_user=user_id
|
||||
)
|
||||
|
||||
# Parse incoming message
|
||||
try:
|
||||
ws_message = WebSocketMessageIn(**message_data)
|
||||
except Exception as e:
|
||||
try:
|
||||
while True:
|
||||
# Receive message from client
|
||||
data = await websocket.receive_text()
|
||||
message_data = json.loads(data)
|
||||
|
||||
# Parse incoming message
|
||||
try:
|
||||
ws_message = WebSocketMessageIn(**message_data)
|
||||
except Exception as e:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error=str(e), code="INVALID_MESSAGE").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Handle different message types
|
||||
if ws_message.type == WebSocketMessageType.MESSAGE:
|
||||
# Check write permission using cached role
|
||||
if not _can_write_with_role(user_role, user_id):
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error=str(e), code="INVALID_MESSAGE").dict()
|
||||
ErrorMessage(
|
||||
error="Insufficient permissions",
|
||||
code="PERMISSION_DENIED"
|
||||
).dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Handle different message types
|
||||
if ws_message.type == WebSocketMessageType.MESSAGE:
|
||||
# Check write permission
|
||||
if not can_write_message(membership, user_id):
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(
|
||||
error="Insufficient permissions",
|
||||
code="PERMISSION_DENIED"
|
||||
).dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Create message in database
|
||||
# Create message in database with short session
|
||||
with get_db_context() as db:
|
||||
message = MessageService.create_message(
|
||||
db=db,
|
||||
room_id=room_id,
|
||||
@@ -160,131 +166,170 @@ async def websocket_endpoint(
|
||||
message_type=MessageType(ws_message.message_type.value) if ws_message.message_type else MessageType.TEXT,
|
||||
metadata=ws_message.metadata
|
||||
)
|
||||
# Get sender display name
|
||||
display_name = MessageService.get_display_name(db, user_id)
|
||||
# Extract data before session closes
|
||||
msg_data = {
|
||||
"message_id": message.message_id,
|
||||
"room_id": message.room_id,
|
||||
"sender_id": message.sender_id,
|
||||
"sender_display_name": display_name or user_id,
|
||||
"content": message.content,
|
||||
"message_type": message.message_type.value,
|
||||
"metadata": message.message_metadata,
|
||||
"created_at": message.created_at,
|
||||
"sequence_number": message.sequence_number
|
||||
}
|
||||
|
||||
# Send acknowledgment to sender
|
||||
# Send acknowledgment to sender
|
||||
await ws_send_json(websocket,
|
||||
MessageAck(
|
||||
message_id=msg_data["message_id"],
|
||||
sequence_number=msg_data["sequence_number"],
|
||||
timestamp=msg_data["created_at"]
|
||||
).dict()
|
||||
)
|
||||
|
||||
# Broadcast message to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
MessageBroadcast(
|
||||
message_id=msg_data["message_id"],
|
||||
room_id=msg_data["room_id"],
|
||||
sender_id=msg_data["sender_id"],
|
||||
sender_display_name=msg_data["sender_display_name"],
|
||||
content=msg_data["content"],
|
||||
message_type=MessageTypeEnum(msg_data["message_type"]),
|
||||
metadata=msg_data["metadata"],
|
||||
created_at=msg_data["created_at"],
|
||||
sequence_number=msg_data["sequence_number"]
|
||||
).dict()
|
||||
)
|
||||
|
||||
elif ws_message.type == WebSocketMessageType.EDIT_MESSAGE:
|
||||
if not ws_message.message_id or not ws_message.content:
|
||||
await ws_send_json(websocket,
|
||||
MessageAck(
|
||||
message_id=message.message_id,
|
||||
sequence_number=message.sequence_number,
|
||||
timestamp=message.created_at
|
||||
).dict()
|
||||
ErrorMessage(error="Missing message_id or content", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Broadcast message to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
MessageBroadcast(
|
||||
message_id=message.message_id,
|
||||
room_id=message.room_id,
|
||||
sender_id=message.sender_id,
|
||||
content=message.content,
|
||||
message_type=MessageTypeEnum(message.message_type.value),
|
||||
metadata=message.message_metadata,
|
||||
created_at=message.created_at,
|
||||
sequence_number=message.sequence_number
|
||||
).dict()
|
||||
)
|
||||
|
||||
elif ws_message.type == WebSocketMessageType.EDIT_MESSAGE:
|
||||
if not ws_message.message_id or not ws_message.content:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id or content", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Edit message
|
||||
# Edit message with short session
|
||||
with get_db_context() as db:
|
||||
edited_message = MessageService.edit_message(
|
||||
db=db,
|
||||
message_id=ws_message.message_id,
|
||||
user_id=user_id,
|
||||
new_content=ws_message.content
|
||||
)
|
||||
if edited_message:
|
||||
# Get sender display name
|
||||
display_name = MessageService.get_display_name(db, edited_message.sender_id)
|
||||
edit_data = {
|
||||
"message_id": edited_message.message_id,
|
||||
"room_id": edited_message.room_id,
|
||||
"sender_id": edited_message.sender_id,
|
||||
"sender_display_name": display_name or edited_message.sender_id,
|
||||
"content": edited_message.content,
|
||||
"message_type": edited_message.message_type.value,
|
||||
"metadata": edited_message.message_metadata,
|
||||
"created_at": edited_message.created_at,
|
||||
"edited_at": edited_message.edited_at,
|
||||
"sequence_number": edited_message.sequence_number
|
||||
}
|
||||
else:
|
||||
edit_data = None
|
||||
|
||||
if not edited_message:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Cannot edit message", code="EDIT_FAILED").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Broadcast edit to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
MessageBroadcast(
|
||||
type="edit_message",
|
||||
message_id=edited_message.message_id,
|
||||
room_id=edited_message.room_id,
|
||||
sender_id=edited_message.sender_id,
|
||||
content=edited_message.content,
|
||||
message_type=MessageTypeEnum(edited_message.message_type.value),
|
||||
metadata=edited_message.message_metadata,
|
||||
created_at=edited_message.created_at,
|
||||
edited_at=edited_message.edited_at,
|
||||
sequence_number=edited_message.sequence_number
|
||||
).dict()
|
||||
if not edit_data:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Cannot edit message", code="EDIT_FAILED").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
elif ws_message.type == WebSocketMessageType.DELETE_MESSAGE:
|
||||
if not ws_message.message_id:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
# Broadcast edit to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
MessageBroadcast(
|
||||
type="edit_message",
|
||||
message_id=edit_data["message_id"],
|
||||
room_id=edit_data["room_id"],
|
||||
sender_id=edit_data["sender_id"],
|
||||
sender_display_name=edit_data["sender_display_name"],
|
||||
content=edit_data["content"],
|
||||
message_type=MessageTypeEnum(edit_data["message_type"]),
|
||||
metadata=edit_data["metadata"],
|
||||
created_at=edit_data["created_at"],
|
||||
edited_at=edit_data["edited_at"],
|
||||
sequence_number=edit_data["sequence_number"]
|
||||
).dict()
|
||||
)
|
||||
|
||||
# Delete message
|
||||
elif ws_message.type == WebSocketMessageType.DELETE_MESSAGE:
|
||||
if not ws_message.message_id:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Delete message with short session
|
||||
with get_db_context() as db:
|
||||
deleted_message = MessageService.delete_message(
|
||||
db=db,
|
||||
message_id=ws_message.message_id,
|
||||
user_id=user_id,
|
||||
is_admin=is_system_admin(user_id)
|
||||
)
|
||||
deleted_msg_id = deleted_message.message_id if deleted_message else None
|
||||
|
||||
if not deleted_message:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Cannot delete message", code="DELETE_FAILED").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Broadcast deletion to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{"type": "delete_message", "message_id": deleted_message.message_id}
|
||||
if not deleted_msg_id:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Cannot delete message", code="DELETE_FAILED").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
elif ws_message.type == WebSocketMessageType.ADD_REACTION:
|
||||
if not ws_message.message_id or not ws_message.emoji:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id or emoji", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
# Broadcast deletion to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{"type": "delete_message", "message_id": deleted_msg_id}
|
||||
)
|
||||
|
||||
# Add reaction
|
||||
elif ws_message.type == WebSocketMessageType.ADD_REACTION:
|
||||
if not ws_message.message_id or not ws_message.emoji:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id or emoji", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Add reaction with short session
|
||||
with get_db_context() as db:
|
||||
reaction = MessageService.add_reaction(
|
||||
db=db,
|
||||
message_id=ws_message.message_id,
|
||||
user_id=user_id,
|
||||
emoji=ws_message.emoji
|
||||
)
|
||||
reaction_added = reaction is not None
|
||||
|
||||
if reaction:
|
||||
# Broadcast reaction to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{
|
||||
"type": "add_reaction",
|
||||
"message_id": ws_message.message_id,
|
||||
"user_id": user_id,
|
||||
"emoji": ws_message.emoji
|
||||
}
|
||||
)
|
||||
if reaction_added:
|
||||
# Broadcast reaction to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{
|
||||
"type": "add_reaction",
|
||||
"message_id": ws_message.message_id,
|
||||
"user_id": user_id,
|
||||
"emoji": ws_message.emoji
|
||||
}
|
||||
)
|
||||
|
||||
elif ws_message.type == WebSocketMessageType.REMOVE_REACTION:
|
||||
if not ws_message.message_id or not ws_message.emoji:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id or emoji", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
elif ws_message.type == WebSocketMessageType.REMOVE_REACTION:
|
||||
if not ws_message.message_id or not ws_message.emoji:
|
||||
await ws_send_json(websocket,
|
||||
ErrorMessage(error="Missing message_id or emoji", code="INVALID_REQUEST").dict()
|
||||
)
|
||||
continue
|
||||
|
||||
# Remove reaction
|
||||
# Remove reaction with short session
|
||||
with get_db_context() as db:
|
||||
removed = MessageService.remove_reaction(
|
||||
db=db,
|
||||
message_id=ws_message.message_id,
|
||||
@@ -292,47 +337,53 @@ async def websocket_endpoint(
|
||||
emoji=ws_message.emoji
|
||||
)
|
||||
|
||||
if removed:
|
||||
# Broadcast reaction removal to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{
|
||||
"type": "remove_reaction",
|
||||
"message_id": ws_message.message_id,
|
||||
"user_id": user_id,
|
||||
"emoji": ws_message.emoji
|
||||
}
|
||||
)
|
||||
|
||||
elif ws_message.type == WebSocketMessageType.TYPING:
|
||||
# Set typing status
|
||||
is_typing = message_data.get("is_typing", True)
|
||||
await manager.set_typing(room_id, user_id, is_typing)
|
||||
|
||||
# Broadcast typing status to other room members
|
||||
if removed:
|
||||
# Broadcast reaction removal to all room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{"type": "typing", "user_id": user_id, "is_typing": is_typing},
|
||||
exclude_user=user_id
|
||||
{
|
||||
"type": "remove_reaction",
|
||||
"message_id": ws_message.message_id,
|
||||
"user_id": user_id,
|
||||
"emoji": ws_message.emoji
|
||||
}
|
||||
)
|
||||
|
||||
except WebSocketDisconnect:
|
||||
pass
|
||||
finally:
|
||||
# Disconnect and broadcast user left event
|
||||
await manager.disconnect(conn_info)
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
SystemMessageBroadcast(
|
||||
event=SystemEventType.USER_LEFT,
|
||||
user_id=user_id,
|
||||
room_id=room_id,
|
||||
timestamp=datetime.utcnow()
|
||||
).dict()
|
||||
)
|
||||
elif ws_message.type == WebSocketMessageType.TYPING:
|
||||
# Set typing status (no DB needed)
|
||||
is_typing = message_data.get("is_typing", True)
|
||||
await manager.set_typing(room_id, user_id, is_typing)
|
||||
|
||||
# Broadcast typing status to other room members
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
{"type": "typing", "user_id": user_id, "is_typing": is_typing},
|
||||
exclude_user=user_id
|
||||
)
|
||||
|
||||
except WebSocketDisconnect:
|
||||
pass
|
||||
finally:
|
||||
db.close()
|
||||
# Disconnect and broadcast user left event
|
||||
await manager.disconnect(conn_info)
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
SystemMessageBroadcast(
|
||||
event=SystemEventType.USER_LEFT,
|
||||
user_id=user_id,
|
||||
room_id=room_id,
|
||||
timestamp=datetime.utcnow()
|
||||
).dict()
|
||||
)
|
||||
|
||||
|
||||
def _can_write_with_role(role: Optional[MemberRole], user_id: str) -> bool:
|
||||
"""Check if user has write permission based on cached role"""
|
||||
if is_system_admin(user_id):
|
||||
return True
|
||||
if not role:
|
||||
return False
|
||||
return role in [MemberRole.OWNER, MemberRole.EDITOR]
|
||||
|
||||
|
||||
# REST API endpoints
|
||||
@@ -387,6 +438,10 @@ async def create_message(
|
||||
metadata=message.metadata
|
||||
)
|
||||
|
||||
# Get sender display name
|
||||
display_name = MessageService.get_display_name(db, user_id)
|
||||
sender_display_name = display_name or user_id
|
||||
|
||||
# Broadcast to WebSocket connections
|
||||
await manager.broadcast_to_room(
|
||||
room_id,
|
||||
@@ -394,6 +449,7 @@ async def create_message(
|
||||
message_id=created_message.message_id,
|
||||
room_id=created_message.room_id,
|
||||
sender_id=created_message.sender_id,
|
||||
sender_display_name=sender_display_name,
|
||||
content=created_message.content,
|
||||
message_type=MessageTypeEnum(created_message.message_type.value),
|
||||
metadata=created_message.message_metadata,
|
||||
@@ -402,7 +458,10 @@ async def create_message(
|
||||
).dict()
|
||||
)
|
||||
|
||||
return MessageResponse.from_orm(created_message)
|
||||
# Build response with display name
|
||||
response = MessageResponse.from_orm(created_message)
|
||||
response.sender_display_name = sender_display_name
|
||||
return response
|
||||
|
||||
|
||||
@router.get("/rooms/{room_id}/messages/search", response_model=MessageListResponse)
|
||||
|
||||
Reference in New Issue
Block a user