rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

fix ppl not being allowed into central chat

master
Aevann 2024-04-06 06:50:04 +02:00
parent 82d1b335b3
commit ee325f8556
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
files/routes/private_chats.py
View File

@ -63,22 +63,24 @@ def private_chat(v, chat_id):
if not chat:
abort(404, "Chat not found!")
membership = g.db.query(ChatMembership).filter_by(user_id=v.id, chat_id=chat_id).one_or_none()
if v.admin_level < PERMS['VIEW_CHATS'] and not membership:
abort(403, "You're not a member of this chat!")
if chat.id == 1:
if not v.allowed_in_chat:
abort(403, CHAT_ERROR_MESSAGE)
else:
membership = g.db.query(ChatMembership).filter_by(user_id=v.id, chat_id=chat_id).one_or_none()
if v.admin_level < PERMS['VIEW_CHATS'] and not membership:
abort(403, "You're not a member of this chat!")
displayed_messages = reversed(g.db.query(ChatMessage).filter_by(chat_id=chat.id).order_by(ChatMessage.id.desc()).limit(250).all())
displayed_messages = {m.id: m for m in displayed_messages}
if not session.get("GLOBAL") and membership:
membership.notification = False
g.db.add(membership)
g.db.commit() #to clear notif count
if chat.id == 1:
sorted_memberships = None
else:
if not session.get("GLOBAL") and membership:
membership.notification = False
g.db.add(membership)
g.db.commit() #to clear notif count
query = g.db.query(ChatMembership).filter_by(chat_id=chat.id)
sorted_memberships = [query.filter_by(user_id=chat.owner_id).one()] + query.filter(ChatMembership.user_id != chat.owner_id).join(ChatMembership.user).order_by(func.lower(User.username)).all()