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 #1529 from coder2020official/state-fixes

Browse Source 
Allow only state objects
This commit is contained in:
Badiboy
2022-05-03 13:02:24 +03:00
committed by GitHub
parent 59cd1a00e7 f9cd0d7e08
commit 2d8c2312e3
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telebot/asyncio_storage/memory_storage.py
View File

@@ -8,7 +8,7 @@ class StateMemoryStorage(StateStorageBase):
async def set_state(self, chat_id, user_id, state): async def set_state(self, chat_id, user_id, state):
if isinstance(state, object): if hasattr(state, 'name'):
state = state.name state = state.name
if chat_id in self.data: if chat_id in self.data:
if user_id in self.data[chat_id]: if user_id in self.data[chat_id]:

3
telebot/asyncio_storage/pickle_storage.py
View File

@@ -1,7 +1,6 @@
from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext
import os import os
import pickle import pickle
@@ -47,7 +46,7 @@ class StatePickleStorage(StateStorageBase):
file.close() file.close()
async def set_state(self, chat_id, user_id, state): async def set_state(self, chat_id, user_id, state):
if isinstance(state, object): if hasattr(state, 'name'):
state = state.name state = state.name
if chat_id in self.data: if chat_id in self.data:
if user_id in self.data[chat_id]: if user_id in self.data[chat_id]:

3
telebot/asyncio_storage/redis_storage.py
View File

@@ -1,6 +1,7 @@
from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext
import json import json
redis_installed = True redis_installed = True
try: try:
import aioredis import aioredis
@@ -65,7 +66,7 @@ class StateRedisStorage(StateStorageBase):
""" """
response = await self.get_record(chat_id) response = await self.get_record(chat_id)
user_id = str(user_id) user_id = str(user_id)
if isinstance(state, object): if hasattr(state, 'name'):
state = state.name state = state.name
if response: if response:
if user_id in response: if user_id in response:

3
telebot/storage/memory_storage.py
View File

@@ -1,5 +1,6 @@
from telebot.storage.base_storage import StateStorageBase, StateContext from telebot.storage.base_storage import StateStorageBase, StateContext
class StateMemoryStorage(StateStorageBase): class StateMemoryStorage(StateStorageBase):
def __init__(self) -> None: def __init__(self) -> None:
self.data = {} self.data = {}
@@ -8,7 +9,7 @@ class StateMemoryStorage(StateStorageBase):
def set_state(self, chat_id, user_id, state): def set_state(self, chat_id, user_id, state):
if isinstance(state, object): if hasattr(state, 'name'):
state = state.name state = state.name
if chat_id in self.data: if chat_id in self.data:
if user_id in self.data[chat_id]: if user_id in self.data[chat_id]:

3
telebot/storage/pickle_storage.py
View File

@@ -1,7 +1,6 @@
from telebot.storage.base_storage import StateStorageBase, StateContext from telebot.storage.base_storage import StateStorageBase, StateContext
import os import os
import pickle import pickle
@@ -53,7 +52,7 @@ class StatePickleStorage(StateStorageBase):
file.close() file.close()
def set_state(self, chat_id, user_id, state): def set_state(self, chat_id, user_id, state):
if isinstance(state, object): if hasattr(state, 'name'):
state = state.name state = state.name
if chat_id in self.data: if chat_id in self.data:
if user_id in self.data[chat_id]: if user_id in self.data[chat_id]:

2
telebot/storage/redis_storage.py
View File

@@ -65,7 +65,7 @@ class StateRedisStorage(StateStorageBase):
""" """
response = self.get_record(chat_id) response = self.get_record(chat_id)
user_id = str(user_id) user_id = str(user_id)
if isinstance(state, object): if hasattr(state, 'name'):
state = state.name state = state.name
if response: if response: