diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 204fb662b..908834372 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,6 @@ jobs: run: | uv run isort --check-only $(git rev-parse --show-toplevel)/ --profile black - name: Running pytest - working-directory: techsupport_bot run: | PYTHONPATH=. uv run pytest tests/ -p no:warnings diff --git a/.gitignore b/.gitignore index b907d27db..979199471 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ __pycache__ .coverage .hypothesis .idea/ -techsupport_bot/configuration/guild_configs +configuration/guild_configs diff --git a/Dockerfile b/Dockerfile index 4b99dec0a..f4beb1dfc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN uv sync --frozen --no-dev COPY . . # Move into bot directory -WORKDIR /var/TechSupportBot/techsupport_bot +WORKDIR /var/TechSupportBot # Run bot CMD ["uv", "run", "--", "python3", "-u", "main.py"] diff --git a/Makefile b/Makefile index e0c08cea7..9b1ca6a1f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ image = rtechsupport/techsupport-bot full-image = $(image):prod -main_dir = techsupport_bot ifeq ($(shell docker-compose -v > /dev/null 2>&1; echo $$?), 0) DOCKER_COMPOSE_CMD := docker-compose @@ -24,7 +23,7 @@ lint: pylint $(shell git ls-files '*.py') test: - PYTHONPATH=./techsupport_bot pytest techsupport_bot/tests/ -p no:warnings + PYTHONPATH=./ pytest ./tests/ -p no:warnings build: make establish_config diff --git a/techsupport_bot/__init__.py b/__init__.py similarity index 100% rename from techsupport_bot/__init__.py rename to __init__.py diff --git a/techsupport_bot/bot.py b/bot.py similarity index 99% rename from techsupport_bot/bot.py rename to bot.py index 159e1652f..df4343d21 100644 --- a/techsupport_bot/bot.py +++ b/bot.py @@ -11,20 +11,21 @@ import threading from typing import Self -import botlogging -import configuration import discord import expiringdict import gino -import ircrelay import munch -import ui import yaml -from botlogging import LogContext, LogLevel -from core import auxiliary, custom_errors, databases, http from discord import app_commands from discord.ext import commands +import botlogging +import configuration +import ircrelay +import ui +from botlogging import LogContext, LogLevel +from core import auxiliary, custom_errors, databases, http + loop = asyncio.new_event_loop() asyncio.set_event_loop(loop) diff --git a/techsupport_bot/botlogging/__init__.py b/botlogging/__init__.py similarity index 100% rename from techsupport_bot/botlogging/__init__.py rename to botlogging/__init__.py diff --git a/techsupport_bot/botlogging/common.py b/botlogging/common.py similarity index 100% rename from techsupport_bot/botlogging/common.py rename to botlogging/common.py diff --git a/techsupport_bot/botlogging/delayed.py b/botlogging/delayed.py similarity index 100% rename from techsupport_bot/botlogging/delayed.py rename to botlogging/delayed.py diff --git a/techsupport_bot/botlogging/embed.py b/botlogging/embed.py similarity index 100% rename from techsupport_bot/botlogging/embed.py rename to botlogging/embed.py diff --git a/techsupport_bot/botlogging/logger.py b/botlogging/logger.py similarity index 99% rename from techsupport_bot/botlogging/logger.py rename to botlogging/logger.py index a2cec65d2..6331cc47e 100644 --- a/techsupport_bot/botlogging/logger.py +++ b/botlogging/logger.py @@ -7,9 +7,10 @@ import traceback from typing import TYPE_CHECKING, Self +import discord + import botlogging.embed as embed_lib import configuration -import discord from .common import LogContext, LogLevel diff --git a/techsupport_bot/commands/__init__.py b/commands/__init__.py similarity index 100% rename from techsupport_bot/commands/__init__.py rename to commands/__init__.py diff --git a/techsupport_bot/commands/animal.py b/commands/animal.py similarity index 99% rename from techsupport_bot/commands/animal.py rename to commands/animal.py index 2765b1fdb..9e4a32499 100644 --- a/techsupport_bot/commands/animal.py +++ b/commands/animal.py @@ -4,9 +4,10 @@ from typing import TYPE_CHECKING, Self -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/application.py b/commands/application.py similarity index 99% rename from techsupport_bot/commands/application.py rename to commands/application.py index 8a17a5cb7..04b8935d6 100644 --- a/techsupport_bot/commands/application.py +++ b/commands/application.py @@ -7,11 +7,12 @@ from typing import TYPE_CHECKING, Self import aiocron -import configuration import discord +from discord import app_commands + +import configuration import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/backup.py b/commands/backup.py similarity index 99% rename from techsupport_bot/commands/backup.py rename to commands/backup.py index ce70e5571..7951b00f1 100644 --- a/techsupport_bot/commands/backup.py +++ b/commands/backup.py @@ -9,9 +9,10 @@ import discord import yaml -from core import auxiliary, cogs from discord import app_commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/botinfo.py b/commands/botinfo.py similarity index 99% rename from techsupport_bot/commands/botinfo.py rename to commands/botinfo.py index be97c8749..0e485b6a7 100644 --- a/techsupport_bot/commands/botinfo.py +++ b/commands/botinfo.py @@ -14,9 +14,10 @@ import discord import git -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/burn.py b/commands/burn.py similarity index 99% rename from techsupport_bot/commands/burn.py rename to commands/burn.py index df61b9d75..aaabe374c 100644 --- a/techsupport_bot/commands/burn.py +++ b/commands/burn.py @@ -10,9 +10,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/chatgpt.py b/commands/chatgpt.py similarity index 99% rename from techsupport_bot/commands/chatgpt.py rename to commands/chatgpt.py index cacd779f2..a951d87bd 100644 --- a/techsupport_bot/commands/chatgpt.py +++ b/commands/chatgpt.py @@ -14,13 +14,14 @@ from typing import TYPE_CHECKING, Self -import configuration import discord import expiringdict +from discord.ext import commands + +import configuration import ui from botlogging import LogContext, LogLevel from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/commandcontrol.py b/commands/commandcontrol.py similarity index 99% rename from techsupport_bot/commands/commandcontrol.py rename to commands/commandcontrol.py index c3cf9b074..7d7e867e9 100644 --- a/techsupport_bot/commands/commandcontrol.py +++ b/commands/commandcontrol.py @@ -12,9 +12,10 @@ from typing import TYPE_CHECKING, Self -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/conch.py b/commands/conch.py similarity index 99% rename from techsupport_bot/commands/conch.py rename to commands/conch.py index a574e53b9..6eca54093 100644 --- a/techsupport_bot/commands/conch.py +++ b/commands/conch.py @@ -10,9 +10,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/config.py b/commands/config.py similarity index 99% rename from techsupport_bot/commands/config.py rename to commands/config.py index 9c5e1397b..bdc3a2f93 100644 --- a/techsupport_bot/commands/config.py +++ b/commands/config.py @@ -7,12 +7,13 @@ import json from typing import TYPE_CHECKING, Self -import configuration import discord import munch +from discord import app_commands + +import configuration import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/correct.py b/commands/correct.py similarity index 99% rename from techsupport_bot/commands/correct.py rename to commands/correct.py index fd3852936..e782c7dee 100644 --- a/techsupport_bot/commands/correct.py +++ b/commands/correct.py @@ -9,9 +9,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/debug.py b/commands/debug.py similarity index 99% rename from techsupport_bot/commands/debug.py rename to commands/debug.py index 071bcc748..184666919 100644 --- a/techsupport_bot/commands/debug.py +++ b/commands/debug.py @@ -9,9 +9,10 @@ from typing import TYPE_CHECKING, Self import discord +from discord import app_commands + import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/dictionary.py b/commands/dictionary.py similarity index 99% rename from techsupport_bot/commands/dictionary.py rename to commands/dictionary.py index 23566eeab..f583c8fc4 100644 --- a/techsupport_bot/commands/dictionary.py +++ b/commands/dictionary.py @@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord import app_commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/duck.py b/commands/duck.py similarity index 99% rename from techsupport_bot/commands/duck.py rename to commands/duck.py index 8b6f088ac..31be40fdc 100644 --- a/techsupport_bot/commands/duck.py +++ b/commands/duck.py @@ -9,13 +9,14 @@ from datetime import timedelta from typing import TYPE_CHECKING, Self -import configuration import discord +from discord import Color as embed_colors +from discord.ext import commands + +import configuration import ui from botlogging import LogContext, LogLevel from core import auxiliary, cogs, moderation -from discord import Color as embed_colors -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/dumpdbg.py b/commands/dumpdbg.py similarity index 99% rename from techsupport_bot/commands/dumpdbg.py rename to commands/dumpdbg.py index d8c798a38..feb8cac3e 100644 --- a/techsupport_bot/commands/dumpdbg.py +++ b/commands/dumpdbg.py @@ -5,11 +5,12 @@ import json from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration from botlogging import LogContext, LogLevel from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/echo.py b/commands/echo.py similarity index 99% rename from techsupport_bot/commands/echo.py rename to commands/echo.py index 3a8268c92..7264e66d8 100644 --- a/techsupport_bot/commands/echo.py +++ b/commands/echo.py @@ -12,9 +12,10 @@ from typing import TYPE_CHECKING, Self +from discord.ext import commands + import configuration from core import auxiliary, cogs -from discord.ext import commands from functions import logger as function_logger if TYPE_CHECKING: diff --git a/techsupport_bot/commands/embed.py b/commands/embed.py similarity index 99% rename from techsupport_bot/commands/embed.py rename to commands/embed.py index d13fbb6fe..16fe88706 100644 --- a/techsupport_bot/commands/embed.py +++ b/commands/embed.py @@ -14,12 +14,13 @@ from typing import TYPE_CHECKING, Self -import configuration import discord import munch -from core import auxiliary, cogs from discord.ext import commands +import configuration +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/emoji.py b/commands/emoji.py similarity index 99% rename from techsupport_bot/commands/emoji.py rename to commands/emoji.py index 536c79e0a..e2dcd30dc 100644 --- a/techsupport_bot/commands/emoji.py +++ b/commands/emoji.py @@ -12,9 +12,10 @@ import discord import emoji import inflect -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/extension.py b/commands/extension.py similarity index 99% rename from techsupport_bot/commands/extension.py rename to commands/extension.py index 3373af357..ac621ac76 100644 --- a/techsupport_bot/commands/extension.py +++ b/commands/extension.py @@ -15,11 +15,12 @@ from typing import TYPE_CHECKING, Self import discord -import ui -from core import auxiliary, cogs from discord import app_commands from discord.ext import commands +import ui +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/factoids.py b/commands/factoids.py similarity index 99% rename from techsupport_bot/commands/factoids.py rename to commands/factoids.py index db55a5a24..3ffa2bfb5 100644 --- a/techsupport_bot/commands/factoids.py +++ b/commands/factoids.py @@ -24,17 +24,18 @@ from typing import TYPE_CHECKING, Self import aiocron -import configuration import discord import expiringdict import munch -import ui import yaml from aiohttp.client_exceptions import InvalidURL -from botlogging import LogContext, LogLevel -from core import auxiliary, cogs, custom_errors from discord import app_commands from discord.ext import commands + +import configuration +import ui +from botlogging import LogContext, LogLevel +from core import auxiliary, cogs, custom_errors from functions import logger as function_logger if TYPE_CHECKING: diff --git a/techsupport_bot/commands/forum.py b/commands/forum.py similarity index 99% rename from techsupport_bot/commands/forum.py rename to commands/forum.py index 83f603fa8..773ce3196 100644 --- a/techsupport_bot/commands/forum.py +++ b/commands/forum.py @@ -8,13 +8,14 @@ import re from typing import TYPE_CHECKING, Self -import configuration import discord -import ui -from core import auxiliary, cogs from discord import app_commands from discord.ext import commands +import configuration +import ui +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/gate.py b/commands/gate.py similarity index 99% rename from techsupport_bot/commands/gate.py rename to commands/gate.py index 535366315..fc2abc94d 100644 --- a/techsupport_bot/commands/gate.py +++ b/commands/gate.py @@ -4,11 +4,12 @@ from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration from botlogging import LogContext, LogLevel from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/giphy.py b/commands/giphy.py similarity index 99% rename from techsupport_bot/commands/giphy.py rename to commands/giphy.py index 9f2b276a3..1bc41096f 100644 --- a/techsupport_bot/commands/giphy.py +++ b/commands/giphy.py @@ -4,9 +4,10 @@ from typing import TYPE_CHECKING, Self +from discord.ext import commands + import ui from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/github.py b/commands/github.py similarity index 99% rename from techsupport_bot/commands/github.py rename to commands/github.py index e0e34f55d..ce1795818 100644 --- a/techsupport_bot/commands/github.py +++ b/commands/github.py @@ -16,9 +16,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/grab.py b/commands/grab.py similarity index 99% rename from techsupport_bot/commands/grab.py rename to commands/grab.py index c976f7749..e761f3602 100644 --- a/techsupport_bot/commands/grab.py +++ b/commands/grab.py @@ -7,11 +7,12 @@ import random from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration import ui from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/hangman.py b/commands/hangman.py similarity index 99% rename from techsupport_bot/commands/hangman.py rename to commands/hangman.py index c75a9fe1d..3b03b83e2 100644 --- a/techsupport_bot/commands/hangman.py +++ b/commands/hangman.py @@ -6,13 +6,14 @@ import uuid from typing import TYPE_CHECKING, Self -import configuration import discord -import ui -from core import auxiliary, cogs from discord import app_commands from discord.ext import commands +import configuration +import ui +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/hello.py b/commands/hello.py similarity index 99% rename from techsupport_bot/commands/hello.py rename to commands/hello.py index 6c0a1b646..788ddd2df 100644 --- a/techsupport_bot/commands/hello.py +++ b/commands/hello.py @@ -10,9 +10,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import cogs from discord import app_commands +from core import cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/help.py b/commands/help.py similarity index 99% rename from techsupport_bot/commands/help.py rename to commands/help.py index 757539c75..9e209d7e1 100644 --- a/techsupport_bot/commands/help.py +++ b/commands/help.py @@ -6,13 +6,14 @@ from itertools import product from typing import TYPE_CHECKING, Self -import configuration import discord -import ui -from core import auxiliary, cogs from discord import app_commands from discord.ext import commands +import configuration +import ui +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/htd.py b/commands/htd.py similarity index 99% rename from techsupport_bot/commands/htd.py rename to commands/htd.py index 0d78673a7..e54fad68f 100644 --- a/techsupport_bot/commands/htd.py +++ b/commands/htd.py @@ -7,9 +7,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/hug.py b/commands/hug.py similarity index 99% rename from techsupport_bot/commands/hug.py rename to commands/hug.py index 2c6f6df57..b06d46c5b 100644 --- a/techsupport_bot/commands/hug.py +++ b/commands/hug.py @@ -6,9 +6,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/ipinfo.py b/commands/ipinfo.py similarity index 99% rename from techsupport_bot/commands/ipinfo.py rename to commands/ipinfo.py index 3c702706c..1a41a0274 100644 --- a/techsupport_bot/commands/ipinfo.py +++ b/commands/ipinfo.py @@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/iss.py b/commands/iss.py similarity index 99% rename from techsupport_bot/commands/iss.py rename to commands/iss.py index 043e02f44..f383aef04 100644 --- a/techsupport_bot/commands/iss.py +++ b/commands/iss.py @@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/joke.py b/commands/joke.py similarity index 99% rename from techsupport_bot/commands/joke.py rename to commands/joke.py index 50e678c75..e0a6f14ee 100644 --- a/techsupport_bot/commands/joke.py +++ b/commands/joke.py @@ -4,12 +4,13 @@ from typing import TYPE_CHECKING, Self -import configuration import discord import munch -from core import auxiliary, cogs from discord.ext import commands +import configuration +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/kanye.py b/commands/kanye.py similarity index 99% rename from techsupport_bot/commands/kanye.py rename to commands/kanye.py index 3cce7a92f..61753fb86 100644 --- a/techsupport_bot/commands/kanye.py +++ b/commands/kanye.py @@ -6,11 +6,12 @@ import random from typing import TYPE_CHECKING, Self -import configuration import discord -from core import auxiliary, cogs from discord.ext import commands +import configuration +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/leave.py b/commands/leave.py similarity index 99% rename from techsupport_bot/commands/leave.py rename to commands/leave.py index b425f6a71..e32f26f1d 100644 --- a/techsupport_bot/commands/leave.py +++ b/commands/leave.py @@ -12,9 +12,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/lenny.py b/commands/lenny.py similarity index 99% rename from techsupport_bot/commands/lenny.py rename to commands/lenny.py index 672449a4e..5ed38a04c 100644 --- a/techsupport_bot/commands/lenny.py +++ b/commands/lenny.py @@ -6,9 +6,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/linter.py b/commands/linter.py similarity index 99% rename from techsupport_bot/commands/linter.py rename to commands/linter.py index 964141727..90c522460 100644 --- a/techsupport_bot/commands/linter.py +++ b/commands/linter.py @@ -16,9 +16,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/listen.py b/commands/listen.py similarity index 99% rename from techsupport_bot/commands/listen.py rename to commands/listen.py index ac962defa..746399959 100644 --- a/techsupport_bot/commands/listen.py +++ b/commands/listen.py @@ -7,9 +7,10 @@ import discord import expiringdict -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/members.py b/commands/members.py similarity index 99% rename from techsupport_bot/commands/members.py rename to commands/members.py index 182b1ecb4..4bd9a3985 100644 --- a/techsupport_bot/commands/members.py +++ b/commands/members.py @@ -19,9 +19,10 @@ import discord import yaml -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/mock.py b/commands/mock.py similarity index 99% rename from techsupport_bot/commands/mock.py rename to commands/mock.py index e5dad4ce6..e8a67f9c7 100644 --- a/techsupport_bot/commands/mock.py +++ b/commands/mock.py @@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/moderator.py b/commands/moderator.py similarity index 99% rename from techsupport_bot/commands/moderator.py rename to commands/moderator.py index 1abc1d983..90de49d6d 100644 --- a/techsupport_bot/commands/moderator.py +++ b/commands/moderator.py @@ -5,14 +5,15 @@ from datetime import datetime, timedelta from typing import TYPE_CHECKING, Self -import configuration import dateparser import discord +from discord import app_commands + +import configuration import ui from botlogging import LogContext, LogLevel from commands import modlog from core import auxiliary, cogs, moderation -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/modlog.py b/commands/modlog.py similarity index 99% rename from techsupport_bot/commands/modlog.py rename to commands/modlog.py index 4b6e05cfd..8e71f5d02 100644 --- a/techsupport_bot/commands/modlog.py +++ b/commands/modlog.py @@ -6,14 +6,15 @@ from collections import Counter from typing import TYPE_CHECKING, Self -import configuration import discord import munch -import ui -from core import auxiliary, cogs from discord import app_commands from discord.ext import commands +import configuration +import ui +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/modmail.py b/commands/modmail.py similarity index 99% rename from techsupport_bot/commands/modmail.py rename to commands/modmail.py index 0663bf0bf..0dcc5b8cc 100644 --- a/techsupport_bot/commands/modmail.py +++ b/commands/modmail.py @@ -18,13 +18,14 @@ from datetime import datetime from typing import TYPE_CHECKING, Self -import configuration import discord import expiringdict +from discord.ext import commands + +import configuration import ui from commands import rules from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/news.py b/commands/news.py similarity index 99% rename from techsupport_bot/commands/news.py rename to commands/news.py index c3982a1b0..cb6804f3d 100644 --- a/techsupport_bot/commands/news.py +++ b/commands/news.py @@ -7,12 +7,13 @@ from typing import TYPE_CHECKING, Self import aiocron -import configuration import discord import munch +from discord import app_commands + +import configuration from botlogging import LogContext, LogLevel from core import cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/nicknamefix.py b/commands/nicknamefix.py similarity index 99% rename from techsupport_bot/commands/nicknamefix.py rename to commands/nicknamefix.py index 7e7cd3fab..53df55b10 100644 --- a/techsupport_bot/commands/nicknamefix.py +++ b/commands/nicknamefix.py @@ -6,8 +6,9 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord import app_commands + +from core import auxiliary, cogs from functions import nickname if TYPE_CHECKING: diff --git a/techsupport_bot/commands/notes.py b/commands/notes.py similarity index 99% rename from techsupport_bot/commands/notes.py rename to commands/notes.py index 5eaeb3f28..2457c35fb 100644 --- a/techsupport_bot/commands/notes.py +++ b/commands/notes.py @@ -4,13 +4,14 @@ from typing import TYPE_CHECKING, Self -import configuration import discord +from discord import app_commands +from discord.ext import commands + +import configuration import ui from botlogging import LogContext, LogLevel from core import auxiliary, cogs, moderation -from discord import app_commands -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/poll.py b/commands/poll.py similarity index 99% rename from techsupport_bot/commands/poll.py rename to commands/poll.py index 84a87b0eb..824616ffa 100644 --- a/techsupport_bot/commands/poll.py +++ b/commands/poll.py @@ -10,9 +10,10 @@ import discord import emoji import munch -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/purge.py b/commands/purge.py similarity index 99% rename from techsupport_bot/commands/purge.py rename to commands/purge.py index 98d6507be..d51eedb01 100644 --- a/techsupport_bot/commands/purge.py +++ b/commands/purge.py @@ -5,11 +5,12 @@ import datetime from typing import TYPE_CHECKING, Self -import configuration import discord -from core import auxiliary, cogs, moderation from discord import app_commands +import configuration +from core import auxiliary, cogs, moderation + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/relay.py b/commands/relay.py similarity index 99% rename from techsupport_bot/commands/relay.py rename to commands/relay.py index ad0bef056..e211ab495 100644 --- a/techsupport_bot/commands/relay.py +++ b/commands/relay.py @@ -4,13 +4,14 @@ from typing import TYPE_CHECKING, Self -import configuration import discord import irc.client -import ui from bidict import bidict -from core import auxiliary, cogs from discord.ext import commands + +import configuration +import ui +from core import auxiliary, cogs from functions import automod from functions import logger as function_logger diff --git a/techsupport_bot/commands/report.py b/commands/report.py similarity index 99% rename from techsupport_bot/commands/report.py rename to commands/report.py index 7f20e6add..8e4b16487 100644 --- a/techsupport_bot/commands/report.py +++ b/commands/report.py @@ -6,11 +6,12 @@ import re from typing import TYPE_CHECKING, Self -import configuration import discord -from core import auxiliary, cogs from discord import app_commands +import configuration +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/restart.py b/commands/restart.py similarity index 99% rename from techsupport_bot/commands/restart.py rename to commands/restart.py index 7542b5ce8..5f06e6dc2 100644 --- a/techsupport_bot/commands/restart.py +++ b/commands/restart.py @@ -12,9 +12,10 @@ from typing import TYPE_CHECKING, Self -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/role.py b/commands/role.py similarity index 99% rename from techsupport_bot/commands/role.py rename to commands/role.py index 448bdd615..de91f98e3 100644 --- a/techsupport_bot/commands/role.py +++ b/commands/role.py @@ -5,11 +5,12 @@ from typing import TYPE_CHECKING, Self -import configuration import discord +from discord import app_commands + +import configuration import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/roll.py b/commands/roll.py similarity index 99% rename from techsupport_bot/commands/roll.py rename to commands/roll.py index 6435403d0..aca36fe62 100644 --- a/techsupport_bot/commands/roll.py +++ b/commands/roll.py @@ -6,9 +6,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/rules.py b/commands/rules.py similarity index 99% rename from techsupport_bot/commands/rules.py rename to commands/rules.py index 2d9913a1b..1f50c757b 100644 --- a/techsupport_bot/commands/rules.py +++ b/commands/rules.py @@ -9,9 +9,10 @@ import discord import munch -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/search.py b/commands/search.py similarity index 99% rename from techsupport_bot/commands/search.py rename to commands/search.py index ec9d218c4..bb9033abf 100644 --- a/techsupport_bot/commands/search.py +++ b/commands/search.py @@ -6,9 +6,10 @@ import discord import munch +from discord import app_commands + import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/set.py b/commands/set.py similarity index 99% rename from techsupport_bot/commands/set.py rename to commands/set.py index eb25d5130..8c5bfcea4 100644 --- a/techsupport_bot/commands/set.py +++ b/commands/set.py @@ -13,9 +13,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/slowmode.py b/commands/slowmode.py similarity index 99% rename from techsupport_bot/commands/slowmode.py rename to commands/slowmode.py index 678cc8789..90294a1b6 100644 --- a/techsupport_bot/commands/slowmode.py +++ b/commands/slowmode.py @@ -6,9 +6,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord import app_commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/spotify.py b/commands/spotify.py similarity index 99% rename from techsupport_bot/commands/spotify.py rename to commands/spotify.py index 2b67314eb..c59b58093 100644 --- a/techsupport_bot/commands/spotify.py +++ b/commands/spotify.py @@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Self import aiohttp +from discord.ext import commands + import ui from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/sync.py b/commands/sync.py similarity index 99% rename from techsupport_bot/commands/sync.py rename to commands/sync.py index 8faef0381..473e150fc 100644 --- a/techsupport_bot/commands/sync.py +++ b/commands/sync.py @@ -11,9 +11,10 @@ from typing import TYPE_CHECKING, Self -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/translate.py b/commands/translate.py similarity index 99% rename from techsupport_bot/commands/translate.py rename to commands/translate.py index 36e72eb86..10c2defc5 100644 --- a/techsupport_bot/commands/translate.py +++ b/commands/translate.py @@ -4,9 +4,10 @@ from typing import TYPE_CHECKING, Self -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/urban.py b/commands/urban.py similarity index 99% rename from techsupport_bot/commands/urban.py rename to commands/urban.py index a3334e935..a8479c7c2 100644 --- a/techsupport_bot/commands/urban.py +++ b/commands/urban.py @@ -4,11 +4,12 @@ from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration import ui from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/voting.py b/commands/voting.py similarity index 99% rename from techsupport_bot/commands/voting.py rename to commands/voting.py index 44e46219b..d43e92b4b 100644 --- a/techsupport_bot/commands/voting.py +++ b/commands/voting.py @@ -14,12 +14,13 @@ from typing import TYPE_CHECKING, Self import aiocron -import configuration import discord import munch +from discord import app_commands + +import configuration import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/weather.py b/commands/weather.py similarity index 99% rename from techsupport_bot/commands/weather.py rename to commands/weather.py index fbfa310bd..a7125b6fe 100644 --- a/techsupport_bot/commands/weather.py +++ b/commands/weather.py @@ -6,9 +6,10 @@ import discord import munch -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/whois.py b/commands/whois.py similarity index 99% rename from techsupport_bot/commands/whois.py rename to commands/whois.py index c71640ed1..5237b6ed9 100644 --- a/techsupport_bot/commands/whois.py +++ b/commands/whois.py @@ -5,12 +5,13 @@ import datetime from typing import TYPE_CHECKING, Self -import configuration import discord +from discord import app_commands + +import configuration import ui from commands import application, moderator, notes, xp from core import auxiliary, cogs, moderation -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/winerror.py b/commands/winerror.py similarity index 99% rename from techsupport_bot/commands/winerror.py rename to commands/winerror.py index 537c850c3..6dd8354e0 100644 --- a/techsupport_bot/commands/winerror.py +++ b/commands/winerror.py @@ -7,9 +7,10 @@ from typing import TYPE_CHECKING, Self import discord +from discord import app_commands + import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/wolfram.py b/commands/wolfram.py similarity index 99% rename from techsupport_bot/commands/wolfram.py rename to commands/wolfram.py index 63d2cd232..db0c1ae91 100644 --- a/techsupport_bot/commands/wolfram.py +++ b/commands/wolfram.py @@ -5,9 +5,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/wyr.py b/commands/wyr.py similarity index 99% rename from techsupport_bot/commands/wyr.py rename to commands/wyr.py index eeb6bd692..92f399094 100644 --- a/techsupport_bot/commands/wyr.py +++ b/commands/wyr.py @@ -6,9 +6,10 @@ from typing import TYPE_CHECKING, Self import discord -from core import auxiliary, cogs from discord.ext import commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/xkcd.py b/commands/xkcd.py similarity index 99% rename from techsupport_bot/commands/xkcd.py rename to commands/xkcd.py index 4ed666438..0ef1e2d2e 100644 --- a/techsupport_bot/commands/xkcd.py +++ b/commands/xkcd.py @@ -7,9 +7,10 @@ import discord import munch -from core import auxiliary, cogs from discord import app_commands +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/xp.py b/commands/xp.py similarity index 99% rename from techsupport_bot/commands/xp.py rename to commands/xp.py index 2197d552c..0f8e2ee0a 100644 --- a/techsupport_bot/commands/xp.py +++ b/commands/xp.py @@ -5,13 +5,14 @@ import random from typing import TYPE_CHECKING, Self -import configuration import discord import expiringdict -from core import auxiliary, cogs from discord import app_commands from discord.ext import commands +import configuration +from core import auxiliary, cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/commands/youtube.py b/commands/youtube.py similarity index 99% rename from techsupport_bot/commands/youtube.py rename to commands/youtube.py index a4bd91339..eb2d977d7 100644 --- a/techsupport_bot/commands/youtube.py +++ b/commands/youtube.py @@ -6,9 +6,10 @@ import discord import munch +from discord import app_commands + import ui from core import auxiliary, cogs -from discord import app_commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/configuration/__init__.py b/configuration/__init__.py similarity index 100% rename from techsupport_bot/configuration/__init__.py rename to configuration/__init__.py diff --git a/techsupport_bot/configuration/config.default.json b/configuration/config.default.json similarity index 100% rename from techsupport_bot/configuration/config.default.json rename to configuration/config.default.json diff --git a/techsupport_bot/configuration/config.meta.json b/configuration/config.meta.json similarity index 100% rename from techsupport_bot/configuration/config.meta.json rename to configuration/config.meta.json diff --git a/techsupport_bot/configuration/config.py b/configuration/config.py similarity index 100% rename from techsupport_bot/configuration/config.py rename to configuration/config.py diff --git a/techsupport_bot/core/__init__.py b/core/__init__.py similarity index 100% rename from techsupport_bot/core/__init__.py rename to core/__init__.py diff --git a/techsupport_bot/core/auxiliary.py b/core/auxiliary.py similarity index 100% rename from techsupport_bot/core/auxiliary.py rename to core/auxiliary.py diff --git a/techsupport_bot/core/cogs.py b/core/cogs.py similarity index 99% rename from techsupport_bot/core/cogs.py rename to core/cogs.py index 0cacd5f37..b27b0a366 100644 --- a/techsupport_bot/core/cogs.py +++ b/core/cogs.py @@ -6,11 +6,12 @@ from collections.abc import Awaitable, Callable from typing import TYPE_CHECKING, Any, Self -import configuration import discord -from botlogging import LogContext, LogLevel from discord.ext import commands +import configuration +from botlogging import LogContext, LogLevel + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/core/custom_errors.py b/core/custom_errors.py similarity index 100% rename from techsupport_bot/core/custom_errors.py rename to core/custom_errors.py diff --git a/techsupport_bot/core/databases.py b/core/databases.py similarity index 100% rename from techsupport_bot/core/databases.py rename to core/databases.py diff --git a/techsupport_bot/core/http.py b/core/http.py similarity index 99% rename from techsupport_bot/core/http.py rename to core/http.py index e09d28a29..48d60c722 100644 --- a/techsupport_bot/core/http.py +++ b/core/http.py @@ -15,6 +15,7 @@ import aiohttp import expiringdict import munch + from botlogging import LogLevel from core import custom_errors diff --git a/techsupport_bot/core/moderation.py b/core/moderation.py similarity index 99% rename from techsupport_bot/core/moderation.py rename to core/moderation.py index 7ad61ff48..6649acdf1 100644 --- a/techsupport_bot/core/moderation.py +++ b/core/moderation.py @@ -3,10 +3,11 @@ import datetime -import configuration import discord import munch +import configuration + async def ban_user( guild: discord.Guild, user: discord.User, delete_seconds: int, reason: str diff --git a/docker-compose.yml b/docker-compose.yml index 3c1ebe59a..d069288bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,8 @@ services: restart: unless-stopped stop_signal: SIGINT volumes: - - ./config.yml:/var/TechSupportBot/techsupport_bot/config.yml - - ./techsupport_bot/configuration/guild_configs:/var/TechSupportBot/techsupport_bot/configuration/guild_configs + - ./config.yml:/var/TechSupportBot/config.yml + - ./configuration/guild_configs:/var/TechSupportBot/configuration/guild_configs networks: - all depends_on: diff --git a/techsupport_bot/functions/__init__.py b/functions/__init__.py similarity index 100% rename from techsupport_bot/functions/__init__.py rename to functions/__init__.py diff --git a/techsupport_bot/functions/automod.py b/functions/automod.py similarity index 99% rename from techsupport_bot/functions/automod.py rename to functions/automod.py index d4230184c..470353e8c 100644 --- a/techsupport_bot/functions/automod.py +++ b/functions/automod.py @@ -7,12 +7,13 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration from botlogging import LogContext, LogLevel from commands import moderator, modlog from core import auxiliary, cogs, moderation -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/functions/autoreact.py b/functions/autoreact.py similarity index 99% rename from techsupport_bot/functions/autoreact.py rename to functions/autoreact.py index b19dc3015..31847f007 100644 --- a/techsupport_bot/functions/autoreact.py +++ b/functions/autoreact.py @@ -4,9 +4,10 @@ from typing import TYPE_CHECKING, Self +from discord.ext import commands + import configuration from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/functions/events.py b/functions/events.py similarity index 99% rename from techsupport_bot/functions/events.py rename to functions/events.py index d22862e05..6d58df650 100644 --- a/techsupport_bot/functions/events.py +++ b/functions/events.py @@ -7,11 +7,12 @@ from collections.abc import Sequence from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration from botlogging import LogContext, LogLevel from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/functions/honeypot.py b/functions/honeypot.py similarity index 99% rename from techsupport_bot/functions/honeypot.py rename to functions/honeypot.py index a42d83e11..88d88faa0 100644 --- a/techsupport_bot/functions/honeypot.py +++ b/functions/honeypot.py @@ -5,11 +5,12 @@ import datetime from typing import TYPE_CHECKING, Self -import configuration import discord -from core import cogs from discord.ext import commands +import configuration +from core import cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/functions/logger.py b/functions/logger.py similarity index 99% rename from techsupport_bot/functions/logger.py rename to functions/logger.py index 712edc885..0253d5374 100644 --- a/techsupport_bot/functions/logger.py +++ b/functions/logger.py @@ -5,11 +5,12 @@ import datetime from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration from botlogging import LogContext, LogLevel from core import auxiliary, cogs -from discord.ext import commands if TYPE_CHECKING: import bot diff --git a/techsupport_bot/functions/nickname.py b/functions/nickname.py similarity index 99% rename from techsupport_bot/functions/nickname.py rename to functions/nickname.py index 3b8b12fa0..d63e736c0 100644 --- a/techsupport_bot/functions/nickname.py +++ b/functions/nickname.py @@ -13,13 +13,14 @@ import string from typing import TYPE_CHECKING, Self -import configuration import discord -from botlogging import LogContext, LogLevel -from core import cogs from discord.ext import commands from unidecode import unidecode +import configuration +from botlogging import LogContext, LogLevel +from core import cogs + if TYPE_CHECKING: import bot diff --git a/techsupport_bot/functions/paste.py b/functions/paste.py similarity index 99% rename from techsupport_bot/functions/paste.py rename to functions/paste.py index 083a916d1..96583741b 100644 --- a/techsupport_bot/functions/paste.py +++ b/functions/paste.py @@ -5,11 +5,12 @@ import io from typing import TYPE_CHECKING, Self -import configuration import discord +from discord.ext import commands + +import configuration from botlogging import LogContext, LogLevel from core import cogs -from discord.ext import commands from functions import automod if TYPE_CHECKING: diff --git a/techsupport_bot/ircrelay/__init__.py b/ircrelay/__init__.py similarity index 100% rename from techsupport_bot/ircrelay/__init__.py rename to ircrelay/__init__.py diff --git a/techsupport_bot/ircrelay/formatting.py b/ircrelay/formatting.py similarity index 100% rename from techsupport_bot/ircrelay/formatting.py rename to ircrelay/formatting.py diff --git a/techsupport_bot/ircrelay/relay.py b/ircrelay/relay.py similarity index 99% rename from techsupport_bot/ircrelay/relay.py rename to ircrelay/relay.py index 3c953d881..a23617f5f 100644 --- a/techsupport_bot/ircrelay/relay.py +++ b/ircrelay/relay.py @@ -11,11 +11,12 @@ import threading from typing import Self -import commands import discord import irc.bot import irc.client import irc.connection + +import commands from ircrelay import formatting diff --git a/techsupport_bot/main.py b/main.py similarity index 99% rename from techsupport_bot/main.py rename to main.py index 1a332272b..72fbc5c18 100644 --- a/techsupport_bot/main.py +++ b/main.py @@ -3,9 +3,10 @@ import logging import os -import bot import discord +import bot + MODULE_LOG_LEVELS = { "discord": logging.INFO, "gino": logging.WARNING, diff --git a/pyproject.toml b/pyproject.toml index 871059aa2..2e74d2f51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,4 +41,4 @@ dev = [ ] [tool.pytest.ini_options] -testpaths = ["techsupport_bot/tests"] +testpaths = ["./tests"] diff --git a/techsupport_bot/resources/duckQuotes.txt b/resources/duckQuotes.txt similarity index 100% rename from techsupport_bot/resources/duckQuotes.txt rename to resources/duckQuotes.txt diff --git a/techsupport_bot/resources/winerrors.json b/resources/winerrors.json similarity index 100% rename from techsupport_bot/resources/winerrors.json rename to resources/winerrors.json diff --git a/techsupport_bot/resources/wyrQuestions.txt b/resources/wyrQuestions.txt similarity index 100% rename from techsupport_bot/resources/wyrQuestions.txt rename to resources/wyrQuestions.txt diff --git a/techsupport_bot/tests/__init__.py b/tests/__init__.py similarity index 100% rename from techsupport_bot/tests/__init__.py rename to tests/__init__.py diff --git a/techsupport_bot/tests/commands_tests/test_extensions_conch.py b/tests/commands_tests/test_extensions_conch.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_conch.py rename to tests/commands_tests/test_extensions_conch.py index 5161187c7..c5bcb159d 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_conch.py +++ b/tests/commands_tests/test_extensions_conch.py @@ -9,6 +9,7 @@ from hypothesis import given from hypothesis.strategies import text + from tests import config_for_tests diff --git a/techsupport_bot/tests/commands_tests/test_extensions_emoji.py b/tests/commands_tests/test_extensions_emoji.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_emoji.py rename to tests/commands_tests/test_extensions_emoji.py index 2f4a01f7c..99dd0085d 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_emoji.py +++ b/tests/commands_tests/test_extensions_emoji.py @@ -10,6 +10,7 @@ from unittest.mock import AsyncMock, MagicMock import pytest + from core import auxiliary from tests import config_for_tests diff --git a/techsupport_bot/tests/commands_tests/test_extensions_htd.py b/tests/commands_tests/test_extensions_htd.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_htd.py rename to tests/commands_tests/test_extensions_htd.py index 7c907cc68..9e2c51295 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_htd.py +++ b/tests/commands_tests/test_extensions_htd.py @@ -8,6 +8,7 @@ from typing import Self import pytest + from commands import htd diff --git a/techsupport_bot/tests/commands_tests/test_extensions_hug.py b/tests/commands_tests/test_extensions_hug.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_hug.py rename to tests/commands_tests/test_extensions_hug.py index c1084368d..c5ca7f2bd 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_hug.py +++ b/tests/commands_tests/test_extensions_hug.py @@ -10,6 +10,7 @@ from unittest.mock import AsyncMock, MagicMock, patch import pytest + from commands import hug from core import auxiliary from tests import config_for_tests, helpers diff --git a/techsupport_bot/tests/commands_tests/test_extensions_lenny.py b/tests/commands_tests/test_extensions_lenny.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_lenny.py rename to tests/commands_tests/test_extensions_lenny.py index 1625220bc..f9e641ffb 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_lenny.py +++ b/tests/commands_tests/test_extensions_lenny.py @@ -9,6 +9,7 @@ from unittest.mock import AsyncMock, patch import pytest + from commands import lenny from tests import config_for_tests, helpers diff --git a/techsupport_bot/tests/commands_tests/test_extensions_linter.py b/tests/commands_tests/test_extensions_linter.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_linter.py rename to tests/commands_tests/test_extensions_linter.py index ff8efd86e..5097a5c87 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_linter.py +++ b/tests/commands_tests/test_extensions_linter.py @@ -11,6 +11,7 @@ from unittest.mock import AsyncMock, MagicMock, patch import pytest + from commands import linter from core import auxiliary from tests import config_for_tests, helpers diff --git a/techsupport_bot/tests/commands_tests/test_extensions_mock.py b/tests/commands_tests/test_extensions_mock.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_mock.py rename to tests/commands_tests/test_extensions_mock.py index 6952d5960..7238df54d 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_mock.py +++ b/tests/commands_tests/test_extensions_mock.py @@ -10,10 +10,11 @@ from unittest.mock import AsyncMock, MagicMock, patch import pytest -from commands import mock -from core import auxiliary from hypothesis import given from hypothesis.strategies import text + +from commands import mock +from core import auxiliary from tests import config_for_tests, helpers diff --git a/techsupport_bot/tests/commands_tests/test_extensions_roll.py b/tests/commands_tests/test_extensions_roll.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_roll.py rename to tests/commands_tests/test_extensions_roll.py index 456553fa2..c243bf88d 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_roll.py +++ b/tests/commands_tests/test_extensions_roll.py @@ -11,10 +11,11 @@ import discord import pytest -from commands import roll -from core import auxiliary from hypothesis import given from hypothesis.strategies import integers + +from commands import roll +from core import auxiliary from tests import config_for_tests, helpers diff --git a/techsupport_bot/tests/commands_tests/test_extensions_wyr.py b/tests/commands_tests/test_extensions_wyr.py similarity index 99% rename from techsupport_bot/tests/commands_tests/test_extensions_wyr.py rename to tests/commands_tests/test_extensions_wyr.py index d16490399..57cc663c9 100644 --- a/techsupport_bot/tests/commands_tests/test_extensions_wyr.py +++ b/tests/commands_tests/test_extensions_wyr.py @@ -12,6 +12,7 @@ import discord import pytest + from commands import wyr from core import auxiliary from tests import config_for_tests, helpers diff --git a/techsupport_bot/tests/config_for_tests.py b/tests/config_for_tests.py similarity index 99% rename from techsupport_bot/tests/config_for_tests.py rename to tests/config_for_tests.py index c4f7ed48b..f4f9b94be 100644 --- a/techsupport_bot/tests/config_for_tests.py +++ b/tests/config_for_tests.py @@ -14,7 +14,6 @@ from typing import Self from unittest.mock import patch -from commands import Burn, Corrector, Emojis, Greeter, MagicConch from hypothesis.strategies import ( # pylint: disable=W0611 SearchStrategy, composite, @@ -22,6 +21,8 @@ text, ) +from commands import Burn, Corrector, Emojis, Greeter, MagicConch + from .helpers import ( MockAsset, MockAttachment, diff --git a/techsupport_bot/tests/core_tests/test_base_auxiliary.py b/tests/core_tests/test_base_auxiliary.py similarity index 99% rename from techsupport_bot/tests/core_tests/test_base_auxiliary.py rename to tests/core_tests/test_base_auxiliary.py index bf1d68f1c..380fe4680 100644 --- a/techsupport_bot/tests/core_tests/test_base_auxiliary.py +++ b/tests/core_tests/test_base_auxiliary.py @@ -11,9 +11,10 @@ import discord import pytest -from core import auxiliary from hypothesis import given from hypothesis.strategies import text + +from core import auxiliary from tests import config_for_tests if TYPE_CHECKING: diff --git a/techsupport_bot/tests/helpers/__init__.py b/tests/helpers/__init__.py similarity index 100% rename from techsupport_bot/tests/helpers/__init__.py rename to tests/helpers/__init__.py diff --git a/techsupport_bot/tests/helpers/asset.py b/tests/helpers/asset.py similarity index 100% rename from techsupport_bot/tests/helpers/asset.py rename to tests/helpers/asset.py diff --git a/techsupport_bot/tests/helpers/attachment.py b/tests/helpers/attachment.py similarity index 100% rename from techsupport_bot/tests/helpers/attachment.py rename to tests/helpers/attachment.py diff --git a/techsupport_bot/tests/helpers/bot.py b/tests/helpers/bot.py similarity index 100% rename from techsupport_bot/tests/helpers/bot.py rename to tests/helpers/bot.py diff --git a/techsupport_bot/tests/helpers/channel.py b/tests/helpers/channel.py similarity index 100% rename from techsupport_bot/tests/helpers/channel.py rename to tests/helpers/channel.py diff --git a/techsupport_bot/tests/helpers/context.py b/tests/helpers/context.py similarity index 100% rename from techsupport_bot/tests/helpers/context.py rename to tests/helpers/context.py diff --git a/techsupport_bot/tests/helpers/member.py b/tests/helpers/member.py similarity index 100% rename from techsupport_bot/tests/helpers/member.py rename to tests/helpers/member.py diff --git a/techsupport_bot/tests/helpers/message.py b/tests/helpers/message.py similarity index 100% rename from techsupport_bot/tests/helpers/message.py rename to tests/helpers/message.py diff --git a/techsupport_bot/tests/helpers/reaction.py b/tests/helpers/reaction.py similarity index 100% rename from techsupport_bot/tests/helpers/reaction.py rename to tests/helpers/reaction.py diff --git a/techsupport_bot/ui/__init__.py b/ui/__init__.py similarity index 100% rename from techsupport_bot/ui/__init__.py rename to ui/__init__.py diff --git a/techsupport_bot/ui/application.py b/ui/application.py similarity index 100% rename from techsupport_bot/ui/application.py rename to ui/application.py diff --git a/techsupport_bot/ui/appnotice.py b/ui/appnotice.py similarity index 100% rename from techsupport_bot/ui/appnotice.py rename to ui/appnotice.py diff --git a/techsupport_bot/ui/confirm.py b/ui/confirm.py similarity index 99% rename from techsupport_bot/ui/confirm.py rename to ui/confirm.py index 2aa5e7217..15cbea095 100644 --- a/techsupport_bot/ui/confirm.py +++ b/ui/confirm.py @@ -6,6 +6,7 @@ from typing import Self import discord + from core import auxiliary diff --git a/techsupport_bot/ui/pagination.py b/ui/pagination.py similarity index 100% rename from techsupport_bot/ui/pagination.py rename to ui/pagination.py diff --git a/techsupport_bot/ui/persistent_voting.py b/ui/persistent_voting.py similarity index 100% rename from techsupport_bot/ui/persistent_voting.py rename to ui/persistent_voting.py diff --git a/techsupport_bot/ui/roleselect.py b/ui/roleselect.py similarity index 100% rename from techsupport_bot/ui/roleselect.py rename to ui/roleselect.py diff --git a/techsupport_bot/ui/vote_creation.py b/ui/vote_creation.py similarity index 100% rename from techsupport_bot/ui/vote_creation.py rename to ui/vote_creation.py