7 enhancement 30 day leaderbord (#131)

Author: PantomInach

button_views/leaderboard_buttons.py

@@ -1,6 +1,8 @@
 import discord
 from enum import Enum
 
+from datahandler.tempLeaderboard import SortBy
+
 
 class SortedByEnum(Enum):
     XP = 0
@@ -9,18 +11,17 @@ class SortedByEnum(Enum):
 
 
 class LeaderboardButtons(discord.ui.View):
-    def __init__(self, utils):
+    def __init__(self, utils, timeFrame=None):
         self.sorted_by = SortedByEnum.XP
+        self.timeFrame = timeFrame
         self.utils = utils
         super().__init__(timeout=None)
 
     # @discord.ui.button(label="Page:", row=0, disabled=True, style=discord.ButtonStyle.secondary)
     # async def page_spacer(self, interaction: discord.Interaction, button: discord.ui.Button):
     #     await interaction.response.defer(ephemeral=False)
 
-    @discord.ui.button(
-        label="TOP", row=0, style=discord.ButtonStyle.primary, emoji="⏫"
-    )
+    @discord.ui.button(label="TOP", row=0, style=discord.ButtonStyle.primary, emoji="⏫")
     async def go_to_page_one(
         self, interaction: discord.Interaction, button: discord.ui.Button
     ):
@@ -41,9 +42,7 @@ async def go_to_page_one(
             print("Error: Leaderboard button should have have a message")
         await interaction.response.defer(ephemeral=False)
 
-    @discord.ui.button(
-        label="UP", row=0, style=discord.ButtonStyle.primary, emoji="⬆"
-    )
+    @discord.ui.button(label="UP", row=0, style=discord.ButtonStyle.primary, emoji="⬆")
     async def previous_page(
         self, interaction: discord.Interaction, button: discord.ui.Button
     ):
@@ -98,9 +97,7 @@ async def next_page(
     # async def sort_by_spacer(self, interaction: discord.Interaction, button: discord.ui.Button):
     #     await interaction.response.defer(ephemeral=False)
 
-    @discord.ui.button(
-        label="EXP", row=1, style=discord.ButtonStyle.primary, emoji="🌟"
-    )
+    @discord.ui.button(label="EXP", row=1, style=discord.ButtonStyle.primary, emoji="🌟")
     async def sort_by_xp(
         self, interaction: discord.Interaction, button: discord.ui.Button
     ):
@@ -171,5 +168,25 @@ async def sort_by_messages(
         await interaction.response.defer(ephemeral=False)
 
     def _getLeaderBoard(self, page: int, sortBy: SortedByEnum) -> str:
+        if self.timeFrame:
+            return self._getTempLeaderBoard(page, sortBy)
+        else:
+            return self._getLeaderBoard(page, sortBy)
+
+    def _getTotalLeaderBoard(self, page: int, sortBy: SortedByEnum) -> str:
         leaderboard_text = self.utils.getLeaderboardPageBy(page, sortBy.value)
         return leaderboard_text
+
+    def _getTempLeaderBoard(self, page: int, sortByEnum: SortedByEnum) -> str:
+        if sortByEnum == SortedByEnum.XP:
+            sortBy = SortBy.VOICE_TEXT
+        elif sortByEnum == SortedByEnum.VOICE:
+            sortBy = SortBy.VOICE
+        elif sortByEnum == SortedByEnum.MESSAGES:
+            sortBy = SortBy.TEXTCOUNT
+        else:
+            sortBy = SortBy.NULL
+        leaderboard_text = self.utils.getTempLeaderboardPageBy(
+            page, sortBy, self.timeFrame
+        )
+        return leaderboard_text

button_views/poll_buttons.py

@@ -12,6 +12,7 @@ class PollView(discord.ui.View):
 
     Note that after a bot restart the polls need to be reopened.
     """
+
     def __init__(self, button_amount: int, poll: Poll, pollID: int):
         self.button_amount: int = button_amount
         self.poll: Poll = poll
@@ -22,7 +23,12 @@ def __init__(self, button_amount: int, poll: Poll, pollID: int):
 
     def _create_button(self, vote_for_option: int) -> Button:
         button = VoteForButton(
-            vote_for_option, self.poll, self.pollID, style=discord.ButtonStyle.primary, emoji=POLL_EMOJIS[vote_for_option])
+            vote_for_option,
+            self.poll,
+            self.pollID,
+            style=discord.ButtonStyle.primary,
+            emoji=POLL_EMOJIS[vote_for_option],
+        )
         return button
 
 
@@ -39,7 +45,7 @@ async def callback(self, interaction: discord.Interaction):
         await interaction.response.send_message(
             f"You voted for option {self.option + 1}: '{option_text}'.",
             ephemeral=True,
-            delete_after=60
+            delete_after=60,
         )
 
     async def _vote_for_option(self, user, option, message):

cogs/commandgiverole.py

@@ -344,9 +344,7 @@ def search_table(self, channel_id, message_id):
             table_temp = self.get_table_content(table_name)
             table_mid = table_temp["messageid"]
             table_cid = table_temp["channelid"]
-            if str(channel_id) == str(table_cid) and str(message_id) == str(
-                table_mid
-            ):
+            if str(channel_id) == str(table_cid) and str(message_id) == str(table_mid):
                 table_content = table_temp
                 break
         return table_content

cogs/commandlistener.py

@@ -25,9 +25,7 @@ def __init__(self, bot):
 
     @commands.Cog.listener()
     async def on_command_error(self, ctx, error):
-        print(
-            "Ignoring exception in command {}:".format(ctx.command), file=sys.stderr
-        )
+        print("Ignoring exception in command {}:".format(ctx.command), file=sys.stderr)
         traceback.print_exception(
             type(error), error, error.__traceback__, file=sys.stderr
         )
@@ -260,10 +258,7 @@ async def on_voice_state_update(self, member, before, after):
             and before.channel.name[-1].isdigit()
         ):
             # Member left first channel
-            if (
-                before.channel.name[-1] == "1"
-                and not before.channel.name[-2].isdigit()
-            ):
+            if before.channel.name[-1] == "1" and not before.channel.name[-2].isdigit():
                 # Delete last channel, which has no user in it
 
                 channelWithoutNumber = before.channel.name[:-1]
@@ -375,9 +370,9 @@ async def on_message(self, message):
         a = "" + message.content
 
         # Stops user from writting in levelchannel none command messages
-        if str(message.channel.id) == str(
-            self.ch.getFromConfig("levelchannel")
-        ) and a[0] != self.ch.getFromConfig("command_prefix"):
+        if str(message.channel.id) == str(self.ch.getFromConfig("levelchannel")) and a[
+            0
+        ] != self.ch.getFromConfig("command_prefix"):
             await message.delete()
             return
 

cogs/commandowner.py

@@ -110,9 +110,7 @@ async def stoplog(self, ctx):
             guildName = str(self.bot.get_guild(guildID))
             self.ch.config["log"] = "False"
             self.ch.saveConfig()
-            await self.utils.log(
-                f"Stopped to log users from Server:\n\t{guildName}", 2
-            )
+            await self.utils.log(f"Stopped to log users from Server:\n\t{guildName}", 2)
             # Sets the bot's presence to "Do not Disturb" to indicate it's not logging.
             await self.bot.change_presence(
                 status=discord.Status.dnd,
@@ -200,9 +198,7 @@ async def reloadExtensions(self, ctx, *extensions):
                 await self.bot.unload_extension(ext)
                 await self.bot.load_extension(ext)
                 reloadedExtensions.append(ext)
-        await self.utils.log(
-            f"Reloaded extensions: {', '.join(reloadedExtensions)}", 2
-        )
+        await self.utils.log(f"Reloaded extensions: {', '.join(reloadedExtensions)}", 2)
 
 
 class TestButton(discord.ui.View):

cogs/commandpoll.py

@@ -461,9 +461,10 @@ async def poll_open(self, ctx, pollID):
             text = self.poll.pollString(pollID)
             button_amount = len(self.poll.getOptions(pollID))
             pollView = PollView(button_amount, self.poll, pollID)
-            messageSend = await ctx.send(content=f"{text}{ctx.author.mention}", view=pollView)
-            self.poll.setMessageID(
-                pollID, messageSend.id, messageSend.channel.id)
+            messageSend = await ctx.send(
+                content=f"{text}{ctx.author.mention}", view=pollView
+            )
+            self.poll.setMessageID(pollID, messageSend.id, messageSend.channel.id)
             log_message = (
                 f"User {ctx.author.mention} opened the poll {pollID}"
                 + f" in channel {ctx.channel.name}."

cogs/commandsubroutine.py

@@ -138,9 +138,7 @@ async def removeRoleSubroutineFunction(self, currentTime, bufferTime, guild):
                     log_message,
                     2,
                 )
-            if (
-                currentTime - offset
-            ) % interval < bufferTime and currentTime > offset:
+            if (currentTime - offset) % interval < bufferTime and currentTime > offset:
                 role = guild.get_role(int(toRemove))
                 if role is None:
                     log_message = (
@@ -239,19 +237,15 @@ def addMembersOnlineVoiceXp(self, serverid):
         ]
         # Total all connected members
         for channel in voiceChanels:
-            membersInChannel = [
-                member for member in channel.members if not member.bot
-            ]
+            membersInChannel = [member for member in channel.members if not member.bot]
             # Check if more than one person is in channel
             if len(membersInChannel) >= 2:
                 membersNotMutedOrBot = [
                     member
                     for member in membersInChannel
                     if not (member.voice.self_mute or member.bot)
                 ]
-                self.uh.addAllUserVoice(
-                    [member.id for member in membersNotMutedOrBot]
-                )
+                self.uh.addAllUserVoice([member.id for member in membersNotMutedOrBot])
                 # Extra XP
                 membersStreamOrVideo = [
                     member

cogs/commandsubserver.py

@@ -659,9 +659,7 @@ def get_all_subserver_roles(self):
         ]
         # Sort by subserver name. '+ r.name[1]' is for sorting sub roles on top of
         # subway roles, since '+ r.name[1]' is 'u' or 'w'.
-        sorted_roles = sorted(
-            sub_roles, key=lambda r: r.name.split("-")[1] + r.name[1]
-        )
+        sorted_roles = sorted(sub_roles, key=lambda r: r.name.split("-")[1] + r.name[1])
         if not sorted_roles:
             return []
         # Data pattern: [(sub-a, sw-a), ...]

cogs/commanduser.py

@@ -11,7 +11,7 @@
 from datahandler.configHandle import ConfigHandle
 from datahandler.userHandle import UserHandle
 from datahandler.commandrights import read_rights_of
-from button_views.leaderboard_buttons import LeaderboardButtons
+from button_views.leaderboard_buttons import LeaderboardButtons, SortBy
 
 import datetime
 import time
@@ -344,9 +344,7 @@ async def decVoiceXP(self, ctx, userID, amount):
                 amount = voiceXP
             voiceXP -= int(amount)
             self.uh.setUserVoice(userID, voiceXP)
-            message += (
-                f"Decreases user {str(self.bot.get_user(int(userID)))} voiceXP by {amount}. VoiceXP is set to {voiceXP}."
-            )
+            message += f"Decreases user {str(self.bot.get_user(int(userID)))} voiceXP by {amount}. VoiceXP is set to {voiceXP}."
             log_message = (
                 f"User {ctx.author} decreases user "
                 + f"{str(self.bot.get_user(int(userID)))} voiceXP by {amount} to {voiceXP}."
@@ -384,9 +382,7 @@ async def incVoiceXP(self, ctx, userID, amount):
         voiceXP = self.uh.getUserVoice(userID)
         voiceXP += int(amount)
         self.uh.setUserVoice(userID, voiceXP)
-        message += (
-            f"Increases user {str(self.bot.get_user(int(userID)))} voiceXP by {amount}. VoiceXP is set to {voiceXP}."
-        )
+        message += f"Increases user {str(self.bot.get_user(int(userID)))} voiceXP by {amount}. VoiceXP is set to {voiceXP}."
         log_message = (
             f"User {ctx.author} increases user "
             + f"{str(self.bot.get_user(int(userID)))} voiceXP by {amount} to {voiceXP}."
@@ -423,8 +419,7 @@ async def setTextXP(self, ctx, userID, amount):
             self.uh.addNewDataEntry(userID)
         self.uh.setUserText(userID, amount)
         message += (
-            f"Set user {str(self.bot.get_user(int(userID)))} "
-            + f"textXP to {amount}."
+            f"Set user {str(self.bot.get_user(int(userID)))} " + f"textXP to {amount}."
         )
         log_message = (
             f"User {ctx.author} set user "
@@ -463,7 +458,7 @@ async def decTextXP(self, ctx, userID, amount):
         else:
             textXP = self.uh.getUserText(userID)
             if int(amount) > textXP:
-                amount = textXP 
+                amount = textXP
             textXP -= int(amount)
             self.uh.setUserText(userID, textXP)
             message += (
@@ -505,7 +500,7 @@ async def incTextXP(self, ctx, userID, amount):
             )
             self.uh.addNewDataEntry(userID)
         textXP = self.uh.getUserText(userID)
-        textXP += int(amount) 
+        textXP += int(amount)
         self.uh.setUserText(userID, textXP)
         message += (
             f"Increase user {str(self.bot.get_user(int(userID)))} "
@@ -589,9 +584,7 @@ async def decTextCount(self, ctx, userID, amount):
                 amount = textCount
             textCount -= int(amount)
             self.uh.setUserTextCount(userID, textCount)
-            message += (
-                f"Decreases user {str(self.bot.get_user(int(userID)))} TextCount by {amount}. TextCount is set to {textCount}."
-            )
+            message += f"Decreases user {str(self.bot.get_user(int(userID)))} TextCount by {amount}. TextCount is set to {textCount}."
             log_message = (
                 f"User {ctx.author} decreases user "
                 + f"{str(self.bot.get_user(int(userID)))} textCount by {amount} to {textCount}."
@@ -629,9 +622,7 @@ async def incTextCount(self, ctx, userID, amount):
         textCount = self.uh.getUserTextCount(userID)
         textCount += int(amount)
         self.uh.setUserTextCount(userID, textCount)
-        message += (
-            f"Increases user {str(self.bot.get_user(int(userID)))} TextCount by {amount}. TextCount is set to {textCount}."
-        )
+        message += f"Increases user {str(self.bot.get_user(int(userID)))} TextCount by {amount}. TextCount is set to {textCount}."
         log_message = (
             f"User {ctx.author} increases user "
             + f"{str(self.bot.get_user(int(userID)))} textCount by {amount} to {textCount}."
@@ -838,9 +829,7 @@ async def textunban(self, ctx, userID):
                     f"User {ctx.author.mention} textunbaned {user.mention}"
                 )
             else:
-                await ctx.send(
-                    content="ERROR: User has no textban.", delete_after=3600
-                )
+                await ctx.send(content="ERROR: User has no textban.", delete_after=3600)
 
     """
     # When give star of the week should be queued
@@ -993,9 +982,7 @@ async def getLevel(self, ctx, *inputs):
             title=f"{member.nick}     ({member.name})", color=12008408
         )
         embed.set_thumbnail(url=avatar_url)
-        embed.add_field(
-            name="TIME", value=f"{round(int(voiceXP)/30.0,1)}", inline=True
-        )
+        embed.add_field(name="TIME", value=f"{round(int(voiceXP)/30.0,1)}", inline=True)
         embed.add_field(name="TEXT", value=f"{str(textCount)}", inline=True)
         embed.add_field(
             name="EXP",
@@ -1012,7 +999,7 @@ async def getLevel(self, ctx, *inputs):
 
     @commands.command(name="top", brief="Sends an interactive rank list.")
     @isInChannelCommand(*channel_userLeaderboard)
-    async def leaderboard(self, ctx):
+    async def leaderboard(self, ctx, *args):
         """
         Spawns an interactive leaderboard in the "⏫level" via the command 'top'.
         Displays the first 10 member with the highest XP total.
@@ -1032,15 +1019,22 @@ async def leaderboard(self, ctx):
 
         Creates a leaderboard and posts it with the emojis to manipulate it.
         """
-        await self.utils.log(f"+top by {ctx.author}", 1)  # Notify Mods
+        await self.utils.log(f"+top {args} by {ctx.author}", 1)  # Notify Mods
         # Create leaderboard
-        text = f"{self.utils.getLeaderboardPageBy(0,0)}{ctx.author.mention}"
-        message = await ctx.send(
-            text, view=LeaderboardButtons(self.utils), delete_after=86400
-        )
-        # reactionsarr = ["⏫", "⬅", "➡", "⏰", "💌"]
-        # for emoji in reactionsarr:
-        #     await message.add_reaction(emoji)
+        if len(args) > 0 and str(args[0]).isdigit():
+            timeFrame = int(args[0])
+            text = self.utils.getTempLeaderboardPageBy(
+                0, SortBy.VOICE_TEXT, timeFrame=timeFrame
+            )
+        else:
+            timeFrame = None
+            text = self.utils.getLeaderboardPageBy(0, 0)
+        if text:
+            await ctx.send(
+                text + str(ctx.author.mention),
+                view=LeaderboardButtons(self.utils, timeFrame=timeFrame),
+                delete_after=86400,
+            )
         await ctx.message.delete()
 
     @commands.command(name="quote", brief="Sends an unique inspirational quote.")