Merge pull request #9 from Matthww/autojoin_feature

Add autojoin feature

cogs/information.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import discord
 from discord.ext import tasks, commands
 
@@ -76,11 +78,20 @@ class InformationCog(commands.Cog, name="Information"):
         )
         await ctx.send(fmt)
 
+        from utils import database
+        database.AutoJoin.get_channels()
+
     @commands.command(name="help", aliases=["about", "info"], slash_command=True)
     @commands.cooldown(1, 1, commands.BucketType.user)
-    async def about(self, ctx: Context):
+    async def about(
+        self,
+        ctx: Context,
+        command: Optional[str] = commands.Option(
+            description="Show help for a command or category"
+        ),
+    ):
         """ChristmasBot command list"""
-        if None:
+        if command:
             entity = self.bot.get_cog(command) or self.bot.get_command(command)
 
             if entity is None:

cogs/music.py

@@ -1,5 +1,7 @@
 import asyncio
 import re
+from typing import Optional
+
 from aioredis.client import Redis
 
 import discord
@@ -11,6 +13,7 @@ from lavalink.models import AudioTrack, DefaultPlayer
 
 from bot import ChristmasBot
 from utils.EmbedGenerator import EmbedGenerator
+from utils.database import AutoJoin
 from context import CustomContext
 from discord import Embed
 
@@ -83,6 +86,46 @@ class Music(commands.Cog):
             )
 
         self.bot.lavalink.add_event_hook(self.track_hook)
+        await self.async_init()
+
+    async def async_init(self):
+        redis_result = await AutoJoin.get_channels(self.bot._redis_client)
+
+        while len(self.bot.lavalink.node_manager.available_nodes) == 0:
+            await asyncio.sleep(1)
+
+        for guild_id, (voicechannel_id, textchannel_id) in redis_result.items():
+            player = self.bot.lavalink.player_manager.create(guild_id)
+            player.store('channel', textchannel_id)
+            voice_channel = await self.bot.fetch_channel(voicechannel_id)
+            await voice_channel.connect(cls=LavalinkVoiceClient)
+            if not player.is_playing:
+                await self.fill_player_queue(
+                    player, self.bot.config["queue_buffer_size"]
+                )
+                await player.play()
+
+                textchannel = await self.bot.fetch_channel(textchannel_id)
+                await textchannel.send("Automatically joined the voice channel")
+
+    async def fill_player_queue(self, player: DefaultPlayer, buffer: Optional[int] = 1):
+        pipeline = self.bot._redis_client.pipeline()
+        for _ in range(buffer):
+            pipeline.randomkey()
+
+        queries = await pipeline.execute()
+        print(queries)
+        # Get the results for the query from Lavalink.
+        for query in queries:
+            result = await player.node.get_tracks(query)
+            print(result)
+            if not result or not result["tracks"]:
+                continue
+
+            track = lavalink.models.AudioTrack(
+                result["tracks"][0], self.bot.user.id, recommended=False
+            )
+            player.add(requester=self.bot.user.id, track=track)
 
     def cog_unload(self):
         """Cog unload handler. This removes any event hooks that were registered."""
@@ -173,38 +216,14 @@ class Music(commands.Cog):
             )
             await channel.send(embed=embed)
         elif isinstance(event, lavalink.events.TrackEndEvent):
-            query = await self.bot._redis_client.randomkey()
+            await self.fill_player_queue(event.player, 1)
-            result = await event.player.node.get_tracks(query)
-            if not result or not result["tracks"]:
-                return
-
-            track = lavalink.models.AudioTrack(
-                result["tracks"][0], self.bot.user.id, recommended=False
-            )
-            event.player.add(requester=self.bot.user.id, track=track)
 
     @commands.command(name="connect", aliases=["p", "play", "join"])
     async def play(self, ctx: CustomContext):
         """Starts playing Christmas bangers"""
         # Get the player for this guild from cache.
         player: DefaultPlayer = self.bot.lavalink.player_manager.get(ctx.guild.id)
-        redis_client: Redis = ctx.get_redis()
+        await self.fill_player_queue(player, self.bot.config["queue_buffer_size"])
-        pipeline = redis_client.pipeline()
-        for _ in range(self.bot.config["queue_buffer_size"]):
-            pipeline.randomkey()
-
-        queries = await pipeline.execute()
-
-        # Get the results for the query from Lavalink.
-        for query in queries:
-            result = await player.node.get_tracks(query)
-            if not result or not result["tracks"]:
-                continue
-
-            track = lavalink.models.AudioTrack(
-                result["tracks"][0], ctx.author.id, recommended=False
-            )
-            player.add(requester=ctx.author.id, track=track)
 
         if not player.is_playing:
             await player.play()

cogs/settings.py

@@ -1,5 +1,7 @@
+from context import CustomContext
 from discord.ext import commands
 from utils.EmbedGenerator import EmbedGenerator
+from utils.database import AutoJoin
 from bot import ChristmasBot
 from discord.ext.commands import Context
 
@@ -10,27 +12,28 @@ class SettingsCog(commands.Cog, name="Settings"):
 
     @commands.group(aliases=["aj"], invoke_without_command=True)
     @commands.cooldown(rate=1, per=5, type=commands.BucketType.user)
-    async def autojoin(self, ctx: Context):
+    async def autojoin(self, ctx: CustomContext):
         await EmbedGenerator.Message(
             ctx,
             "Autojoin",
             f"Usage:\n\n`{ctx.prefix}autojoin set`\n`{ctx.prefix}autojoin unset`",
         )
 
-    @autojoin.command(name="set")
+    @autojoin.command(name="enable")
     @commands.has_permissions(manage_channels=True)
     @commands.cooldown(rate=1, per=5, type=commands.BucketType.user)
-    async def autojoin_set(self, ctx: Context):
+    async def autojoin_set(self, ctx: CustomContext):
-        vc = ctx.author.voice.channel
+        voicechannel_id = ctx.author.voice.channel.id
-        await AutoJoin.update_channel(self.bot, ctx.guild.id, vc.id)
+        textchannel_id = ctx.message.channel.id
+        await AutoJoin.update_channel(ctx.get_redis(), ctx.guild.id, voicechannel_id, textchannel_id)
         await EmbedGenerator.Message(ctx, "Autojoin", "`enabled`")
 
-    @autojoin.command(name="unset")
+    @autojoin.command(name="disable")
     @commands.has_permissions(manage_channels=True)
     @commands.cooldown(rate=1, per=5, type=commands.BucketType.user)
-    async def autojoin_del(self, ctx: Context):
+    async def autojoin_del(self, ctx: CustomContext):
         vc = ctx.author.voice.channel
-        await AutoJoin.del_channel(self.bot, ctx.guild.id)
+        await AutoJoin.del_channel(ctx.get_redis(), ctx.guild.id)
         await EmbedGenerator.Message(ctx, "Autojoin", "`disabled`")
 
 

utils/database.py

@@ -0,0 +1,20 @@
+from aioredis import Redis
+from typing import Sequence
+
+
+class AutoJoin:
+    @staticmethod
+    async def get_channels(redis: Redis) -> Sequence[tuple]:
+        # return all channels
+        channels = await redis.hgetall(name="autojoin")
+        return {key: value.split("-") for key, value in channels.items()}
+
+    @staticmethod
+    async def update_channel(redis: Redis, guild_id, voicechannel_id, textchannel_id):
+        await redis.hset(
+            name="autojoin", key=guild_id, value=f"{voicechannel_id}-{textchannel_id}"
+        )
+
+    @staticmethod
+    async def del_channel(redis: Redis, guild_id):
+        await redis.hdel("autojoin", guild_id)