mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Merge pull request #79 from huiyiqun/master

Browse Source 
fix race-condition for register_for_reply
This commit is contained in:
FrankWang 2015-09-30 22:50:08 +08:00
commit 9cd28b88be
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
telebot/__init__.py
View File

@ -56,6 +56,7 @@ class TeleBot:
self.message_subscribers_messages = [] self.message_subscribers_messages = []
self.message_subscribers_callbacks = [] self.message_subscribers_callbacks = []
self.message_subscribers_lock = threading.Lock()
# key: chat_id, value: handler list # key: chat_id, value: handler list
self.message_subscribers_next_step = {} self.message_subscribers_next_step = {}
@ -336,11 +337,12 @@ class TeleBot:
:param callback: The callback function to be called when a reply arrives. Must accept one `message` :param callback: The callback function to be called when a reply arrives. Must accept one `message`
parameter, which will contain the replied message. parameter, which will contain the replied message.
""" """
self.message_subscribers_messages.insert(0, message.message_id) with self.message_subscribers_lock:
self.message_subscribers_callbacks.insert(0, callback) self.message_subscribers_messages.insert(0, message.message_id)
if len(self.message_subscribers_messages) > 10000: self.message_subscribers_callbacks.insert(0, callback)
self.message_subscribers_messages.pop() if len(self.message_subscribers_messages) > 10000:
self.message_subscribers_callbacks.pop() self.message_subscribers_messages.pop()
self.message_subscribers_callbacks.pop()
def _notify_message_subscribers(self, new_messages): def _notify_message_subscribers(self, new_messages):
for message in new_messages: for message in new_messages:
@ -352,8 +354,10 @@ class TeleBot:
index = self.message_subscribers_messages.index(reply_msg_id) index = self.message_subscribers_messages.index(reply_msg_id)
self.message_subscribers_callbacks[index](message) self.message_subscribers_callbacks[index](message)
del self.message_subscribers_messages[index] with self.message_subscribers_lock:
del self.message_subscribers_callbacks[index] index = self.message_subscribers_messages.index(reply_msg_id)
del self.message_subscribers_messages[index]
del self.message_subscribers_callbacks[index]
def register_next_step_handler(self, message, callback): def register_next_step_handler(self, message, callback):
""" """