Merge pull request #21 from quillcraftsman/bugs

fix reply bug

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,5 +1,5 @@
 ---
-name: Отчет об ошибке
+name: Отчет об ошибке (Bub Report)
 about: Создайте отчет об ошибке, чтобы мы её исправили
 title: ''
 labels: ''

telegram_framework/chats.py

@@ -22,7 +22,7 @@ def add_bot(chat: Chat, bot: Any) -> Chat:
 
 def add_message(chat: Chat, message: Any) -> Chat:
     chat_message = message
-    if not isinstance(chat_message, messages.ChatMessageBase):
+    if not messages.is_chat_message(chat_message):
         chat_message = messages.create_chat_message(chat_message, chat)
     new_messages = chat.messages + [chat_message]
     chat = update(chat, messages=new_messages)

telegram_framework/messages/__init__.py

@@ -1,4 +1,4 @@
 from .message import Message
 from .reply import Reply, create_reply
 from .chat_message import ChatMessage, create_chat_message
-from .chat_message_base import ChatMessageBase
+from .chat_message_base import is_chat_message

telegram_framework/messages/chat_message_base.py

@@ -5,3 +5,7 @@
 @dataclass(frozen=True)
 class ChatMessageBase(MessageBase):
     chat: Any
+
+
+def is_chat_message(message):
+    return hasattr(message, 'chat')

telegram_framework/messages/reply.py

@@ -3,7 +3,7 @@
 from .errors import MessageNotInChatError
 from .message_default import MessageDefault
 from .reply_base import ReplyBase
-from .chat_message_base import ChatMessageBase
+from .chat_message_base import is_chat_message
 
 
 @dataclass(frozen=True)
@@ -18,8 +18,8 @@ def __eq__(self, other):
 
 
 
-def create_reply(message: ChatMessageBase, text:str, sender: Any) -> Reply:
-    if not isinstance(message, ChatMessageBase):
+def create_reply(message, text:str, sender: Any) -> Reply:
+    if not is_chat_message(message):
         raise MessageNotInChatError(message)
 
     return Reply(

telegram_framework/package.py

@@ -2,5 +2,5 @@
 Package info
 """
 name = 'django-telegram-framework'
-version = '1.0.0'
+version = '1.0.1'
 status = '3 - Alpha'