Merge pull request #1529 from coder2020official/state-fixes

Allow only state objects

telebot/asyncio_storage/memory_storage.py

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

telebot/asyncio_storage/pickle_storage.py

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

telebot/asyncio_storage/redis_storage.py

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

telebot/storage/memory_storage.py

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

telebot/storage/pickle_storage.py

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

telebot/storage/redis_storage.py

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