fix: corrected some errors in the cwl requests

pyclasher/api/requests/clan_current_war.py

@@ -1,5 +1,5 @@
 from .abc import RequestModel
-from ..models import ClanWar, BaseClan
+from ..models import ClanWar, BaseClan, ClanWarState
 
 
 class ClanCurrentWarRequest(RequestModel, ClanWar):
@@ -37,11 +37,16 @@ async def from_base_clan(cls, base_clan):
  async def request(self, client_id=None):
  await super().request(client_id)
 
- self._data['clan']['members'] = sorted(
- self._data['clan']['members'],
- key=lambda member: member['mapPosition']
- )
- self._data['opponent']['members'] = sorted(
- self._data['opponent']['members'],
- key=lambda member: member['mapPosition']
- )
+ if (self.state == ClanWarState.IN_WAR
+ or self.state == ClanWarState.WAR
+ or self.state == ClanWarState.PREPARATION
+ or self.state == ClanWarState.ENDED
+ ):
+ self._data['clan']['members'] = sorted(
+ self._data['clan']['members'],
+ key=lambda member: member['mapPosition']
+ )
+ self._data['opponent']['members'] = sorted(
+ self._data['opponent']['members'],
+ key=lambda member: member['mapPosition']
+ )

pyclasher/api/requests/clan_warleagues_wars.py

@@ -1,14 +1,16 @@
 from .abc import RequestModel
-from ..models import ClanWarLeagueGroup
+from ..models import ClanWar
 
 
-class ClanWarleaguesWarsRequest(RequestModel, ClanWarLeagueGroup):
+class ClanWarleaguesWarsRequest(RequestModel, ClanWar):
  """
  Retrieve information about individual clan war league war
  """
 
  def __init__(self, war_tag):
  self.war_tag = war_tag
- super().__init__("clanwarleagues/wars/{war_tag}",
- war_tag=self.war_tag)
+ RequestModel.__init__(self,
+ "clanwarleagues/wars/{war_tag}",
+ war_tag=self.war_tag)
+ ClanWar.__init__(self, None)
  return

pyclasher/api/requests/clan_warleagues_wars.pyi

@@ -1,8 +1,8 @@
 from .abc import RequestModel
-from ..models import ClanWarLeagueGroup
+from ..models import ClanWar
 
 
-class ClanWarleaguesWarsRequest(RequestModel, ClanWarLeagueGroup):
+class ClanWarleaguesWarsRequest(RequestModel, ClanWar):
  """
  Retrieve information about individual clan war league war
  """