Author SHA1 Message Date
matthew 73eb59f295 forgot something 2023-04-11 23:04:35 +02:00
matthew 0758690543 revert the autojoin stuff 2023-04-11 23:03:50 +02:00
matthew 50c4ce8bb7 add support for multiple nodes 2023-04-11 22:33:48 +02:00
5 changed files with 15 additions and 20 deletions
+5 -8
View File
@@ -129,15 +129,12 @@ class TuneBot(commands.Bot):
self.lavalink = self.create_lavalink(self.user.id)
def create_lavalink(self, user_id: int) -> "lavalink.Client":
cfg = self.config["lavalink"]
nodes = self.config["nodes"]
client: lavalink.Client = lavalink.Client(user_id, player=CustomPlayer)
client.add_node(
cfg["host"],
cfg["port"],
cfg["password"],
cfg["region"],
cfg["name"],
)
# get the lavalink nodes from the config
for node in nodes:
client.add_node(nodes[node]["host"], nodes[node]["port"], nodes[node]["password"], nodes[node]["region"], nodes[node]["name"])
return client
async def get_context(self, message: Message, *, cls=CustomContext):
-2
View File
@@ -26,7 +26,6 @@ class MusicCog(BaseCog, name="Music"):
self.bot.lavalink.add_event_hook(self.track_hook)
"""
@commands.Cog.listener()
async def on_ready(self):
while not self.is_lavalink_ready():
@@ -44,7 +43,6 @@ class MusicCog(BaseCog, name="Music"):
await player.play()
except:
logger.error(f"Failed to autojoin guild {guild_id}.")
"""
async def track_hook(self, event: lavalink.Event):
if isinstance(event, lavalink.events.QueueEndEvent):
+2 -2
View File
@@ -1,7 +1,7 @@
from discord.ext import commands
from bot import TuneBot
#from cogs.settings.interactions import SettingCommands
from cogs.settings.interactions import SettingCommands
from cogs.settings.interactions import SourceCommands
from context import CustomContext
from utils.classes import BaseCog
@@ -13,5 +13,5 @@ class SettingsCog(BaseCog, name="Settings"):
async def setup(bot: TuneBot):
await bot.add_cog(SettingsCog(bot))
#bot.tree.add_command(SettingCommands(bot), override=True)
bot.tree.add_command(SettingCommands(bot), override=True)
bot.tree.add_command(SourceCommands(bot), override=True)
-2
View File
@@ -105,7 +105,6 @@ class SourceCommands(app_commands.Group):
await ctx.response.send_message(embed=embed)
"""
class SettingCommands(app_commands.Group):
def __init__(self, bot: "TuneBot"):
super().__init__(name="settings", description="Tweak and customize")
@@ -144,4 +143,3 @@ class SettingCommands(app_commands.Group):
await autojoin.disable()
embed.title = "AutoJoin disabled"
await ctx.response.send_message(embed=embed)
"""
+8 -6
View File
@@ -8,12 +8,14 @@
"prefix": "ck!",
"redis_url": "",
"redis_prefix": "",
"lavalink": {
"host": "",
"port": 2333,
"password": "",
"region": "",
"name": ""
"nodes": {
"example": {
"host": "",
"port": 2333,
"password": "",
"region": "",
"name": ""
}
},
"colors": {
"embed": "7289da"