Removal of admin report tickets as they are not functional, better management of ties in video voting

Author: pandaroux007

.gitignore

@@ -10,7 +10,6 @@ wheels/
 .venv
 
 # development files
-# private*.* # deprecated
-# *.db # deprecated
 dev/
-.env
+.env
+repulsbot.code-workspace

src/cogs/about_cog.py

@@ -106,7 +106,6 @@ async def avatar(self, ctx: commands.Context, member: discord.Member):
         else:
             embed.add_field(name="This user has no avatar", value="*nothing to display...*")
 
-        embed.set_footer(text=FOOTER_EMBED)
         await ctx.send(embed=embed)
 
     @commands.hybrid_command(name="membercount", description="Get the server member count")

src/cogs/tickets_cog.py

@@ -20,21 +20,19 @@
     IDs.serverRoles.CONTRIBUTOR
 ]
 
-TICKETS_CATEGORY_NAME = "Tickets"
 TICKET_TYPES = [
     #     label       |       description         |   abbreviation
     ("In-game report", "Hackers and chat reports", "ing-rep"),
     ("Discord report", "Discord issues/report a member", "dis-rep"),
     ("Role related", "Applications/promotion about roles", "rol"),
-    ("Admin report", "Report an admin's behavior", "admin"),
     ("Other", "Other inquiries or problems", "other")
 ]
 
 OPEN_TICKET_TITLE = "🎟️ Need help ? Open a Ticket"
 OPEN_TICKET_MSG = """
 Simply click on the type of ticket you want to open **in the selector below**, and fill up the information needed (send your images and video after creating the ticket).\n
 It will create a private channel between you and **the moderation team**. This way, you can make a report, request a role, or anything else.\n
-**Only create a ticket if absolutely necessary!** If you need urgent assistance, please ping or send a DM to an administrator. Before creating a ticket, check if the answer to your question is not in the server FAQs (e.g., the requirements for roles are indicated there)! To report a game bug, you can use the channel https://discord.com/channels/603655329120518223/1076163933213311067!
+**Only create a ticket if absolutely necessary!** If you need urgent assistance, please ping or send a DM to an admin. Before creating a ticket, check if the answer to your question is not in the server FAQs (e.g., the requirements for roles are indicated there)! To report a game bug, you can use https://discord.com/channels/603655329120518223/1076163933213311067!
 """
 
 class GoToTicketButton(discord.ui.View):
@@ -73,24 +71,28 @@ async def on_submit(self, interaction: discord.Interaction):
             author = interaction.user
 
             # creation of the private channel
-            category = await self._get_tickets_category(guild)
+            category = discord.utils.get(guild.categories, id=IDs.serverChannel.TICKETS_CATEGORY)
             channel_name = self._build_ticket_channel_name()
             overwrites = self._build_ticket_overwrites(guild, author)
 
             ticket_channel = await guild.create_text_channel(
                 channel_name, category=category, overwrites=overwrites,
-                topic=f"Ticket by {author} ・ **{self._get_ticket_label()}** ・ {self.title_input.value}"
+                topic=f"🎟️ **{self._get_ticket_label()}** ・ {self.title_input.value}"
             )
 
             # first channel's message
             embed = discord.Embed(
-                title=f"🎟️ {self.title_input.value}",
+                title=f"{self.title_input.value}",
                 description=self.description_input.value,
-                color=discord.Color.dark_blue()
+                color=discord.Color.blue()
+            )
+            embed.set_author(
+                name=author.display_name,
+                icon_url=author.display_avatar.url,
             )
-            embed.set_footer(text=f"Ticket type ・ {self._get_ticket_label()}")
+            embed.set_footer(text=f"Ticket type \"{self._get_ticket_label()}\"")
 
-            await ticket_channel.send(content=f"Opened by {author.mention}", embed=embed)
+            await ticket_channel.send(embed=embed)
             await interaction.response.send_message(
                 f"{DefaultEmojis.CHECK} Your ticket has been created: {ticket_channel.mention}",
                 view=GoToTicketButton(ticket_channel),
@@ -108,20 +110,14 @@ async def on_submit(self, interaction: discord.Interaction):
             await interaction.response.send_message(f":x: {error_msg}{ASK_HELP}", ephemeral=True)
 
     def _build_ticket_overwrites(self, guild: discord.Guild, author: discord.Member) -> dict:
+        # permissions to the bot, ticket author and authorized members to view the private channel
         overwrites = {
             guild.default_role: discord.PermissionOverwrite(view_channel=False),
             author: PERMS_ACCESS_GRANTED,
             guild.me: PERMS_ACCESS_GRANTED
         }
 
-        # visible only to the server owner and author
-        if self.ticket_type_abbr == "admin":
-            owner = guild.get_member(guild.owner_id)
-            if owner:
-                overwrites[owner] = PERMS_ACCESS_GRANTED
-        # permissions to the ticket author and authorized members to view the private channel
-        else:
-            for role_id in AUTHORIZED_MEMBERS:
+        for role_id in AUTHORIZED_MEMBERS:
                 role = guild.get_role(role_id)
                 if role:
                     overwrites[role] = PERMS_ACCESS_GRANTED
@@ -132,14 +128,6 @@ def _build_ticket_channel_name(self) -> str:
         code = "".join(random.choices(string.ascii_lowercase + string.digits, k=6))
         return f"{self.ticket_type_abbr.lower()}-{code}"
 
-    async def _get_tickets_category(self, guild: discord.Guild):
-        category = discord.utils.get(guild.categories, name=TICKETS_CATEGORY_NAME)
-        if category:
-            return category
-        else:
-            overwrites = {guild.default_role: discord.PermissionOverwrite(view_channel=False)}
-            return await guild.create_category(TICKETS_CATEGORY_NAME, overwrites=overwrites)
-    
     def _get_ticket_label(self) -> str:
         return next((label for label, _, abbr in TICKET_TYPES if abbr == self.ticket_type_abbr), "Other")
 
@@ -196,7 +184,7 @@ def __init__(self, bot: commands.Bot):
 
     @commands.hybrid_command(name="close_ticket", description="Close current ticket (only available in a ticket)")
     async def close_ticket(self, ctx: commands.Context):
-        if ctx.channel.category and ctx.channel.category.name == TICKETS_CATEGORY_NAME:
+        if ctx.channel.category and ctx.channel.category.id == IDs.serverChannel.TICKETS_CATEGORY:
             view = CancelCloseView()
             embed = discord.Embed(
                 title=f"🔒 Ticket will be closed in {SECONDS_BEFORE_TICKET_CLOSING}s...",

src/cogs/vote_cog.py

@@ -2,16 +2,17 @@
 from discord.ext import tasks, commands
 import re
 import aiohttp
+import random
 # bot files
 from utils import (
     send_hidden_message,
-    hoursdelta
+    hoursdelta,
+    nl
 )
 
 from cogs.cogs_info import CogsNames
 from constants import (
     DefaultEmojis,
-    Links,
     PrivateData,
     IDs,
     ASK_HELP,
@@ -26,13 +27,14 @@
     re.IGNORECASE
 )
 
-VOTE_HOURS = 24
+VOTE_HOURS = 48
 SUCCESS_CODE = 200
+REACTION = DefaultEmojis.CHECK
 
-FEATURED_VIDEO_MSG = """
-(And you, do you want your video to appear on the game's main page? Then hurry up and post the link here,
-and cross your fingers that the community votes for your message with the reaction {reaction} just below!
-***I come and check the best video every {time} hours, you have every chance!***)
+FEATURED_VIDEO_MSG = f"""
+And you, do you want your video to appear on the game's main page?
+Then hurry up and post the link here, and cross your fingers...
+I come and check the best video every {VOTE_HOURS} hours, you have every chance!
 """
 
 class YouTubeLink(commands.Converter):
@@ -80,47 +82,74 @@ async def check_better_video(self):
         if not video_channel:
             return
 
-        better_video_msg = None
+        better_video_msgs = []
         last_better_votes = 0
+        after_time = hoursdelta(5 * 24) # 5 days
 
-        async for message in video_channel.history(limit=50, after=hoursdelta(VOTE_HOURS)):
+        async for message in video_channel.history(limit=50, after=after_time):
             if not re.search(YOUTUBE_REGEX, message.content):
                 continue # pass all messages without youtube links
 
             # update message cache (https://github.com/Rapptz/discord.py/issues/861)
             msg = await video_channel.fetch_message(message.id)
             for reaction in msg.reactions:
-                if str(reaction.emoji) == DefaultEmojis.CHECK:
+                if str(reaction.emoji) == REACTION:
                     vote = reaction.count
                     if vote > last_better_votes:
                         last_better_votes = vote
-                        better_video_msg = msg
+                        better_video_msgs = [msg]
+                    elif vote == last_better_votes:
+                        better_video_msgs.append(msg)
                     break
 
-        await self.process_winner(video_channel=video_channel, msg=better_video_msg, vote_count=last_better_votes)
+        await self.process_winner(video_channel, better_video_msgs, last_better_votes)
 
-    async def process_winner(self, video_channel: discord.TextChannel, msg: discord.Message, vote_count: int):
-        if msg and vote_count > 0:
-            embed = discord.Embed(
-                title="New featured video! 🎉",
-                color=discord.Color.dark_blue(),
-                timestamp=discord.utils.utcnow(),
-                description=FEATURED_VIDEO_MSG.format(reaction=DefaultEmojis.CHECK, time=VOTE_HOURS).replace('\n', ' ').strip()
-            )
-            embed.add_field(name="Watch it now!", value=msg.jump_url)
+    async def process_winner(self, video_channel: discord.abc.Messageable, messages: list[discord.Message], vote_count: int):
+        embed = discord.Embed(
+            title="New featured video! 🎉",
+            color=discord.Color.brand_red(),
+            timestamp=discord.utils.utcnow()
+        )
+        # no videos to send, notify youtubers
+        if len(messages) < 1:
+            embed.title = "I couldn't find any videos to display on the game's homepage 🫤..."
+            embed.description = f"Become a <@&{IDs.serverRoles.YOUTUBER}> by meeting [these conditions](https://discord.com/channels/603655329120518223/733177088961544202/1389263121591570496), and post your first videos! 🚀"
+            embed.timestamp = None
+        # one or more videos found to send
+        else:
+            winner: discord.Message = None
+            # only one winning video
+            if len(messages) == 1:
+                winner = messages[0]
+                embed.add_field(
+                    name="Watch it now!",
+                    value=f"🎬 [Click here to watch the video]({winner.jump_url}), by {winner.author.mention}!",
+                    inline=False
+                )
+                embed.set_footer(text=nl(FEATURED_VIDEO_MSG))
+            # case of equality
+            else:
+                embed.title = "👏 Bravo! Several videos are tied!"
+                embed.description = f"The following videos come in first with {vote_count} votes each!"
 
-            match = re.search(YOUTUBE_REGEX, msg.content)
+                for idx, m in enumerate(messages, 1):
+                    embed.add_field(name="", value=f"{idx}. [Video]({m.jump_url}) of {m.author.mention}", inline=False)
+
+                winner = random.choice(messages)
+                embed.add_field(name="The winner drawn at random is", value=f"This [video]({winner.jump_url}) of {winner.author.mention}!", inline=True)
+
+            match = re.search(YOUTUBE_REGEX, winner.content)
             code = await send_video_to_endpoint(video_url=match.group(0))
-            if code == SUCCESS_CODE:
-                embed.add_field(name="Website state", value=f"{await self.bot.fetch_application_emoji(IDs.customEmojis.CONNECTE)} Video sent to [repuls.io]({Links.REPULS_GAME})!")
-            else:
-                embed.add_field(name="Website state", value=f"{DefaultEmojis.WARN} Video failed to send to repuls.io ({code} error)!")
 
-            await video_channel.send(embed=embed)
-        else:
-            await video_channel.send(f"""
-I couldn't find any videos to display on the game's homepage 🫤...
-**Become a <@&{IDs.serverRoles.YOUTUBER}> by meeting [the following requirements](https://discord.com/channels/603655329120518223/733177088961544202/1389263121591570496), and post your first videos!** 🚀""")
+            log_channel = self.bot.get_channel(IDs.serverChannel.LOG)
+            if log_channel:
+                if code == SUCCESS_CODE:
+                    status = f"{DefaultEmojis.CHECK} Video sent to repuls.io!"
+                else:
+                    status = f"{DefaultEmojis.WARN} Video failed to send to repuls.io ({code} error)"
+                await log_channel.send(f"**Website state** : {status}", silent=True)
+
+        await video_channel.send(embed=embed)
 
     # ---------------------------------- command
     @commands.hybrid_command(name="video_leaderboard", description="Show the most voted YouTube videos")
@@ -145,7 +174,7 @@ async def video_leaderboard(self, ctx: commands.Context, hours: int = VOTE_HOURS
 
             msg = await video_channel.fetch_message(message.id)
             for reaction in msg.reactions:
-                if str(reaction.emoji) == DefaultEmojis.CHECK:
+                if str(reaction.emoji) == REACTION:
                     if ENV == ENV_DEV_MODE:
                         video_votes.append((reaction.count, msg))
                     elif reaction.count > 1: # prod mode

src/constants.py

@@ -24,6 +24,7 @@ class ServerChannelID:
     RULES = 1389989335318794420              if ENV == ENV_DEV_MODE else 758364818348048444
     STATUS = 1370716216863227924             if ENV == ENV_DEV_MODE else 849711794032214087
     VIDEO = 1370706473155563581              if ENV == ENV_DEV_MODE else 800108276004028446
+    TICKETS_CATEGORY = 1390286889830842470   if ENV == ENV_DEV_MODE else 1398622102713667605
 
 class ServerRoleID: # "<@&role_id>"
     YOUTUBER = 1381223948854759494           if ENV == ENV_DEV_MODE else 781295509331116054

src/utils.py

@@ -19,4 +19,8 @@ async def send_hidden_message(ctx: commands.Context, text: str):
         await ctx.send(text, delete_after=10.0)
 
 def hoursdelta(hours) -> datetime:
-    return discord.utils.utcnow() - timedelta(hours=hours)
+    return discord.utils.utcnow() - timedelta(hours=hours)
+
+def nl(string: str) -> str:
+    """ returns a string without line breaks """
+    return string.replace('\n', ' ').strip()