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

more efficient chat code

master
Aevann 2024-04-09 08:59:05 +02:00
parent 7f67931347
commit 524a81f2e7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/classes/chats.py
View File

@ -1,4 +1,5 @@
import time
from flask import g
from sqlalchemy import Column, ForeignKey
from sqlalchemy.orm import relationship
@ -14,14 +15,11 @@ class Chat(Base):
name = Column(String)
created_utc = Column(Integer)
memberships = relationship("ChatMembership", order_by="ChatMembership.created_utc")
@property
@lazy
def owner_id(self):
if not self.memberships:
return AUTOJANNY_ID
return self.memberships[0].user_id
return g.db.query(ChatMembership.user_id).filter_by(chat_id=self.id).order_by(ChatMembership.created_utc).first()[0] or AUTOJANNY_ID
def __init__(self, *args, **kwargs):
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())

4
files/routes/chats.py
View File

@ -33,8 +33,8 @@ def chat_user(v, username):
abort(403, f"@{user.username} is muting notifications from you, so you can't chat with them!")
sq = g.db.query(Chat.id).join(Chat.memberships).filter(ChatMembership.user_id.in_((v.id, user.id))).group_by(Chat.id).having(func.count(Chat.id) == 2).subquery()
existing = g.db.query(Chat.id).join(Chat.memberships).filter(Chat.id == sq.c.id).group_by(Chat.id).having(func.count(Chat.id) == 2).one_or_none()
sq = g.db.query(Chat.id).join(ChatMembership, ChatMembership.chat_id == Chat.id).filter(ChatMembership.user_id.in_((v.id, user.id))).group_by(Chat.id).having(func.count(Chat.id) == 2).subquery()
existing = g.db.query(Chat.id).join(ChatMembership, ChatMembership.chat_id == Chat.id).filter(Chat.id == sq.c.id).group_by(Chat.id).having(func.count(Chat.id) == 2).one_or_none()
if existing:
return redirect(f"/chat/{existing.id}")