game_handler: add widget_content support

Author: fremiller

zulip_bots/zulip_bots/game_handler.py

@@ -155,16 +155,19 @@ 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:
+        if widget_content is '':
+            widget_content = 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 +716,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
 
@@ -841,7 +844,7 @@ def handle_message(self, content: str, player_email: str) -> None:
                             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 +869,10 @@ 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(current_board_message)
             return
         if not is_computer:
             self.current_messages.append(self.gameAdapter.gameMessageHandler.alert_move_message(
@@ -926,8 +932,11 @@ 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)
+        for message in self.current_messages:
+            if isinstance(message, tuple):
+                self.broadcast(message[0], message[1])
+            else:
+                self.broadcast(message)
         self.current_messages = []
 
     def parse_current_board(self) -> Any: