Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a26440c4d | ||
|
|
2735d6877f | ||
|
|
117f5655d7 | ||
|
|
c808bb2610 | ||
|
|
5e7b3790eb | ||
|
|
07ea150ad3 | ||
|
|
9280bbfbca | ||
|
|
abf076fceb | ||
|
|
0c0997624f |
@@ -15,7 +15,7 @@ jobs:
|
||||
- name: Install Docker
|
||||
uses: https://github.com/papodaca/install-docker-action@v1
|
||||
- name: Log into container registry
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: gitea.cheezers.org
|
||||
username: imcompiling
|
||||
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
- name: Install Docker
|
||||
uses: https://github.com/papodaca/install-docker-action@v1
|
||||
- name: Log into container registry
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: gitea.cheezers.org
|
||||
username: imcompiling
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
FROM python:3.12.3-slim
|
||||
|
||||
# install uv
|
||||
COPY --from=ghcr.io/astral-sh/uv:0.4.30 /uv /uvx /bin/
|
||||
COPY --from=ghcr.io/astral-sh/uv:0.6.2 /uv /uvx /bin/
|
||||
|
||||
RUN apt-get update && apt-get -y upgrade && apt-get -y install sqlite3
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ from nextcord.ext import commands
|
||||
from sqlalchemy import exc, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from cogs.submission.submission_views import SubmissionCreateButton
|
||||
from database_setup.sql_data_classes import Category, CategoryGroup, engine
|
||||
from utilities.utils import MAX_LINE_LENGTH, autofill_groups, send_highscore_message
|
||||
|
||||
@@ -134,8 +133,7 @@ class CreateCog(commands.Cog, name="Create Cog"):
|
||||
try:
|
||||
session.add(new_group)
|
||||
session.commit()
|
||||
message: nextcord.Message = await send_highscore_message(session, interaction.guild, new_group)
|
||||
await message.edit(view=SubmissionCreateButton(self._bot))
|
||||
await send_highscore_message(session, interaction.guild, new_group)
|
||||
await interaction.response.send_message(f'"{group_name}" has been created!', ephemeral=True)
|
||||
except exc.IntegrityError:
|
||||
# Category Group already exists in guild
|
||||
|
||||
@@ -8,7 +8,6 @@ from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
# pylint: disable=import-error
|
||||
from cogs.submission.submission_views import SubmissionCreateButton
|
||||
from database_setup.sql_data_classes import CategoryGroup, engine
|
||||
from utilities.utils import autofill_groups, send_highscore_message
|
||||
|
||||
@@ -50,9 +49,7 @@ class RefreshCog(commands.Cog, name="Refresh Cog"):
|
||||
)
|
||||
group = session.scalar(stmt)
|
||||
|
||||
message: nextcord.Message = await send_highscore_message(session, interaction.guild, group)
|
||||
await message.edit(view=SubmissionCreateButton(self._bot))
|
||||
|
||||
await send_highscore_message(session, interaction.guild, group)
|
||||
await interaction.response.send_message(f"Updated group {group.GroupName}!", ephemeral=True)
|
||||
|
||||
@refresh.subcommand()
|
||||
@@ -77,8 +74,7 @@ class RefreshCog(commands.Cog, name="Refresh Cog"):
|
||||
await interaction.response.defer(ephemeral=True)
|
||||
|
||||
for group in session.scalars(stmt):
|
||||
message: nextcord.Message = await send_highscore_message(session, interaction.guild, group)
|
||||
await message.edit(view=SubmissionCreateButton(self._bot))
|
||||
await send_highscore_message(session, interaction.guild, group)
|
||||
|
||||
await interaction.send(f"Posted all groups in {interaction.guild.name}'s highscores.", ephemeral=True)
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ from sqlalchemy.orm import Session
|
||||
from cogs.submission.verification_view import VerificationView
|
||||
from database_setup.sql_data_classes import Category, CategoryGroup, Guild, Submission, engine
|
||||
from main import logger
|
||||
from utilities.utils import GUILDS, autofill_categories, autofill_groups, submit_score
|
||||
from utilities.utils import autofill_categories, autofill_groups, submit_score
|
||||
|
||||
|
||||
class SubmissionCog(commands.Cog):
|
||||
@@ -19,7 +19,7 @@ class SubmissionCog(commands.Cog):
|
||||
def __init__(self) -> None:
|
||||
return
|
||||
|
||||
@nextcord.slash_command(guild_ids=GUILDS)
|
||||
@nextcord.slash_command()
|
||||
async def submit( # noqa: PLR0913
|
||||
self,
|
||||
interaction: nextcord.Interaction,
|
||||
@@ -47,6 +47,7 @@ class SubmissionCog(commands.Cog):
|
||||
group_id (str): Is SlashOption. Group that the score category belongs in.
|
||||
category_id (str): Is SlashOption. Category to submit the score in.
|
||||
score (str): Is SlashOption. The score.
|
||||
proof (nextcord.Attachment): Is SlashOption. Picture to provide proof of score.
|
||||
username (str, optional): Is SlashOption. Username to associate with the score.
|
||||
"""
|
||||
# fill out username if not passed in
|
||||
|
||||
@@ -33,9 +33,6 @@ def main() -> None:
|
||||
# These need to be enabled in the developer portal as well
|
||||
intents = nextcord.Intents.default()
|
||||
|
||||
# Required in order to read messages (eg. prefix commands)
|
||||
intents.message_content = True
|
||||
|
||||
bot = commands.Bot(
|
||||
commands.when_mentioned_or(config.BOT_PREFIX),
|
||||
intents=intents,
|
||||
|
||||
@@ -47,7 +47,6 @@ exclude = [
|
||||
"node_modules",
|
||||
"site-packages",
|
||||
"venv",
|
||||
"dakiny-messages", # Don't need to lint this git repo.
|
||||
]
|
||||
|
||||
# Same as Black.
|
||||
|
||||
+2
-5
@@ -1,6 +1,4 @@
|
||||
"""
|
||||
Contains various utlity functions for highscores bot
|
||||
"""
|
||||
"""Contains various utility functions for highscores bot."""
|
||||
|
||||
import time
|
||||
|
||||
@@ -14,12 +12,11 @@ from database_setup.sql_data_classes import Category, CategoryGroup, Guild, Scor
|
||||
|
||||
MAX_LINE_LENGTH = 142
|
||||
|
||||
GUILDS = [1000247361639030804]
|
||||
|
||||
|
||||
def autofill_categories(guild_id: int, group_id: int, category_begin: str) -> "dict[str, str]":
|
||||
"""
|
||||
Returns all category names that start with category_begin.
|
||||
|
||||
If category_begin is empty, returns list of all category names.
|
||||
|
||||
Args:
|
||||
|
||||
Reference in New Issue
Block a user