refac
This commit is contained in:
@@ -174,14 +174,7 @@ async def get_channels(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
channels = Channels.get_channels_by_user_id(user.id, db=db)
|
channels = Channels.get_channels_by_user_id(user.id, db=db)
|
||||||
channel_list = []
|
channel_list = []
|
||||||
@@ -254,15 +247,7 @@ async def get_dm_channel_by_user_id(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
existing_channel = Channels.get_dm_channel_by_user_ids(
|
existing_channel = Channels.get_dm_channel_by_user_ids(
|
||||||
[user.id, user_id], db=db
|
[user.id, user_id], db=db
|
||||||
@@ -334,14 +319,7 @@ async def create_new_channel(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
if form_data.type not in ["group", "dm"] and user.role != "admin":
|
if form_data.type not in ["group", "dm"] and user.role != "admin":
|
||||||
# Only admins can create standard channels (joined by default)
|
# Only admins can create standard channels (joined by default)
|
||||||
@@ -422,13 +400,6 @@ async def get_channel_by_id(
|
|||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request, user)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
@@ -541,13 +512,6 @@ async def get_channel_members_by_id(
|
|||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request, user)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
@@ -673,15 +637,7 @@ async def add_members_by_id(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
@@ -723,14 +679,7 @@ async def remove_members_by_id(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
@@ -769,14 +718,7 @@ async def update_channel_by_id(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
@@ -811,14 +753,7 @@ async def delete_channel_by_id(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
@@ -869,13 +804,6 @@ async def get_channel_messages(
|
|||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
check_channels_access(request, user)
|
check_channels_access(request, user)
|
||||||
if user.role != "admin" and not has_permission(
|
|
||||||
user.id, "features.channels", request.app.state.config.USER_PERMISSIONS, db=db
|
|
||||||
):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
|
||||||
)
|
|
||||||
channel = Channels.get_channel_by_id(id, db=db)
|
channel = Channels.get_channel_by_id(id, db=db)
|
||||||
if not channel:
|
if not channel:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
|||||||
Reference in New Issue
Block a user