forked from rDrama/rDrama
remove chatleave, if someone keeps getting added by someone they can mute him to stop it
parent
6fd2df947f
commit
b4d7ea2080
|
@ -49,20 +49,6 @@ class ChatMembership(Base):
|
||||||
return f"<{self.__class__.__name__}(user_id={self.user_id}, chat_id={self.chat_id})>"
|
return f"<{self.__class__.__name__}(user_id={self.user_id}, chat_id={self.chat_id})>"
|
||||||
|
|
||||||
|
|
||||||
class ChatLeave(Base):
|
|
||||||
__tablename__ = "chat_leaves"
|
|
||||||
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
|
|
||||||
chat_id = Column(Integer, ForeignKey("chats.id"), primary_key=True)
|
|
||||||
created_utc = Column(Integer)
|
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
|
|
||||||
super().__init__(*args, **kwargs)
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return f"<{self.__class__.__name__}(user_id={self.user_id}, chat_id={self.chat_id})>"
|
|
||||||
|
|
||||||
|
|
||||||
class ChatMessage(Base):
|
class ChatMessage(Base):
|
||||||
__tablename__ = "chat_messages"
|
__tablename__ = "chat_messages"
|
||||||
id = Column(Integer, primary_key=True)
|
id = Column(Integer, primary_key=True)
|
||||||
|
|
|
@ -130,8 +130,7 @@ def speak(data, v):
|
||||||
user = get_user(i.group(1), graceful=True, attributes=[User.id])
|
user = get_user(i.group(1), graceful=True, attributes=[User.id])
|
||||||
if user and not user.has_muted(v) and not user.has_blocked(v):
|
if user and not user.has_muted(v) and not user.has_blocked(v):
|
||||||
existing = g.db.query(ChatMembership.user_id).filter_by(user_id=user.id, chat_id=chat_id).one_or_none()
|
existing = g.db.query(ChatMembership.user_id).filter_by(user_id=user.id, chat_id=chat_id).one_or_none()
|
||||||
leave = g.db.query(ChatLeave.user_id).filter_by(user_id=user.id, chat_id=chat_id).one_or_none()
|
if not existing:
|
||||||
if not existing and not leave:
|
|
||||||
chat_membership = ChatMembership(
|
chat_membership = ChatMembership(
|
||||||
user_id=user.id,
|
user_id=user.id,
|
||||||
chat_id=chat_id,
|
chat_id=chat_id,
|
||||||
|
|
|
@ -146,12 +146,6 @@ def leave_chat(v, chat_id):
|
||||||
|
|
||||||
g.db.delete(membership)
|
g.db.delete(membership)
|
||||||
|
|
||||||
chat_leave = ChatLeave(
|
|
||||||
user_id=v.id,
|
|
||||||
chat_id=chat_id,
|
|
||||||
)
|
|
||||||
g.db.add(chat_leave)
|
|
||||||
|
|
||||||
return {"message": "Chat left successfully!"}
|
return {"message": "Chat left successfully!"}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue