Sandbox URL Creation

.github/workflows/codacy.yml

@@ -1,61 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow checks out code, performs a Codacy security scan
-# and integrates the results with the
-# GitHub Advanced Security code scanning feature.  For more information on
-# the Codacy security scan action usage and parameters, see
-# https://github.com/codacy/codacy-analysis-cli-action.
-# For more information on Codacy Analysis CLI in general, see
-# https://github.com/codacy/codacy-analysis-cli.
-
-name: Codacy Security Scan
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
-  schedule:
-    - cron: '36 1 * * 4'
-
-permissions:
-  contents: read
-
-jobs:
-  codacy-security-scan:
-    permissions:
-      contents: read # for actions/checkout to fetch code
-      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
-    name: Codacy Security Scan
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the repository to the GitHub Actions runner
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
-      - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
-        with:
-          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
-          # You can also omit the token and run the tools that support default configurations
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          verbose: true
-          output: results.sarif
-          format: sarif
-          # Adjust severity of non-security issues
-          gh-code-scanning-compat: true
-          # Force 0 exit code to allow SARIF file generation
-          # This will handover control about PR rejection to the GitHub side
-          max-allowed-issues: 2147483647
-
-      # Upload the SARIF file generated in the previous step
-      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: results.sarif

.github/workflows/frogbot-scan-and-fix.yml

@@ -1,65 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# Frogbot Scan and Fix does the following:
-# Automatically creates pull requests with fixes for vulnerable project dependencies.
-# Uses JFrog Xray to scan the project.
-# Read more about Frogbot here - https://docs.jfrog-applications.jfrog.io/jfrog-applications/frogbot
-
-# Some projects require creating a frogbot-config.yml file. Read more about it here - https://docs.jfrog-applications.jfrog.io/jfrog-applications/frogbot/setup-frogbot/frogbot-configuration
-
-name: "Frogbot Scan and Fix"
-on:
-  push:
-    branches: [ "main" ]
-permissions:
-  contents: write
-  pull-requests: write
-  security-events: write
-jobs:
-  create-fix-pull-requests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: jfrog/frogbot@5d9c42c30f1169d8be4ba5510b40e75ffcbbc2a9  # v2.21.2
-        env:
-          # [Mandatory if the two conditions below are met]
-          # 1. The project uses npm, yarn 2, NuGet or .NET to download its dependencies
-          # 2. The `installCommand` variable isn't set in your frogbot-config.yml file.
-          #
-          # The command that installs the project dependencies (e.g "npm i", "nuget restore" or "dotnet restore")
-          # JF_INSTALL_DEPS_CMD: ""
-
-          # [Mandatory]
-          # JFrog platform URL
-          JF_URL: ${{ secrets.JF_URL }}
-
-          # [Mandatory if JF_USER and JF_PASSWORD are not provided]
-          # JFrog access token with 'read' permissions on Xray service
-          JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
-
-          # [Mandatory if JF_ACCESS_TOKEN is not provided]
-          # JFrog username with 'read' permissions for Xray. Must be provided with JF_PASSWORD
-          # JF_USER: ${{ secrets.JF_USER }}
-
-          # [Mandatory if JF_ACCESS_TOKEN is not provided]
-          # JFrog password. Must be provided with JF_USER
-          # JF_PASSWORD: ${{ secrets.JF_PASSWORD }}
-
-          # [Mandatory]
-          # The GitHub token automatically generated for the job
-          JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-          # [Optional]
-          # If the machine that runs Frogbot has no access to the internat, set the name of a remote repository
-          # in Artifactory, which proxies https://releases.jfrog.io/artifactory
-          # The 'frogbot' executable and other tools it needs will be downloaded through this repository.
-          # JF_RELEASES_REPO: ""
-
-          # [Optional]
-          # Frogbot will download the project dependencies, if they're not cached locally. To download the
-          # dependencies from a virtual repository in Artifactory, set the name of of the repository. There's no
-          # need to set this value, if it is set in the frogbot-config.yml file.
-          # JF_DEPS_REPO: ""

birthday/birthday.py

@@ -37,7 +37,7 @@ async def birthday_context_menu(interaction: discord.Interaction, member: discor
         
         birthday_role = interaction.guild.get_role(birthday_role_id)
         if not birthday_role:
-            logger.error("Birthday role not found in the guild")
+            logger.error(f"Birthday role {birthday_role_id} not found in guild {interaction.guild.id}")
             return await interaction.followup.send("The birthday role doesn't exist anymore. Please ask an admin to set it again.", ephemeral=True)
 
         # Assign the role, ignoring hierarchy
@@ -45,10 +45,10 @@ async def birthday_context_menu(interaction: discord.Interaction, member: discor
             await member.add_roles(birthday_role, reason="Birthday role")
             logger.info(f"Birthday role assigned to {member.id} in guild {interaction.guild.id}")
         except discord.Forbidden:
-            logger.error("Failed to assign birthday role: Insufficient permissions")
+            logger.error(f"Failed to assign birthday role to {member.id} in guild {interaction.guild.id}: Insufficient permissions")
             return await interaction.followup.send("I don't have permission to assign that role.", ephemeral=True)
         except discord.HTTPException as e:
-            logger.error(f"Failed to assign birthday role: {str(e)}")
+            logger.error(f"Failed to assign birthday role to {member.id} in guild {interaction.guild.id}: {str(e)}")
             return await interaction.followup.send("Failed to assign the birthday role due to a Discord error.", ephemeral=True)
 
         # Generate birthday message with random cakes (or pie)
@@ -63,7 +63,7 @@ async def birthday_context_menu(interaction: discord.Interaction, member: discor
         if birthday_channel_id:
             channel = interaction.client.get_channel(birthday_channel_id)
             if not channel:
-                logger.warning("Birthday channel not found in the guild")
+                logger.warning(f"Birthday channel {birthday_channel_id} not found in guild {interaction.guild.id}")
                 channel = interaction.channel
         else:
             channel = interaction.channel
@@ -76,7 +76,7 @@ async def birthday_context_menu(interaction: discord.Interaction, member: discor
         try:
             tz = ZoneInfo(timezone)
         except ZoneInfoNotFoundError:
-            logger.warning("Invalid timezone for the guild, defaulting to UTC")
+            logger.warning(f"Invalid timezone {timezone} for guild {interaction.guild.id}, defaulting to UTC")
             await interaction.followup.send("Warning: Invalid timezone set. Defaulting to UTC.", ephemeral=True)
             tz = ZoneInfo("UTC")
 
@@ -196,12 +196,12 @@ class Birthday(commands.Cog):
 
             birthday_role_id = await self.config.guild(ctx.guild).birthday_role()
             if not birthday_role_id:
-                logger.error("Birthday role not set for the guild")
+                logger.error(f"Birthday role not set for guild {ctx.guild.id}")
                 return await ctx.send("The birthday role hasn't been set.", ephemeral=True)
 
             birthday_role = ctx.guild.get_role(birthday_role_id)
             if not birthday_role:
-                logger.error("Birthday role not found in the guild")
+                logger.error(f"Birthday role {birthday_role_id} not found in guild {ctx.guild.id}")
                 return await ctx.send("The birthday role doesn't exist anymore.", ephemeral=True)
 
             if birthday_role not in member.roles:
@@ -209,12 +209,12 @@ class Birthday(commands.Cog):
 
             try:
                 await member.remove_roles(birthday_role, reason="Birthday role manually removed")
-                logger.info(f"Birthday role manually removed from member {member.id}")
+                logger.info(f"Birthday role manually removed from {member.id} in guild {ctx.guild.id}")
             except discord.Forbidden:
-                logger.error(f"Failed to remove birthday role from member {member.id}: Insufficient permissions")
+                logger.error(f"Failed to remove birthday role from {member.id} in guild {ctx.guild.id}: Insufficient permissions")
                 return await ctx.send("I don't have permission to remove that role.", ephemeral=True)
             except discord.HTTPException as e:
-                logger.error(f"Failed to remove birthday role from member {member.id} due to a Discord error: {str(e)}")
+                logger.error(f"Failed to remove birthday role from {member.id} in guild {ctx.guild.id}: {str(e)}")
                 return await ctx.send("Failed to remove the birthday role due to a Discord error.", ephemeral=True)
 
             # Remove scheduled task if it exists
@@ -226,51 +226,9 @@ class Birthday(commands.Cog):
 
             await ctx.send(f"Birthday role removed from {member.display_name}!", ephemeral=True)
         except Exception as e:
-            logger.error("Unexpected error in remove_birthday command", exc_info=True)
+            logger.error(f"Unexpected error in remove_birthday command: {str(e)}", exc_info=True)
             await ctx.send(f"An error occurred while removing the birthday role: {str(e)}", ephemeral=True)
 
-    @commands.hybrid_command(name="status")
-    @app_commands.guild_only()
-    async def status(self, ctx: commands.Context):
-        """Show the status of the Birthday cog in the current server."""
-        try:
-            # Check if the user has permission to use this command
-            allowed_roles = await self.config.guild(ctx.guild).allowed_roles()
-            if not any(role.id in allowed_roles for role in ctx.author.roles):
-                logger.warning(f"User {ctx.author.id} attempted to use status command without permission")
-                return await ctx.send("You don't have permission to use this command.", ephemeral=True)
-
-            # Fetch configuration details
-            birthday_role_id = await self.config.guild(ctx.guild).birthday_role()
-            birthday_role = ctx.guild.get_role(birthday_role_id) if birthday_role_id else None
-            allowed_roles_ids = await self.config.guild(ctx.guild).allowed_roles()
-            allowed_roles = [ctx.guild.get_role(role_id) for role_id in allowed_roles_ids]
-            timezone = await self.config.guild(ctx.guild).timezone()
-            birthday_channel_id = await self.config.guild(ctx.guild).birthday_channel()
-            birthday_channel = ctx.guild.get_channel(birthday_channel_id) if birthday_channel_id else None
-            scheduled_tasks = await self.config.guild(ctx.guild).scheduled_tasks()
-
-            # Construct status message
-            status_message = f"**Birthday Cog Status for {ctx.guild.name}**\n"
-            status_message += f"**Birthday Role:** {birthday_role.name if birthday_role else 'Not Set'}\n"
-            status_message += f"**Allowed Roles:** {', '.join(role.name for role in allowed_roles if role) if allowed_roles else 'None'}\n"
-            status_message += f"**Timezone:** {timezone}\n"
-            status_message += f"**Birthday Channel:** {birthday_channel.mention if birthday_channel else 'Not Set'}\n"
-            status_message += f"**Scheduled Tasks:** {len(scheduled_tasks)}\n"
-
-            if scheduled_tasks:
-                status_message += "\n**Upcoming Tasks:**\n"
-                for member_id, task_info in scheduled_tasks.items():
-                    member = ctx.guild.get_member(int(member_id))
-                    role = ctx.guild.get_role(task_info["role_id"])
-                    remove_at = datetime.fromisoformat(task_info["remove_at"]).replace(tzinfo=ZoneInfo(timezone))
-                    status_message += f"- {member.display_name} ({role.name}) at {remove_at}\n"
-
-            await ctx.send(status_message, ephemeral=True)
-        except Exception as e:
-            logger.error(f"Unexpected error in status command: {str(e)}", exc_info=True)
-            await ctx.send(f"An error occurred while fetching the status: {str(e)}", ephemeral=True)
-
     async def daily_cleanup(self):
         """Daily task to ensure all birthday roles are properly removed."""
         while True:
@@ -390,12 +348,12 @@ class Birthday(commands.Cog):
 
             birthday_role_id = await self.config.guild(ctx.guild).birthday_role()
             if not birthday_role_id:
-                logger.error("Birthday role not set for the guild")
+                logger.error(f"Birthday role not set for guild {ctx.guild.id}")
                 return await ctx.send("The birthday role hasn't been set. An admin needs to set it using `/setrole`.", ephemeral=True)
             
             birthday_role = ctx.guild.get_role(birthday_role_id)
             if not birthday_role:
-                logger.error("Birthday role not found in the guild")
+                logger.error(f"Birthday role {birthday_role_id} not found in guild {ctx.guild.id}")
                 return await ctx.send("The birthday role doesn't exist anymore. Please ask an admin to set it again.", ephemeral=True)
 
             # Assign the role, ignoring hierarchy
@@ -403,10 +361,10 @@ class Birthday(commands.Cog):
                 await member.add_roles(birthday_role, reason="Birthday role")
                 logger.info(f"Birthday role assigned to {member.id} in guild {ctx.guild.id}")
             except discord.Forbidden:
-                logger.error("Failed to assign birthday role: Insufficient permissions")
+                logger.error(f"Failed to assign birthday role to {member.id} in guild {ctx.guild.id}: Insufficient permissions")
                 return await ctx.send("I don't have permission to assign that role.", ephemeral=True)
             except discord.HTTPException as e:
-                logger.error(f"Failed to assign birthday role: {str(e)}")
+                logger.error(f"Failed to assign birthday role to {member.id} in guild {ctx.guild.id}: {str(e)}")
                 return await ctx.send("Failed to assign the birthday role due to a Discord error.", ephemeral=True)
 
             # Generate birthday message with random cakes (or pie)
@@ -421,7 +379,7 @@ class Birthday(commands.Cog):
             if birthday_channel_id:
                 channel = self.bot.get_channel(birthday_channel_id)
                 if not channel:  # If the set channel doesn't exist anymore
-                    logger.warning("Birthday channel not found in the guild")
+                    logger.warning(f"Birthday channel {birthday_channel_id} not found in guild {ctx.guild.id}")
                     channel = ctx.channel
             else:
                 channel = ctx.channel
@@ -434,7 +392,7 @@ class Birthday(commands.Cog):
             try:
                 tz = ZoneInfo(timezone)
             except ZoneInfoNotFoundError:
-                logger.warning("Invalid timezone for the guild, defaulting to UTC")
+                logger.warning(f"Invalid timezone {timezone} for guild {ctx.guild.id}, defaulting to UTC")
                 await ctx.send("Warning: Invalid timezone set. Defaulting to UTC.", ephemeral=True)
                 tz = ZoneInfo("UTC")
 
@@ -443,7 +401,7 @@ class Birthday(commands.Cog):
 
             await self.schedule_birthday_role_removal(ctx.guild, member, birthday_role, midnight)
         except Exception as e:
-            logger.error(f"Unexpected error in birthday command", exc_info=True)
+            logger.error(f"Unexpected error in birthday command: {str(e)}", exc_info=True)
             await ctx.send(f"An error occurred: {str(e)}", ephemeral=True)
 
     @commands.hybrid_command(name="bdaycheck")

videoarchiver/ffmpeg/ffmpeg_downloader.py

@@ -3,7 +3,6 @@
 import os
 import logging
 import shutil
-import requests
 import tarfile
 import zipfile
 import subprocess
@@ -19,6 +18,7 @@ import lzma
 # try:
 # Try relative imports first
 from exceptions import DownloadError
+from security import safe_requests
 
 # except ImportError:
 # Fall back to absolute imports if relative imports fail
@@ -175,7 +175,7 @@ class FFmpegDownloader:
 
         logger.info(f"Downloading FFmpeg from {url}")
         try:
-            response = requests.get(url, stream=True, timeout=30)
+            response = safe_requests.get(url, stream=True, timeout=30)
             response.raise_for_status()
 
             total_size = int(response.headers.get("content-length", 0))

videoarchiver/processor/constants.py

@@ -1,7 +1,7 @@
 """Constants for VideoProcessor"""
 
 from typing import Dict, List, Union
-from dataclasses import field, dataclass
+from dataclasses import dataclass
 from enum import Enum
 
 class ReactionType(Enum):
@@ -27,9 +27,9 @@ class ReactionEmojis:
 @dataclass(frozen=True)
 class ProgressEmojis:
     """Emoji sequences for progress indicators"""
-    NUMBERS: List[str] = field(default_factory=lambda: ('1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣'))
-    PROGRESS: List[str] = field(default_factory=lambda: ('⬛', '🟨', '🟩'))
-    DOWNLOAD: List[str] = field(default_factory=lambda: ('0️⃣', '2️⃣', '4️⃣', '6️⃣', '8️⃣', '🔟'))
+    NUMBERS: List[str] = ('1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣')
+    PROGRESS: List[str] = ('⬛', '🟨', '🟩')
+    DOWNLOAD: List[str] = ('0️⃣', '2️⃣', '4️⃣', '6️⃣', '8️⃣', '🔟')
 
 # Main reactions dictionary with type hints
 REACTIONS: Dict[str, Union[str, List[str]]] = {

videoarchiver/queue/cleanup.py

@@ -341,11 +341,14 @@ class QueueCleaner:
             metrics_manager.update_cleanup_time()
 
             logger.info(
-                "%s%s%s", f"Cleanup completed ({mode.value}):\n", "\n".join(
+                f"Cleanup completed ({mode.value}):\n" +
+                "\n".join(
                     f"- {phase.value}: {count} items"
                     for phase, count in items_cleaned.items()
                     if count > 0
-                ), f"\nTotal duration: {duration:.2f}s")
+                ) +
+                f"\nTotal duration: {duration:.2f}s"
+            )
 
         except Exception as e:
             logger.error(f"Error during cleanup: {str(e)}")