Merge pull request #33 from MathieuMarthy/develop

Develop

Author: MathieuMarthy

commands/everyone/lol_rank.py

@@ -1,7 +1,5 @@
-from typing import Tuple, Callable
-
-import discord as lib_discord
-import discord.ui
+import discord 
+from discord import Embed
 from discord import app_commands
 from discord.ext import commands
 
@@ -17,17 +15,17 @@ def __init__(self, client: commands.Bot) -> None:
         self.client = client
         self.riotService = RiotRankService()
 
-    def create_player_embed(self, memberRankLol: MemberRankLol) -> lib_discord.Embed:
+    def create_player_embed(self, memberRankLol: MemberRankLol) -> Embed:
         if memberRankLol.empty_lol_data():
-            embed = lib_discord.Embed(
+            embed = Embed(
                 title=f"{memberRankLol.riotName}#{memberRankLol.tag}",
                 description="Unranked",
                 color=0x000000
             )
             embed.set_thumbnail(url=self.riotService.get_icone_url(memberRankLol.profileIconId))
             return embed
 
-        embed = lib_discord.Embed(
+        embed = Embed(
             title=f"{memberRankLol.riotName}#{memberRankLol.tag}",
             description=f"{memberRankLol.rank.emote} {memberRankLol.rank.name} {memberRankLol.get_division()} {memberRankLol.lp} LP",
             color=int(memberRankLol.rank.color, 16)
@@ -43,8 +41,8 @@ def create_player_embed(self, memberRankLol: MemberRankLol) -> lib_discord.Embed
     @app_commands.describe(riot_name="votre nom d'invocateur")
     @app_commands.describe(tag="votre tag")
     @app_commands.describe(discord="compte discord du joueur, par défaut votre compte")
-    async def register(self, interaction: lib_discord.Interaction, riot_name: str, tag: str,
-                       discord: lib_discord.Member = None):
+    async def register(self, interaction: discord.Interaction, riot_name: str, tag: str,
+                       discord: discord.Member = None):
         try:
             discord_id = interaction.user.id if discord is None else discord.id
 
@@ -66,7 +64,7 @@ async def register(self, interaction: lib_discord.Interaction, riot_name: str, t
         await interaction.response.send_message(embed=embed, content=None)
 
     @app_commands.command(name="lol_leaderboard", description="affiche le leaderboard des joueurs du serveur")
-    async def leaderboard(self, interaction: lib_discord.Interaction):
+    async def leaderboard(self, interaction: discord.Interaction):
         await interaction.response.defer(ephemeral=False, thinking=True)
 
         try:
@@ -94,7 +92,7 @@ async def leaderboard(self, interaction: lib_discord.Interaction):
 
     @app_commands.command(name="show_lol_rank", description="affiche le rank LoL d'un joueur")
     @app_commands.describe(discord="compte discord du joueur, par défaut votre compte")
-    async def show_rank(self, interaction: lib_discord.Interaction, discord: lib_discord.Member):
+    async def show_rank(self, interaction: discord.Interaction, discord: discord.Member):
         discord_id = interaction.user.id if discord is None else discord.id
 
         memberLolAccounts = self.riotService.get_member_accounts(interaction.guild_id, discord_id)
@@ -103,7 +101,7 @@ async def show_rank(self, interaction: lib_discord.Interaction, discord: lib_dis
             await interaction.response.send_message("Ce joueur n'est pas enregistré", ephemeral=True)
             return
 
-        async def send_message(embeds_to_send: list[lib_discord.Embed]):
+        async def send_message(embeds_to_send: list[Embed]):
             if len(embeds_to_send) != len(memberLolAccounts):
                 return await interaction.followup.send(embeds=embeds_to_send, content=None)
 
@@ -121,7 +119,7 @@ async def send_message(embeds_to_send: list[lib_discord.Embed]):
 
     @app_commands.command(name="remove_lol_account", description="supprime un compte LoL")
     @app_commands.describe(riot_name="le nom du compte à supprimer")
-    async def remove_account(self, interaction: lib_discord.Interaction, riot_name: str):
+    async def remove_account(self, interaction: discord.Interaction, riot_name: str):
         memberRankLol = self.riotService.remove_member_by_name(interaction.guild_id, interaction.user.id, riot_name)
 
         if not memberRankLol:
@@ -133,7 +131,7 @@ async def remove_account(self, interaction: lib_discord.Interaction, riot_name:
 
     @app_commands.command(name="lol_ranked_history", description="affiche les 10 dernières parties classées")
     @app_commands.describe(discord="compte discord du joueur, par défaut votre compte")
-    async def ranked_history(self, interaction: lib_discord.Interaction, discord: lib_discord.Member = None):
+    async def ranked_history(self, interaction: discord.Interaction, discord: discord.Member = None):
         await interaction.response.defer(ephemeral=False, thinking=True)
         discord_id = interaction.user.id if discord is None else discord.id
 
@@ -142,29 +140,28 @@ async def ranked_history(self, interaction: lib_discord.Interaction, discord: li
             await interaction.followup.send("Ce joueur n'est pas enregistré", ephemeral=True)
             return
 
-        account = accounts[0]
-
-        ranked_history = self.riotService.riot_api.get_ranked_history(account.puuid)
-        games_information = self.riotService.riot_api.get_matchs_data(ranked_history)
-        player_game_info = [PlayerGameInfoLoL(game, account.puuid) for game in games_information]
-
-        number_of_wins = len([game for game in player_game_info if game.status == GameStatus.WIN.value])
-        number_of_games = len([game for game in player_game_info if game.status != GameStatus.REMAKE.value])
-        winrate = round((number_of_wins / number_of_games) * 100, 2) if number_of_games != 0 else 0
-        description = f"Winrate sur {number_of_games} games: {winrate}%\n\n"
-
-        view = ViewPages(
-            interaction,
-            f"Historique de {account.riotName}#{account.tag}",
-            player_game_info,
-            10,
-            lambda game: f"{game.status}: {game.championName} - {game.kills}/{game.deaths}/{game.assists} - {game.gameDuration // 60}m{game.gameDuration % 60}s - <t:{game.endTime // 1000}:R>",
-            description=description,
-            defer_was_called_on_interaction=True
-        )
-
-        await view.start()
-
+        embeds = []
+        for account in accounts:
+            # fetch data
+            ranked_history = self.riotService.riot_api.get_ranked_history(account.puuid)
+            games_information = self.riotService.riot_api.get_matchs_data(ranked_history)
+            player_game_info = [PlayerGameInfoLoL(game, account.puuid) for game in games_information]
+
+            # sorting data
+            number_of_wins = len([game for game in player_game_info if game.status == GameStatus.WIN.value])
+            number_of_games = len([game for game in player_game_info if game.status != GameStatus.REMAKE.value])
+            winrate = round((number_of_wins / number_of_games) * 100, 2) if number_of_games != 0 else 0
+            description = f"Winrate sur {number_of_games} games: {winrate}%\n\n"
+
+            # create embeds
+            for game in player_game_info:
+                description += f"{game.status} {game.championName} - {game.kills}/{game.deaths}/{game.assists} - <t:{game.endTime // 1000}:R>\n"
+
+            embed = Embed(title=f"Ranked History - {account.getName()}", description=description)
+            embed.set_thumbnail(url=self.riotService.get_icone_url(account.profileIconId))
+            embeds.append(embed)
+
+        await interaction.followup.send(embeds=embeds)
 
 async def setup(bot):
     await bot.add_cog(LolRank(bot))

models/riot/PlayerGameInfoLoL.py

@@ -2,9 +2,9 @@
 
 
 class GameStatus(Enum):
-    WIN = "WIN"
-    LOSE = "LOSE"
-    REMAKE = "REMAKE"
+    WIN = "<:up:1427005238455566458>"
+    LOSE = "<:down:1427005236848885891>"
+    REMAKE = "🔄️"
 
 
 class PlayerGameInfoLoL:

models/riot/memberRankLol.py

@@ -133,3 +133,7 @@ def from_json(json: dict, discordId: int) -> "MemberRankLol":
         member.lastGame = json.get("lastGame", 0)
         member.profileIconId = json.get("profileIconId", 0)
         return member
+
+
+    def getName(self) -> str:
+        return f"{self.riotName}#{self.tag}"