fix: only repeat the message when it appears continuously
This commit is contained in:
parent
359f3aee88
commit
540b50c4d8
2 changed files with 16 additions and 11 deletions
|
@ -10,32 +10,37 @@ class MessageRepeater:
|
|||
self.message_counts = defaultdict(lambda: defaultdict(int))
|
||||
self.repeated_messages = defaultdict(set)
|
||||
self.message_timestamps = defaultdict(lambda: defaultdict(float))
|
||||
self.last_messages = defaultdict(str) # Track last message in each chat
|
||||
self.expiry_seconds = message_expiry_seconds
|
||||
|
||||
async def handle_message(self, message: aiogram.types.Message):
|
||||
"""Handle incoming messages and repeat when a threshold is met"""
|
||||
chat_id = message.chat.id
|
||||
text = message.text
|
||||
content = ''
|
||||
if message.text:
|
||||
content = message.text
|
||||
elif message.sticker:
|
||||
content = message.sticker.file_id
|
||||
|
||||
if not config.is_feature_enabled('repeater', message.chat.id):
|
||||
return
|
||||
|
||||
if not text:
|
||||
return
|
||||
|
||||
# Clean expired messages
|
||||
self._clean_expired_messages(chat_id)
|
||||
|
||||
# Increment message count
|
||||
self.message_counts[chat_id][text] += 1
|
||||
self.message_timestamps[chat_id][text] = time.time()
|
||||
self.message_counts[chat_id][content] += 1
|
||||
self.message_timestamps[chat_id][content] = time.time()
|
||||
|
||||
# If a message appears twice and hasn't been repeated yet
|
||||
if (self.message_counts[chat_id][text] >= 2 and
|
||||
text not in self.repeated_messages[chat_id]):
|
||||
if (content == self.last_messages[chat_id] and
|
||||
self.message_counts[chat_id][content] >= 2 and
|
||||
content not in self.repeated_messages[chat_id]):
|
||||
# Mark as repeated and send the message
|
||||
self.repeated_messages[chat_id].add(text)
|
||||
await message.answer(text)
|
||||
self.repeated_messages[chat_id].add(content)
|
||||
await message.copy_to(chat_id)
|
||||
|
||||
self.last_messages[chat_id] = content
|
||||
|
||||
def _clean_expired_messages(self, chat_id: int):
|
||||
"""Remove messages older than expiry_seconds"""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue