mirror of
https://github.com/pacnpal/Pac-cogs.git
synced 2025-12-27 14:06:57 -05:00
Compare commits
14 Commits
4fa93d4472
...
a472d1669b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a472d1669b | ||
|
|
977a86b199 | ||
|
|
0f634ed517 | ||
|
|
cbbfb0c318 | ||
|
|
c8f441eb8e | ||
|
|
4c6c7df1c8 | ||
|
|
104c9476b4 | ||
|
|
ce6138558f | ||
|
|
28177ed6ea | ||
|
|
113bb0b75b | ||
|
|
867cc1cd4e | ||
|
|
fdced4ad8b | ||
|
|
9fd6a2c7b8 | ||
|
|
9deaa857bd |
61
.github/workflows/codacy.yml
vendored
Normal file
61
.github/workflows/codacy.yml
vendored
Normal file
@@ -0,0 +1,61 @@
|
||||
# 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
|
||||
65
.github/workflows/frogbot-scan-and-fix.yml
vendored
Normal file
65
.github/workflows/frogbot-scan-and-fix.yml
vendored
Normal file
@@ -0,0 +1,65 @@
|
||||
# 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: ""
|
||||
@@ -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(f"Birthday role {birthday_role_id} not found in guild {interaction.guild.id}")
|
||||
logger.error("Birthday role not found in the guild")
|
||||
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(f"Failed to assign birthday role to {member.id} in guild {interaction.guild.id}: Insufficient permissions")
|
||||
logger.error("Failed to assign birthday role: 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 to {member.id} in guild {interaction.guild.id}: {str(e)}")
|
||||
logger.error(f"Failed to assign birthday role: {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(f"Birthday channel {birthday_channel_id} not found in guild {interaction.guild.id}")
|
||||
logger.warning("Birthday channel not found in the guild")
|
||||
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(f"Invalid timezone {timezone} for guild {interaction.guild.id}, defaulting to UTC")
|
||||
logger.warning("Invalid timezone for the guild, 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(f"Birthday role not set for guild {ctx.guild.id}")
|
||||
logger.error("Birthday role not set for the guild")
|
||||
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(f"Birthday role {birthday_role_id} not found in guild {ctx.guild.id}")
|
||||
logger.error("Birthday role not found in the guild")
|
||||
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.id} in guild {ctx.guild.id}")
|
||||
logger.info(f"Birthday role manually removed from member {member.id}")
|
||||
except discord.Forbidden:
|
||||
logger.error(f"Failed to remove birthday role from {member.id} in guild {ctx.guild.id}: Insufficient permissions")
|
||||
logger.error(f"Failed to remove birthday role from member {member.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.id} in guild {ctx.guild.id}: {str(e)}")
|
||||
logger.error(f"Failed to remove birthday role from member {member.id} due to a Discord error: {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,7 +226,7 @@ class Birthday(commands.Cog):
|
||||
|
||||
await ctx.send(f"Birthday role removed from {member.display_name}!", ephemeral=True)
|
||||
except Exception as e:
|
||||
logger.error(f"Unexpected error in remove_birthday command: {str(e)}", exc_info=True)
|
||||
logger.error("Unexpected error in remove_birthday command", exc_info=True)
|
||||
await ctx.send(f"An error occurred while removing the birthday role: {str(e)}", ephemeral=True)
|
||||
|
||||
async def daily_cleanup(self):
|
||||
@@ -348,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(f"Birthday role not set for guild {ctx.guild.id}")
|
||||
logger.error("Birthday role not set for the guild")
|
||||
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(f"Birthday role {birthday_role_id} not found in guild {ctx.guild.id}")
|
||||
logger.error("Birthday role not found in the guild")
|
||||
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
|
||||
@@ -361,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(f"Failed to assign birthday role to {member.id} in guild {ctx.guild.id}: Insufficient permissions")
|
||||
logger.error("Failed to assign birthday role: 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 to {member.id} in guild {ctx.guild.id}: {str(e)}")
|
||||
logger.error(f"Failed to assign birthday role: {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)
|
||||
@@ -379,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(f"Birthday channel {birthday_channel_id} not found in guild {ctx.guild.id}")
|
||||
logger.warning("Birthday channel not found in the guild")
|
||||
channel = ctx.channel
|
||||
else:
|
||||
channel = ctx.channel
|
||||
@@ -392,7 +392,7 @@ class Birthday(commands.Cog):
|
||||
try:
|
||||
tz = ZoneInfo(timezone)
|
||||
except ZoneInfoNotFoundError:
|
||||
logger.warning(f"Invalid timezone {timezone} for guild {ctx.guild.id}, defaulting to UTC")
|
||||
logger.warning("Invalid timezone for the guild, defaulting to UTC")
|
||||
await ctx.send("Warning: Invalid timezone set. Defaulting to UTC.", ephemeral=True)
|
||||
tz = ZoneInfo("UTC")
|
||||
|
||||
@@ -401,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: {str(e)}", exc_info=True)
|
||||
logger.error(f"Unexpected error in birthday command", exc_info=True)
|
||||
await ctx.send(f"An error occurred: {str(e)}", ephemeral=True)
|
||||
|
||||
@commands.hybrid_command(name="bdaycheck")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""Constants for VideoProcessor"""
|
||||
|
||||
from typing import Dict, List, Union
|
||||
from dataclasses import dataclass
|
||||
from dataclasses import field, 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] = ('1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣')
|
||||
PROGRESS: List[str] = ('⬛', '🟨', '🟩')
|
||||
DOWNLOAD: List[str] = ('0️⃣', '2️⃣', '4️⃣', '6️⃣', '8️⃣', '🔟')
|
||||
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️⃣', '🔟'))
|
||||
|
||||
# Main reactions dictionary with type hints
|
||||
REACTIONS: Dict[str, Union[str, List[str]]] = {
|
||||
|
||||
Reference in New Issue
Block a user