mirror of
https://github.com/eternnoir/pyTelegramBotAPI.git
synced 2023-08-10 21:12:57 +03:00
Add message cache buffer.
This commit is contained in:
parent
b14cf1ecd4
commit
b5748b4d1f
@ -47,7 +47,7 @@ while True:
|
|||||||
## TODO
|
## TODO
|
||||||
|
|
||||||
- [x] getMe
|
- [x] getMe
|
||||||
- [ ] sendMessage
|
- [x] sendMessage
|
||||||
- [ ] forwardMessage
|
- [ ] forwardMessage
|
||||||
- [ ] sendPhoto
|
- [ ] sendPhoto
|
||||||
- [ ] sendAudio
|
- [ ] sendAudio
|
||||||
|
@ -36,6 +36,8 @@ class TeleBot:
|
|||||||
self.update_entries = {}
|
self.update_entries = {}
|
||||||
self.update_listener = []
|
self.update_listener = []
|
||||||
self.chat_list = {}
|
self.chat_list = {}
|
||||||
|
self.update_id_list = []
|
||||||
|
self.max_message_size = 100000
|
||||||
self.polling_thread = None
|
self.polling_thread = None
|
||||||
self.__stop_polling = False
|
self.__stop_polling = False
|
||||||
self.interval = 3
|
self.interval = 3
|
||||||
@ -50,23 +52,35 @@ class TeleBot:
|
|||||||
if update['update_id'] in self.update_entries:
|
if update['update_id'] in self.update_entries:
|
||||||
continue
|
continue
|
||||||
msg = types.Message.de_json(json.dumps(update['message']))
|
msg = types.Message.de_json(json.dumps(update['message']))
|
||||||
self.update_entries[update['update_id']] = msg
|
self.__append_message_to_cache(update['update_id'], msg)
|
||||||
notify_updates.append(msg)
|
notify_updates.append(msg)
|
||||||
self.__notify_update(notify_updates)
|
self.__notify_update(notify_updates)
|
||||||
|
|
||||||
|
def __append_message_to_cache(self, update_id, message):
|
||||||
|
# over buffer size
|
||||||
|
if len(self.update_id_list) > self.max_message_size:
|
||||||
|
# remove oldest element.
|
||||||
|
upid = self.update_id_list[0]
|
||||||
|
if upid in self.update_entries:
|
||||||
|
del self.update_entries[upid]
|
||||||
|
self.update_entries[update_id] = message
|
||||||
|
self.update_id_list.append(update_id)
|
||||||
|
|
||||||
def __notify_update(self, new_messages):
|
def __notify_update(self, new_messages):
|
||||||
for listener in self.update_listener:
|
for listener in self.update_listener:
|
||||||
t = threading.Thread(target=listener, args=(new_messages))
|
t = threading.Thread(target=listener, args=(new_messages))
|
||||||
t.start()
|
t.start()
|
||||||
|
|
||||||
def polling(self, interval):
|
def polling(self, interval=3):
|
||||||
"""
|
"""
|
||||||
Always get updates.
|
Always get updates.
|
||||||
:param interval: iterval secs.
|
:param interval: iterval secs.
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
|
self.interval = interval
|
||||||
|
# clear thread.
|
||||||
self.__stop_polling = True
|
self.__stop_polling = True
|
||||||
time.sleep(1)
|
time.sleep(interval + 1)
|
||||||
self.__stop_polling = False
|
self.__stop_polling = False
|
||||||
self.polling_thread = threading.Thread(target=self.__polling, args=())
|
self.polling_thread = threading.Thread(target=self.__polling, args=())
|
||||||
self.polling_thread.start()
|
self.polling_thread.start()
|
||||||
@ -95,3 +109,6 @@ class TeleBot:
|
|||||||
def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
|
def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
|
||||||
return apihelper.send_message(self.token, chat_id, text, disable_web_page_preview, reply_to_message_id,
|
return apihelper.send_message(self.token, chat_id, text, disable_web_page_preview, reply_to_message_id,
|
||||||
reply_markup)
|
reply_markup)
|
||||||
|
|
||||||
|
def forward_message(self, chat_id, from_chat_id, message_id):
|
||||||
|
return apihelper.forward_message(self.token, chat_id, from_chat_id, message_id)
|
||||||
|
@ -40,3 +40,11 @@ def get_updates(token):
|
|||||||
request_url = api_url+'bot'+token+'/'+method_url
|
request_url = api_url+'bot'+token+'/'+method_url
|
||||||
req = requests.get(request_url)
|
req = requests.get(request_url)
|
||||||
return req.json()
|
return req.json()
|
||||||
|
|
||||||
|
def forward_message(token,chat_id,from_chat_id,message_id):
|
||||||
|
api_url = telebot.API_URL
|
||||||
|
method_url = r'forwardMessage'
|
||||||
|
request_url = api_url+'bot'+token+'/'+method_url
|
||||||
|
payload = {'chat_id':chat_id,'from_chat_id':from_chat_id,'message_id':message_id}
|
||||||
|
req = requests.get(request_url,params=payload)
|
||||||
|
return req.json()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user