fix(channel): member delete acts as leave; add coverage and docs
All checks were successful
CI / test (push) Successful in 42s
All checks were successful
CI / test (push) Successful in 42s
This commit is contained in:
@@ -20,7 +20,7 @@ from app.chats.schemas import (
|
||||
ChatTitleUpdateRequest,
|
||||
)
|
||||
from app.chats import repository as chats_repository
|
||||
from app.chats.models import ChatType
|
||||
from app.chats.models import ChatMemberRole, ChatType
|
||||
from app.chats.service import (
|
||||
add_chat_member_for_user,
|
||||
ban_chat_member_for_user,
|
||||
@@ -253,11 +253,19 @@ async def delete_chat(
|
||||
current_user: User = Depends(get_current_user),
|
||||
) -> None:
|
||||
chat_before_delete = await chats_repository.get_chat_by_id(db, chat_id)
|
||||
membership_before_delete = (
|
||||
await chats_repository.get_chat_member(db, chat_id=chat_id, user_id=current_user.id) if chat_before_delete else None
|
||||
)
|
||||
delete_for_all = bool(
|
||||
chat_before_delete
|
||||
and (
|
||||
(for_all and not chat_before_delete.is_saved)
|
||||
or (chat_before_delete.type == ChatType.CHANNEL and not chat_before_delete.is_saved)
|
||||
or (
|
||||
chat_before_delete.type == ChatType.CHANNEL
|
||||
and not chat_before_delete.is_saved
|
||||
and membership_before_delete is not None
|
||||
and membership_before_delete.role in {ChatMemberRole.OWNER, ChatMemberRole.ADMIN}
|
||||
)
|
||||
)
|
||||
)
|
||||
await delete_chat_for_user(db, chat_id=chat_id, user_id=current_user.id, payload=ChatDeleteRequest(for_all=for_all))
|
||||
|
||||
@@ -571,6 +571,12 @@ async def delete_chat_for_user(db: AsyncSession, *, chat_id: int, user_id: int,
|
||||
if chat.is_saved:
|
||||
await clear_chat_for_user(db, chat_id=chat_id, user_id=user_id)
|
||||
return
|
||||
if chat.type == ChatType.CHANNEL and membership.role == ChatMemberRole.MEMBER:
|
||||
if payload.for_all:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Insufficient permissions")
|
||||
await repository.delete_chat_member(db, membership)
|
||||
await db.commit()
|
||||
return
|
||||
delete_for_all = (payload.for_all and not chat.is_saved) or chat.type == ChatType.CHANNEL
|
||||
if delete_for_all:
|
||||
if chat.type in {ChatType.GROUP, ChatType.CHANNEL} and membership.role not in {ChatMemberRole.OWNER, ChatMemberRole.ADMIN}:
|
||||
|
||||
Reference in New Issue
Block a user