TASK: Add join_id to player class

fixes #47

Author: devcarron

game/blackJack.py

@@ -26,9 +26,8 @@ def add_player(self, user_id, first_name, message_id, silent=False):
         if not self.game_running:
             if self.get_index_by_user_id(user_id) is None and len(self.players) < self.MAX_PLAYERS:
                 self.logger.debug("Adding user '" + first_name + "' to players.")
-                player = Player(user_id, first_name, self.deck)
+                player = Player(user_id, first_name, self.deck, join_id=message_id)
                 self.players.append(player)
-                self.join_message_ids.append(message_id)
 
                 if silent is False:
                     # When the parameter 'silent' is not set, a message will be sent.
@@ -53,11 +52,12 @@ def get_user_by_user_id(self, user_id):
     def next_player(self):
         if self.game_running:
             if self.current_player is not None and self.current_player < (len(self.players) - 1):
+                user = self.players[self.current_player]
                 self.logger.debug("Next Player!")
                 self.current_player += 1
                 self.send_message(self.chat_id, translate("overview", self.lang_id) + "\n\n" + self.get_player_overview(show_points=True) + "\n" +
                                   translate("nextPlayer", self.lang_id).format(self.players[self.current_player].get_first_name()),
-                                  message_id=self.join_message_ids[self.current_player], reply_markup=self.keyboard_running, game_id=self.__game_id)
+                                  message_id=user.join_id, reply_markup=self.keyboard_running, game_id=self.__game_id)
 
                 self.give_player_one()
             else:
@@ -88,7 +88,7 @@ def give_player_one(self):
                 else:
                     self.send_message(self.chat_id, str(translate("yourCardsAre", self.lang_id).format(
                         user.first_name, cards_string, str(user.cardvalue))), reply_markup=self.keyboard_running,
-                                      message_id=self.join_message_ids[self.current_player], game_id=self.__game_id)
+                                      message_id=user.join_id, game_id=self.__game_id)
             else:
                 card = self.deck.pick_one_card()
                 cardvalue = self.deck.get_card_value(card)
@@ -304,7 +304,6 @@ def get_game_id(self) -> int:
     def __init__(self, chat_id, user_id, lang_id, first_name, game_handler, message_id, send_message, multiplayer=None, game_id=None):
         # declare variables and set initial values
         self.players = []
-        self.join_message_ids = []
         self.chat_id = chat_id
         self.__game_id = game_id
         self.lang_id = lang_id

game/player.py

@@ -49,13 +49,17 @@ def get_cardvalue(self):
 
     def get_userid(self):
         return self.user_id
+    @property
+    def join_id(self):
+        return self.__join_id
 
     def get_lang_id(self):
         return self.lang_id
 
-    def __init__(self, user_id, first_name, deck, lang_id="en"):
         self.user_id = user_id
+    def __init__(self, user_id, first_name, deck, join_id, lang_id="en"):
         self.first_name = first_name
+        self.__join_id = join_id
         self.lang_id = lang_id
         self.deck = deck
         self.number_of_cards = 0