game_handler: add widget_content support

Author: fremiller

zulip_bots/zulip_bots/game_handler.py

@@ -3,7 +3,7 @@
 import random
 import logging
 from copy import deepcopy
-from typing import Any, Dict, Tuple, List
+from typing import Any, Dict, Tuple, List, Union
 from zulip_bots.test_lib import BotTestCase
 import operator
 import random
@@ -155,16 +155,17 @@ def confirm_invitation_declined(self, game_id: str) -> str:
         host = self.invites[game_id]['host']
         return 'Declined invitation to play **{}** from @**{}**.'.format(self.game_name, self.get_username_by_email(host))
 
-    def send_message(self, to: str, content: str, is_private: bool, subject: str='') -> None:
+    def send_message(self, to: str, content: str, is_private: bool, subject: str='', widget_content: str='') -> None:
         self.bot_handler.send_message(dict(
             type='private' if is_private else 'stream',
             to=to,
             content=content,
-            subject=subject
+            subject=subject,
+            widget_content=widget_content
         ))
 
-    def send_reply(self, original_message: Dict[str, Any], content: str) -> None:
-        self.bot_handler.send_reply(original_message, content)
+    def send_reply(self, original_message: Dict[str, Any], content: str, widget_content: str='') -> None:
+        self.bot_handler.send_reply(original_message, content, widget_content)
 
     def usage(self) -> str:
         return '''
@@ -713,20 +714,20 @@ def generate_game_id(self) -> str:
             id += valid_characters[random.randrange(0, len(valid_characters))]
         return id
 
-    def broadcast(self, game_id: str, content: str, include_private: bool=True) -> bool:
+    def broadcast(self, game_id: str, content: str, include_private: bool=True, widget_content: str='') -> bool:
         if include_private:
             private_recipients = self.get_players(game_id, parameter='p')
             if private_recipients is not None:
                 for user in private_recipients:
-                    self.send_message(user, content, True)
+                    self.send_message(user, content, True, '', widget_content)
         if game_id in self.invites.keys():
             if self.invites[game_id]['subject'] != '###private###':
                 self.send_message(
-                    self.invites[game_id]['stream'], content, False, self.invites[game_id]['subject'])
+                    self.invites[game_id]['stream'], content, False, self.invites[game_id]['subject'], widget_content)
                 return True
         if game_id in self.instances.keys():
             self.send_message(
-                self.instances[game_id].stream, content, False, self.instances[game_id].subject)
+                self.instances[game_id].stream, content, False, self.instances[game_id].subject, widget_content)
             return True
         return False
 
@@ -774,7 +775,7 @@ def __init__(self, gameAdapter: GameAdapter, is_private: bool, subject: str, gam
         self.board = self.model.current_board
         self.turn = random.randrange(0, len(players)) - 1
         self.current_draw = {}  # type: Dict[str, bool]
-        self.current_messages = []  # type: List[str]
+        self.current_messages = []  # type: List[Union[str, Tuple[str, str]]]
         self.is_changing_subject = False
 
     def start(self) -> None:
@@ -831,17 +832,17 @@ def handle_message(self, content: str, player_email: str) -> None:
                 user_turn_avatar = "!avatar({})".format(self.players[self.turn])
                 if self.gameAdapter.gameMessageHandler.get_player_color(self.turn) is None:
                     self.broadcast('{} It\'s **{}**\'s turn.'.format(
-                    user_turn_avatar,
-                    self.gameAdapter.get_username_by_email(
-                        self.players[self.turn])))
+                        user_turn_avatar,
+                        self.gameAdapter.get_username_by_email(
+                            self.players[self.turn])))
                 else:
                     self.broadcast('{} It\'s **{}**\'s ({}) turn.'.format(
                         user_turn_avatar,
                         self.gameAdapter.get_username_by_email(
                             self.players[self.turn]),
                         self.gameAdapter.gameMessageHandler.get_player_color(self.turn)))
 
-    def broadcast(self, content: str) -> None:
+    def broadcast(self, content: str, widget_content: str='') -> None:
         self.gameAdapter.broadcast(self.game_id, content)
 
     def check_draw(self) -> bool:
@@ -866,7 +867,11 @@ def make_move(self, content: str, is_computer: bool) -> None:
             return
         except BadMoveException as e:
             self.broadcast(e.message)
-            self.broadcast(self.parse_current_board())
+            current_board_message = self.parse_current_board
+            if isinstance(current_board_message, tuple):
+                self.broadcast(
+                    current_board_message[0], current_board_message[1])
+            self.broadcast(str(current_board_message))
             return
         if not is_computer:
             self.current_messages.append(self.gameAdapter.gameMessageHandler.alert_move_message(
@@ -926,8 +931,15 @@ def next_turn(self) -> None:
             self.make_move('', True)
 
     def broadcast_current_message(self) -> None:
-        content = '\n\n'.join(self.current_messages)
-        self.broadcast(content)
+        # if there are no widgets, send all the messages all at once
+        if len(list(filter(lambda x: isinstance(x, tuple), self.current_messages))) == 0:
+            self.broadcast("\n\n".join(str(m) for m in self.current_messages))
+        else:
+            for message in self.current_messages:
+                if isinstance(message, tuple):
+                    self.broadcast(message[0], message[1])
+                else:
+                    self.broadcast(str(message))
         self.current_messages = []
 
     def parse_current_board(self) -> Any: