fix mentions

ExpressApp · Mar 25, 2019 · eb6ec56 · eb6ec56
1 parent 149873b
commit eb6ec56
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 37 deletions.
diff --git a/botx/bot/asyncbot.py b/botx/bot/asyncbot.py
@@ -14,11 +14,10 @@
     KeyboardElement,
     Mention,
     ResponseCommand,
-    ResponseCommandResult,
     ResponseFile,
     ResponseNotification,
-    ResponseNotificationResult,
     ResponseRecipientsEnum,
+    ResponseResult,
     Status,
     SyncID,
 )
@@ -157,16 +156,15 @@ async def _send_command_result(
         bubble: List[List[BubbleElement]],
         keyboard: List[List[KeyboardElement]],
     ) -> Tuple[str, int]:
-        response_result = ResponseCommandResult(
-            body=text, bubble=bubble, keyboard=keyboard
+        response_result = ResponseResult(
+            body=text, bubble=bubble, keyboard=keyboard, mentions=mentions
         )
 
         response = ResponseCommand(
             bot_id=bot_id,
             sync_id=str(chat_id),
             command_result=response_result,
             recipients=recipients,
-            mentions=mentions,
             file=file,
         )
 
@@ -195,15 +193,14 @@ async def _send_notification_result(
         bubble: List[List[BubbleElement]],
         keyboard: List[List[KeyboardElement]],
     ) -> Tuple[str, int]:
-        response_result = ResponseNotificationResult(
-            body=text, bubble=bubble, keyboard=keyboard
+        response_result = ResponseResult(
+            body=text, bubble=bubble, keyboard=keyboard, mentions=mentions
         )
         response = ResponseNotification(
             bot_id=bot_id,
             notification=response_result,
             group_chat_ids=group_chat_ids,
             recipients=recipients,
-            mentions=mentions,
             file=file,
         )
 

diff --git a/botx/bot/syncbot.py b/botx/bot/syncbot.py
@@ -15,11 +15,10 @@
     KeyboardElement,
     Mention,
     ResponseCommand,
-    ResponseCommandResult,
     ResponseFile,
     ResponseNotification,
-    ResponseNotificationResult,
     ResponseRecipientsEnum,
+    ResponseResult,
     Status,
     SyncID,
 )
@@ -154,16 +153,15 @@ def _send_command_result(
         bubble: List[List[BubbleElement]],
         keyboard: List[List[KeyboardElement]],
     ) -> Tuple[str, int]:
-        response_result = ResponseCommandResult(
-            body=text, bubble=bubble, keyboard=keyboard
+        response_result = ResponseResult(
+            body=text, bubble=bubble, keyboard=keyboard, mentions=mentions
         )
 
         response = ResponseCommand(
             bot_id=bot_id,
             sync_id=str(chat_id),
             command_result=response_result,
             recipients=recipients,
-            mentions=mentions,
             file=file,
         )
 
@@ -192,15 +190,14 @@ def _send_notification_result(
         bubble: List[List[BubbleElement]],
         keyboard: List[List[KeyboardElement]],
     ) -> Tuple[str, int]:
-        response_result = ResponseNotificationResult(
-            body=text, bubble=bubble, keyboard=keyboard
+        response_result = ResponseResult(
+            body=text, bubble=bubble, keyboard=keyboard, mentions=mentions
         )
         response = ResponseNotification(
             bot_id=bot_id,
             notification=response_result,
             group_chat_ids=group_chat_ids,
             recipients=recipients,
-            mentions=mentions,
             file=file,
         )
 

diff --git a/botx/types/__init__.py b/botx/types/__init__.py
@@ -16,10 +16,8 @@
 from .message import Message, MessageCommand, MessageUser
 from .response import (
     ResponseCommand,
-    ResponseCommandResult,
     ResponseFile,
     ResponseNotification,
-    ResponseNotificationResult,
     ResponseResult,
 )
 from .status import Status, StatusResult
diff --git a/botx/types/response.py b/botx/types/response.py
@@ -15,32 +15,23 @@ class ResponseResult(BotXType):
     commands: List[MenuCommand] = []
     keyboard: List[List[KeyboardElement]] = []
     bubble: List[List[BubbleElement]] = []
+    mentions: List[Mention] = []
 
 
-class ResponseCommandResult(ResponseResult):
-    pass
-
-
-class ResponseNotificationResult(ResponseResult):
-    pass
-
-
-class ResponseCommand(BotXType):
-    sync_id: SyncID
+class BaseResponse(BotXType):
     bot_id: UUID
     recipients: Union[List[UUID], ResponseRecipientsEnum] = ResponseRecipientsEnum.all
-    command_result: ResponseCommandResult
-    mentions: List[Mention] = []
     file: Optional[File] = None
 
 
-class ResponseNotification(BotXType):
-    bot_id: UUID
-    recipients: Union[List[UUID], ResponseRecipientsEnum] = ResponseRecipientsEnum.all
+class ResponseCommand(BaseResponse):
+    sync_id: SyncID
+    command_result: ResponseResult
+
+
+class ResponseNotification(BaseResponse):
     group_chat_ids: List[UUID] = []
-    notification: ResponseNotificationResult
-    mentions: List[Mention] = []
-    file: Optional[File] = None
+    notification: ResponseResult
 
 
 class ResponseFile(BotXType):

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "botx"
-version = "1.0.0a7"
+version = "1.0.0a8"
 description = "Python implementation for Express BotX API"
 authors = [
     "Michael Morozov <mmorozov@ccsteam.ru>",