aboutsummaryrefslogtreecommitdiff
path: root/code
diff options
context:
space:
mode:
Diffstat (limited to 'code')
-rw-r--r--code/bot.py2
-rw-r--r--code/cogs/autoplay.py4
-rw-r--r--code/cogs/bug.py2
-rw-r--r--code/cogs/clear.py2
-rw-r--r--code/cogs/feedback.py2
-rw-r--r--code/cogs/help.py2
-rw-r--r--code/cogs/music.py4
-rw-r--r--code/cogs/news.py2
-rw-r--r--code/cogs/nowplaying.py2
-rw-r--r--code/cogs/owner/stats.py2
-rw-r--r--code/cogs/pause.py2
-rw-r--r--code/cogs/play.py4
-rw-r--r--code/cogs/queue.py2
-rw-r--r--code/cogs/remove.py2
-rw-r--r--code/cogs/repeat.py2
-rw-r--r--code/cogs/resume.py2
-rw-r--r--code/cogs/shuffle.py2
-rw-r--r--code/cogs/skip.py4
-rw-r--r--code/cogs/stop.py2
-rw-r--r--code/utils/ai_recommendations.py (renamed from code/ai_recommendations.py)0
-rw-r--r--code/utils/command_tree.py4
-rw-r--r--code/utils/config.py (renamed from code/config.py)0
-rw-r--r--code/utils/custom_sources.py (renamed from code/custom_sources.py)0
23 files changed, 25 insertions, 25 deletions
diff --git a/code/bot.py b/code/bot.py
index 5a01fc2..aafeb0d 100644
--- a/code/bot.py
+++ b/code/bot.py
@@ -4,7 +4,7 @@ import os
import requests
import openai
-import config
+import utils.config as config
from utils.command_tree import Tree
diff --git a/code/cogs/autoplay.py b/code/cogs/autoplay.py
index 77cf376..af217f9 100644
--- a/code/cogs/autoplay.py
+++ b/code/cogs/autoplay.py
@@ -5,8 +5,8 @@ from discord.ext import commands
from cogs.music import Music
from typing import Literal
-from ai_recommendations import add_song_recommendations
-from config import BOT_COLOR
+from utils.ai_recommendations import add_song_recommendations
+from utils.config import BOT_COLOR
class Autoplay(commands.Cog):
diff --git a/code/cogs/bug.py b/code/cogs/bug.py
index 4f8606d..2162efe 100644
--- a/code/cogs/bug.py
+++ b/code/cogs/bug.py
@@ -2,7 +2,7 @@ import discord
from discord import app_commands
from discord.ext import commands
-from config import BOT_COLOR, BUG_CHANNEL_ID
+from utils.config import BOT_COLOR, BUG_CHANNEL_ID
class BugReport(discord.ui.Modal, title="Report a bug"):
diff --git a/code/cogs/clear.py b/code/cogs/clear.py
index 79b2f0f..959d013 100644
--- a/code/cogs/clear.py
+++ b/code/cogs/clear.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Clear(commands.Cog):
diff --git a/code/cogs/feedback.py b/code/cogs/feedback.py
index 149b112..0c57a58 100644
--- a/code/cogs/feedback.py
+++ b/code/cogs/feedback.py
@@ -2,7 +2,7 @@ import discord
from discord import app_commands
from discord.ext import commands
-from config import BOT_COLOR, FEEDBACK_CHANNEL_ID
+from utils.config import BOT_COLOR, FEEDBACK_CHANNEL_ID
class FeedbackForm(discord.ui.Modal, title="Give feedback about the bot"):
diff --git a/code/cogs/help.py b/code/cogs/help.py
index 2626223..3746482 100644
--- a/code/cogs/help.py
+++ b/code/cogs/help.py
@@ -2,7 +2,7 @@ import discord
from discord.ext import commands
from discord import app_commands
-from config import BOT_COLOR, BOT_INVITE_LINK
+from utils.config import BOT_COLOR, BOT_INVITE_LINK
commands_and_descriptions = {
"play": {
diff --git a/code/cogs/music.py b/code/cogs/music.py
index 0b32b9b..895a758 100644
--- a/code/cogs/music.py
+++ b/code/cogs/music.py
@@ -4,14 +4,14 @@ from discord import app_commands
import lavalink
from lavalink import errors
-from config import (
+from utils.config import (
LAVALINK_HOST,
LAVALINK_PASSWORD,
LAVALINK_PORT,
LOG,
)
from utils.command_tree import CheckPlayerError
-from ai_recommendations import add_song_recommendations
+from utils.ai_recommendations import add_song_recommendations
class LavalinkVoiceClient(discord.VoiceProtocol):
diff --git a/code/cogs/news.py b/code/cogs/news.py
index b73ffcc..642e824 100644
--- a/code/cogs/news.py
+++ b/code/cogs/news.py
@@ -2,7 +2,7 @@ import discord
from discord import app_commands
from discord.ext import commands
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class News(commands.Cog):
diff --git a/code/cogs/nowplaying.py b/code/cogs/nowplaying.py
index 928ac51..91c946d 100644
--- a/code/cogs/nowplaying.py
+++ b/code/cogs/nowplaying.py
@@ -5,7 +5,7 @@ from discord.ext import commands
from cogs.music import Music
import lavalink
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class NowPlaying(commands.Cog):
diff --git a/code/cogs/owner/stats.py b/code/cogs/owner/stats.py
index 2c40c1d..be79e86 100644
--- a/code/cogs/owner/stats.py
+++ b/code/cogs/owner/stats.py
@@ -3,7 +3,7 @@ import sqlite3
import discord
import os
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Stats(commands.Cog):
diff --git a/code/cogs/pause.py b/code/cogs/pause.py
index 656075c..987496e 100644
--- a/code/cogs/pause.py
+++ b/code/cogs/pause.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Pause(commands.Cog):
diff --git a/code/cogs/play.py b/code/cogs/play.py
index 9a5562d..6ae7686 100644
--- a/code/cogs/play.py
+++ b/code/cogs/play.py
@@ -7,8 +7,8 @@ import re
import requests
from cogs.music import Music, LavalinkVoiceClient
-from config import BOT_COLOR, APPLE_MUSIC_KEY
-from custom_sources import SpotifySource, AppleSource
+from utils.config import BOT_COLOR, APPLE_MUSIC_KEY
+from utils.custom_sources import SpotifySource, AppleSource
url_rx = re.compile(r"https?://(?:www\.)?.+")
diff --git a/code/cogs/queue.py b/code/cogs/queue.py
index 2f00671..3f5c698 100644
--- a/code/cogs/queue.py
+++ b/code/cogs/queue.py
@@ -6,7 +6,7 @@ from cogs.music import Music
import math
import lavalink
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Queue(commands.Cog):
diff --git a/code/cogs/remove.py b/code/cogs/remove.py
index 2188331..ac3f941 100644
--- a/code/cogs/remove.py
+++ b/code/cogs/remove.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Remove(commands.Cog):
diff --git a/code/cogs/repeat.py b/code/cogs/repeat.py
index 5f27b6e..b7b43ea 100644
--- a/code/cogs/repeat.py
+++ b/code/cogs/repeat.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Repeat(commands.GroupCog, name="repeat"):
diff --git a/code/cogs/resume.py b/code/cogs/resume.py
index 4d95682..95b163a 100644
--- a/code/cogs/resume.py
+++ b/code/cogs/resume.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Resume(commands.Cog):
diff --git a/code/cogs/shuffle.py b/code/cogs/shuffle.py
index 7ba9cf9..5c2f381 100644
--- a/code/cogs/shuffle.py
+++ b/code/cogs/shuffle.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Shuffle(commands.GroupCog, name="shuffle"):
diff --git a/code/cogs/skip.py b/code/cogs/skip.py
index b3645fb..e833bfa 100644
--- a/code/cogs/skip.py
+++ b/code/cogs/skip.py
@@ -5,8 +5,8 @@ from discord.ext import commands
from cogs.music import Music
import asyncio
-from config import BOT_COLOR
-from custom_sources import LoadError
+from utils.config import BOT_COLOR
+from utils.custom_sources import LoadError
class Skip(commands.Cog):
diff --git a/code/cogs/stop.py b/code/cogs/stop.py
index fd7bb5d..cd8eb13 100644
--- a/code/cogs/stop.py
+++ b/code/cogs/stop.py
@@ -4,7 +4,7 @@ from discord import app_commands
from discord.ext import commands
from cogs.music import Music
-from config import BOT_COLOR
+from utils.config import BOT_COLOR
class Stop(commands.Cog):
diff --git a/code/ai_recommendations.py b/code/utils/ai_recommendations.py
index 68764bc..68764bc 100644
--- a/code/ai_recommendations.py
+++ b/code/utils/ai_recommendations.py
diff --git a/code/utils/command_tree.py b/code/utils/command_tree.py
index 504d3a9..947a58c 100644
--- a/code/utils/command_tree.py
+++ b/code/utils/command_tree.py
@@ -3,8 +3,8 @@ from discord import app_commands
from discord.ext.commands.errors import *
import datetime
-from config import BOT_COLOR
-from custom_sources import LoadError
+from utils.config import BOT_COLOR
+from utils.custom_sources import LoadError
# Create a custom AppCommandError for the create_player function
diff --git a/code/config.py b/code/utils/config.py
index d411653..d411653 100644
--- a/code/config.py
+++ b/code/utils/config.py
diff --git a/code/custom_sources.py b/code/utils/custom_sources.py
index 96ae3a9..96ae3a9 100644
--- a/code/custom_sources.py
+++ b/code/utils/custom_sources.py