Private
Public Access
ksmithandClaude Sonnet 5
e9fcb9fea2
Replaces the Phase 1 placeholder UI with a single persistent app shell (top bar + sidebar + chat pane, 860px responsive breakpoint) matching the "PWA chat system UI" design handoff: message bubbles with consecutive-run avatar/name grouping, auto-growing composer, room search, and the real DarkSingularity logo (also used to regenerate the PWA icons). The handoff didn't cover Phase 2 (private rooms, roles, invites) or browsing/joining open rooms, so those are added using the same visual language: a room info panel with role badges, invite-by-username with a pending-invites list, member management (remove/promote/demote/transfer ownership), room settings (rename/describe/delete), and separate browse-rooms/invites-inbox modals. Unread badges, last-message preview, and the typing indicator are deliberately deferred -- both need new backend features (read-tracking, a WS typing event) that weren't in scope this pass. Two small backend additions round out data the new UI needs but the API didn't expose: MessageRead.username (historic messages had no sender name) and InviteRead.target_username / MyInviteRead.room_name+invited_by_username (a recipient's invite list can't otherwise resolve a room they're not in). Both are additive; 35 backend tests still pass. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
85 lines
2.8 KiB
Python
85 lines
2.8 KiB
Python
import uuid
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database import get_db
|
|
from app.dependencies import get_current_user
|
|
from app.models import User
|
|
from app.schemas.invite import InviteRead, MyInviteRead
|
|
from app.schemas.room import RoomMemberRead
|
|
from app.services.invite_service import (
|
|
InviteExpiredError,
|
|
InviteNotFoundError,
|
|
InviteNotPendingError,
|
|
WrongInviteTargetError,
|
|
accept_invite,
|
|
decline_invite,
|
|
list_my_invites,
|
|
)
|
|
|
|
router = APIRouter(prefix="/api/invites", tags=["invites"])
|
|
|
|
|
|
@router.get("/mine", response_model=list[MyInviteRead])
|
|
async def list_my_invites_endpoint(
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
invites = await list_my_invites(db, current_user.id)
|
|
return [
|
|
MyInviteRead(
|
|
id=i.id,
|
|
room_id=i.room_id,
|
|
invited_by=i.invited_by,
|
|
target_user_id=i.target_user_id,
|
|
status=i.status,
|
|
expires_at=i.expires_at,
|
|
created_at=i.created_at,
|
|
room_name=i.room.name,
|
|
invited_by_username=i.inviter.username,
|
|
)
|
|
for i in invites
|
|
]
|
|
|
|
|
|
@router.post("/{invite_id}/accept", response_model=RoomMemberRead)
|
|
async def accept_invite_endpoint(
|
|
invite_id: uuid.UUID,
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
try:
|
|
membership = await accept_invite(db, invite_id, current_user.id)
|
|
except InviteNotFoundError:
|
|
raise HTTPException(status_code=404, detail="Invite not found")
|
|
except WrongInviteTargetError:
|
|
raise HTTPException(status_code=403, detail="This invite is not addressed to you")
|
|
except InviteNotPendingError:
|
|
raise HTTPException(status_code=400, detail="Invite is no longer pending")
|
|
except InviteExpiredError:
|
|
raise HTTPException(status_code=400, detail="Invite has expired")
|
|
|
|
return RoomMemberRead(
|
|
user_id=membership.user_id,
|
|
username=current_user.username,
|
|
role=membership.role,
|
|
joined_at=membership.joined_at,
|
|
)
|
|
|
|
|
|
@router.post("/{invite_id}/decline", response_model=InviteRead)
|
|
async def decline_invite_endpoint(
|
|
invite_id: uuid.UUID,
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
try:
|
|
return await decline_invite(db, invite_id, current_user.id)
|
|
except InviteNotFoundError:
|
|
raise HTTPException(status_code=404, detail="Invite not found")
|
|
except WrongInviteTargetError:
|
|
raise HTTPException(status_code=403, detail="This invite is not addressed to you")
|
|
except InviteNotPendingError:
|
|
raise HTTPException(status_code=400, detail="Invite is no longer pending")
|