Merge pull request #140 from doluk/cwl_fix_2

Fix bug with league wars where the first clan isn't the searched clan…

Author: mathsman5133

coc/client.py

@@ -1018,10 +1018,12 @@ async def get_current_war(
 
         if cwl_round is WarRound.current_war and league_group.state == "preparation":
             return None  # for round 1 and 15min prep between rounds this is a shortcut.
-        elif cwl_round is WarRound.current_preparation and league_group.state == "warEnded":
+        elif cwl_round is WarRound.current_preparation and league_group.state == "ended":
             return None  # for the end of CWL there's no next prep day.
         elif cwl_round is WarRound.previous_war and len(league_group.rounds) == 1:
             return None  # no previous war for first rounds.
+        elif cwl_round is WarRound.current_war and league_group.state == "ended":
+            round_tags = league_group.rounds[-1] # for the end of CWL current_war should give the last war
         elif cwl_round is WarRound.previous_war and is_prep:
             round_tags = league_group.rounds[-2]
         elif cwl_round is WarRound.previous_war:
@@ -1038,6 +1040,11 @@ async def get_current_war(
         async for war in self.get_league_wars(round_tags, cls=cls, **kwargs):
             if war.clan_tag == clan_tag:
                 return war
+            elif war.opponent.tag == clan_tag:
+                tmp = war.clan
+                war.clan = war.opponent
+                war.opponent = tmp
+                return war
 
     def get_current_wars(
         self,

coc/wars.py

@@ -420,7 +420,7 @@ def _from_data(self, data: dict) -> None:
         self.state: str = data_get("state")
         self.season: str = data_get("season")
 
-        rounds = data_get("rounds")
+        rounds = data_get("rounds", [])
         self.number_of_rounds: int = len(rounds)
         # the API returns a list and the rounds that haven't started contain war tags of #0 (not sure why)...
         # we want to get only the valid rounds