Bennett/g0v0-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(chat): fix pydantic warnings for channel name

Browse Source
This commit is contained in:
MingxuanGame
2026-01-11 16:38:03 +08:00
parent 8923d714a7
commit 96c8b70df6
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/router/notification/channel.py
View File

@@ -99,7 +99,7 @@ async def join_channel(
if channel.isdigit():
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.channel_id == int(channel)))).first()
else:
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.name == channel))).first()
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.channel_name == channel))).first()
if db_channel is None:
raise HTTPException(status_code=404, detail="Channel not found")
@@ -126,7 +126,7 @@ async def leave_channel(
if channel.isdigit():
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.channel_id == int(channel)))).first()
else:
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.name == channel))).first()
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.channel_name == channel))).first()
if db_channel is None:
raise HTTPException(status_code=404, detail="Channel not found")
@@ -182,14 +182,14 @@ async def get_channel(
if channel.isdigit():
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.channel_id == int(channel)))).first()
else:
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.name == channel))).first()
db_channel = (await session.exec(select(ChatChannel).where(ChatChannel.channel_name == channel))).first()
if db_channel is None:
raise HTTPException(status_code=404, detail="Channel not found")
# 立即提取需要的属性
channel_type = db_channel.type
channel_name = db_channel.name
channel_name = db_channel.channel_name
users = []
if channel_type == ChannelType.PM:
@@ -270,7 +270,7 @@ async def create_channel(
channel_name = f"pm_{current_user.id}_{req.target_id}"
else:
channel_name = req.channel.name if req.channel else "Unnamed Channel"
result = await session.exec(select(ChatChannel).where(ChatChannel.name == channel_name))
result = await session.exec(select(ChatChannel).where(ChatChannel.channel_name == channel_name))
channel = result.first()
if channel is None: