mirror of
https://github.com/kurbezz/discord-bot.git
synced 2025-12-06 07:05:36 +01:00
Fix
This commit is contained in:
@@ -140,30 +140,30 @@ class MessagesProc:
|
|||||||
MESSAGE_HISTORY = []
|
MESSAGE_HISTORY = []
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def update_message_history(cls, id: str, text: str, user: str, reply_to: str | None = None):
|
def update_message_history(cls, id: str, text: str, user: str, thread_id: str | None = None):
|
||||||
cls.MESSAGE_HISTORY.append({
|
cls.MESSAGE_HISTORY.append({
|
||||||
"id": id,
|
"id": id,
|
||||||
"text": text,
|
"text": text,
|
||||||
"user": user,
|
"user": user,
|
||||||
"reply_to": reply_to
|
"thread_id": thread_id
|
||||||
})
|
})
|
||||||
|
|
||||||
if len(cls.MESSAGE_HISTORY) > cls.MESSAGE_LIMIT:
|
if len(cls.MESSAGE_HISTORY) > cls.MESSAGE_LIMIT:
|
||||||
cls.MESSAGE_HISTORY = cls.MESSAGE_HISTORY[-cls.MESSAGE_LIMIT:]
|
cls.MESSAGE_HISTORY = cls.MESSAGE_HISTORY[-cls.MESSAGE_LIMIT:]
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_message_history_with_thread(cls, thread_id: str | None, current_deep: int = 5) -> list[dict]:
|
def get_message_history_with_thread(cls, message_id: str | None, current_deep: int = 5) -> list[dict]:
|
||||||
if thread_id is None:
|
if message_id is None:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
if current_deep > 5:
|
if current_deep > 5:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
message = next((message for message in cls.MESSAGE_HISTORY if message["id"] == thread_id), None)
|
message = next((message for message in cls.MESSAGE_HISTORY if message["id"] == message_id), None)
|
||||||
if message is None:
|
if message is None:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
return cls.get_message_history_with_thread(message["reply_to"], current_deep + 1) + [message]
|
return [message for message in cls.MESSAGE_HISTORY if message["thread_id"] == message_id] + [message]
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
async def on_message(cls, event: MessageEvent):
|
async def on_message(cls, event: MessageEvent):
|
||||||
@@ -173,7 +173,7 @@ class MessagesProc:
|
|||||||
id=event.message_id,
|
id=event.message_id,
|
||||||
text=event.message.text,
|
text=event.message.text,
|
||||||
user=event.chatter_user_login,
|
user=event.chatter_user_login,
|
||||||
reply_to=event.reply.parent_message_id if event.reply is not None else None
|
thread_id=event.reply.thread_message_id if event.reply is not None else None
|
||||||
)
|
)
|
||||||
|
|
||||||
if event.chatter_user_name == "pahangor":
|
if event.chatter_user_name == "pahangor":
|
||||||
|
|||||||
Reference in New Issue
Block a user