Merge pull request #43 from ChocoMeow/request-song-channel

Feature: Enable Song Requests in Specific Text Channels

Author: ChocoMeow

cogs/basic.py

@@ -67,7 +67,7 @@ async def nowplay(ctx: commands.Context, player: voicelink.Player):
     icon = ":red_circle:" if track.is_stream else (":pause_button:" if player.is_paused else ":arrow_forward:")
     embed.add_field(name="\u2800", value=f"{icon} {pbar} **[{ctime(player.position)}/{track.formatted_length}]**", inline=False)
 
-    return await ctx.send(embed=embed, view=LinkView(texts[2].format(track.source), track.emoji, track.uri))
+    return await send(ctx, embed, view=LinkView(texts[2].format(track.source), track.emoji, track.uri))
 
 class Basic(commands.Cog):
     def __init__(self, bot: commands.Bot) -> None:
@@ -148,9 +148,16 @@ async def play(self, ctx: commands.Context, *, query: str, start: str = "0", end
             else:
                 position = await player.add_track(tracks[0], start_time=format_time(start), end_time=format_time(end))
                 texts = await get_lang(ctx.guild.id, "live", "trackLoad_pos", "trackLoad")
-                await ctx.send((f"`{texts[0]}`" if tracks[0].is_stream else "") + (texts[1].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length, position) if position >= 1 and player.is_playing else texts[2].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length)), allowed_mentions=False)
-        except voicelink.QueueFull as e:
-            await ctx.send(e)
+
+                stream_content = f"`{texts[0]}`" if tracks[0].is_stream else ""
+                additional_content = texts[1] if position >= 1 and player.is_playing else texts[2]
+
+                await send(
+                    ctx,
+                    stream_content + additional_content,
+                    tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length,
+                    position if position >= 1 and player.is_playing else None
+                )
         finally:
             if not player.is_playing:
                 await player.do_next()
@@ -189,10 +196,16 @@ async def _play(self, interaction: discord.Interaction, message: discord.Message
             else:
                 position = await player.add_track(tracks[0])
                 texts = await get_lang(interaction.guild.id, "live", "trackLoad_pos", "trackLoad")
-                await interaction.followup.send((f"`{texts[0]}`" if tracks[0].is_stream else "") + (texts[1].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length, position) if position >= 1 and player.is_playing else texts[2].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length)), allowed_mentions=False)
-        except voicelink.QueueFull as e:
-            await interaction.followup.send(e)
 
+                stream_content = f"`{texts[0]}`" if tracks[0].is_stream else ""
+                additional_content = texts[1] if position >= 1 and player.is_playing else texts[2]
+
+                await send(
+                    interaction,
+                    stream_content + additional_content,
+                    tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length,
+                    position if position >= 1 and player.is_playing else None
+                )
         finally:
             if not player.is_playing:
                 await player.do_next()
@@ -227,7 +240,7 @@ async def search(self, ctx: commands.Context, *, query: str, platform: str = Sea
         query_track = "\n".join(f"`{index}.` `[{track.formatted_length}]` **{track.title[:35]}**" for index, track in enumerate(tracks[0:10], start=1))
         embed = discord.Embed(title=texts[0].format(query), description=texts[1].format(get_source(platform, "emoji"), platform, len(tracks[0:10]), query_track), color=settings.embed_color)
         view = SearchView(tracks=tracks[0:10], texts=[texts[5], texts[6]])
-        view.response = await ctx.send(embed=embed, view=view, ephemeral=True)
+        view.response = await send(ctx, embed, view=view, ephemeral=True)
 
         await view.wait()
         if view.values is not None:
@@ -236,7 +249,7 @@ async def search(self, ctx: commands.Context, *, query: str, platform: str = Sea
                 track = tracks[int(value.split(". ")[0]) - 1]
                 position = await player.add_track(track)
                 msg += (f"`{texts[2]}`" if track.is_stream else "") + (texts[3].format(track.title, track.uri, track.author, track.formatted_length, position) if position >= 1 else texts[4].format(track.title, track.uri, track.author, track.formatted_length))
-            await ctx.send(msg, allowed_mentions=False)
+            await send(ctx, msg)
 
             if not player.is_playing:
                 await player.do_next()
@@ -272,11 +285,16 @@ async def playtop(self, ctx: commands.Context, *, query: str, start: str = "0",
             else:
                 position = await player.add_track(tracks[0], start_time=format_time(start), end_time=format_time(end), at_front=True)
                 texts = await get_lang(ctx.guild.id, "live", "trackLoad_pos", "trackLoad")
-                await ctx.send((f"`{texts[0]}`" if tracks[0].is_stream else "") + (texts[1].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length, position) if position >= 1 and player.is_playing else texts[2].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length)), allowed_mentions=False)
-        
-        except voicelink.QueueFull as e:
-            await ctx.send(e)
 
+                stream_content = f"`{texts[0]}`" if tracks[0].is_stream else ""
+                additional_content = texts[1] if position >= 1 and player.is_playing else texts[2]
+
+                await send(
+                    ctx,
+                    stream_content + additional_content,
+                    tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length,
+                    position if position >= 1 and player.is_playing else None
+                )
         finally:
             if not player.is_playing:
                 await player.do_next()
@@ -311,11 +329,14 @@ async def forceplay(self, ctx: commands.Context, *, query: str, start: str = "0"
             else:
                 texts = await get_lang(ctx.guild.id, "live", "trackLoad")
                 await player.add_track(tracks[0], start_time=format_time(start), end_time=format_time(end), at_front=True)
-                await ctx.send((f"`{texts[0]}`" if tracks[0].is_stream else "") + texts[1].format(tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length), allowed_mentions=False)
 
-        except voicelink.QueueFull as e:
-            await ctx.send(e)
+                stream_content = f"`{texts[0]}`" if tracks[0].is_stream else ""
 
+                await send(
+                    ctx,
+                    stream_content + texts[1],
+                    tracks[0].title, tracks[0].uri, tracks[0].author, tracks[0].formatted_length,
+                )
         finally:
             if player.queue._repeat.mode == voicelink.LoopType.TRACK:
                 await player.set_repeat(voicelink.LoopType.OFF)
@@ -471,7 +492,7 @@ async def queue(self, ctx: commands.Context):
         if player.queue.is_empty:
             return await nowplay(ctx, player)
         view = ListView(player=player, author=ctx.author)
-        view.response = await ctx.send(embed=await view.build_embed(), view=view)
+        view.response = await send(ctx, await view.build_embed(), view=view)
 
     @queue.command(name="export", aliases=get_aliases("export"))
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
@@ -532,10 +553,6 @@ async def _import(self, ctx: commands.Context, attachment: discord.Attachment):
 
             index = await player.add_track(tracks)
             await send(ctx, "playlistLoad", attachment.filename, index)
-                
-        except voicelink.QueueFull as e:
-            return await ctx.send(e, ephemeral=True)
-
         except Exception as e:
             logger.error("error", exc_info=e)
             raise e
@@ -559,7 +576,7 @@ async def history(self, ctx: commands.Context):
             return await nowplay(ctx, player)
 
         view = ListView(player=player, author=ctx.author, is_queue=False)
-        view.response = await ctx.send(embed=await view.build_embed(), view=view)
+        view.response = await send(ctx, await view.build_embed(), view=view)
 
     @commands.hybrid_command(name="leave", aliases=get_aliases("leave"))
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
@@ -653,7 +670,7 @@ async def remove(self, ctx: commands.Context, position1: int, position2: int = N
         await send(ctx, "removed", len(removed_tracks.keys()))
 
     @commands.hybrid_command(name="forward", aliases=get_aliases("forward"))
-    @app_commands.describe(position="Input a amount that you to forward to. Exmaple: 1:20")
+    @app_commands.describe(position="Input an amount that you to forward to. Exmaple: 1:20")
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
     async def forward(self, ctx: commands.Context, position: str = "10"):
         "Forwards by a certain amount of time in the current track. The default is 10 seconds."
@@ -674,7 +691,7 @@ async def forward(self, ctx: commands.Context, position: str = "10"):
         await send(ctx, "forward", ctime(player.position + num))
 
     @commands.hybrid_command(name="rewind", aliases=get_aliases("rewind"))
-    @app_commands.describe(position="Input a amount that you to rewind to. Exmaple: 1:20")
+    @app_commands.describe(position="Input an amount that you to rewind to. Exmaple: 1:20")
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
     async def rewind(self, ctx: commands.Context, position: str = "10"):
         "Rewind by a certain amount of time in the current track. The default is 10 seconds."
@@ -785,7 +802,7 @@ async def lyrics(self, ctx: commands.Context, title: str = "", artist: str = "")
             return await send(ctx, "lyricsNotFound", ephemeral=True)
 
         view = LyricsView(name=title, source={_: re.findall(r'.*\n(?:.*\n){,22}', v) for _, v in song.items()}, author=ctx.author)
-        view.response = await ctx.send(embed=view.build_embed(), view=view)
+        view.response = await send(ctx, view.build_embed(), view=view)
 
     @commands.hybrid_command(name="swapdj", aliases=get_aliases("swapdj"))
     @app_commands.describe(member="Choose a member to transfer the dj role.")
@@ -841,7 +858,7 @@ async def help(self, ctx: commands.Context, category: str = "News") -> None:
             category = "News"
         view = HelpView(self.bot, ctx.author)
         embed = view.build_embed(category)
-        view.response = await ctx.send(embed=embed, view=view)
+        view.response = await send(ctx, embed, view=view)
 
     @commands.hybrid_command(name="ping", aliases=get_aliases("ping"))
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
@@ -866,7 +883,7 @@ async def ping(self, ctx: commands.Context):
                     inline=False
             )
 
-        await ctx.send(embed=embed)
+        await send(ctx, embed)
 
 async def setup(bot: commands.Bot) -> None:
     await bot.add_cog(Basic(bot))

cogs/playlist.py

@@ -107,7 +107,7 @@ async def playlist_autocomplete(self, interaction: discord.Interaction, current:
     async def playlist(self, ctx: commands.Context):
         view = HelpView(self.bot, ctx.author)
         embed = view.build_embed(self.qualified_name)
-        view.response = await ctx.send(embed=embed, view=view)
+        view.response = send(ctx, embed, view=view)
 
     @playlist.command(name="play", aliases=get_aliases("play"))
     @app_commands.describe(
@@ -212,7 +212,7 @@ async def view(self, ctx: commands.Context) -> None:
         embed.set_footer(text=text[2])
 
         view = PlaylistView(embed, results, ctx.author)
-        view.response = await ctx.send(embed=embed, view=view, ephemeral=True)
+        view.response = await send(ctx, embed, view=view, ephemeral=True)
 
     @playlist.command(name="create", aliases=get_aliases("create"))
     @app_commands.describe(
@@ -344,7 +344,7 @@ async def inbox(self, ctx: commands.Context) -> None:
 
         inbox = user['inbox'].copy()
         view = InboxView(ctx.author, user['inbox'])
-        view.response = await ctx.send(embed=view.build_embed(), view=view, ephemeral=True)
+        view.response = await send(ctx, view.build_embed(), view=view, ephemeral=True)
         await view.wait()
 
         if inbox == user['inbox']:

cogs/settings.py

@@ -58,13 +58,16 @@ def __init__(self, bot) -> None:
     async def settings(self, ctx: commands.Context):
         view = HelpView(self.bot, ctx.author)
         embed = view.build_embed(self.qualified_name)
-        view.response = await ctx.send(embed=embed, view=view)
+        view.response = await send(ctx, embed, view=view)
 
     @settings.command(name="prefix", aliases=get_aliases("prefix"))
     @commands.has_permissions(manage_guild=True)
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
     async def prefix(self, ctx: commands.Context, prefix: str):
         "Change the default prefix for message commands."
+        if not self.bot.intents.message_content:
+            return await send(ctx, "missingIntents", "MESSAGE_CONTENT", ephemeral=True)
+        
         await update_settings(ctx.guild.id, {"$set": {"prefix": prefix}})
         await send(ctx, "setPrefix", prefix, prefix)
 
@@ -170,7 +173,7 @@ async def view(self, ctx: commands.Context):
             ),
             inline=False
         )
-        await ctx.send(embed=embed)
+        await send(ctx, embed)
 
     @settings.command(name="volume", aliases=get_aliases("volume"))
     @app_commands.describe(value="Input a integer.")
@@ -226,7 +229,7 @@ async def customcontroller(self, ctx: commands.Context):
         controller_settings = settings.get("default_controller", func.settings.controller)
 
         view = EmbedBuilderView(ctx, controller_settings.get("embeds").copy())
-        view.response = await ctx.send(embed=view.build_embed(), view=view)
+        view.response = await send(ctx, view.build_embed(), view=view)
 
     @settings.command(name="controllermsg", aliases=get_aliases("controllermsg"))
     @commands.has_permissions(manage_guild=True)
@@ -243,9 +246,46 @@ async def controllermsg(self, ctx: commands.Context):
     @commands.has_permissions(manage_guild=True)
     @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
     async def stageannounce(self, ctx: commands.Context, template: str = None):
-        """Customize the channel topic template"""
+        "Customize the channel topic template"
         await update_settings(ctx.guild.id, {"$set": {'stage_announce_template': template}})
-        await send(ctx, "SetStageAnnounceTemplate")
+        await send(ctx, "setStageAnnounceTemplate")
+
+    @settings.command(name="setupchannel", aliases=get_aliases("setupchannel"))
+    @app_commands.describe(
+        channel="Provide a request channel. If not, a text channel will be generated."
+    )
+    @commands.has_permissions(manage_guild=True)
+    @commands.dynamic_cooldown(cooldown_check, commands.BucketType.guild)
+    async def setupchannel(self, ctx: commands.Context, channel: discord.TextChannel = None) -> None:
+        "Sets up a dedicated channel for song requests in your server."
+        if not self.bot.intents.message_content:
+            return await send(ctx, "missingIntents", "MESSAGE_CONTENT", ephemeral=True)
+        
+        if not channel:
+            try:
+                overwrites = {
+                    ctx.guild.me: discord.PermissionOverwrite(
+                        read_messages=True,
+                        manage_messages=True
+                    )
+                }
+                channel = await ctx.guild.create_text_channel("vocard-song-requests", overwrites=overwrites)
+            except:
+                return await send(ctx, "noCreatePermission")
+
+        channel_perms = channel.permissions_for(ctx.me)
+        if not channel_perms.text() and not channel_perms.manage_messages:
+            return await send(ctx, "noCreatePermission")
+        
+        settings = await func.get_settings(ctx.guild.id)
+        controller = settings.get("default_controller", func.settings.controller).get("embeds", {}).get("inactive", {})        
+        message = await channel.send(embed=voicelink.build_embed(controller, voicelink.Placeholders(self.bot)))
+
+        await update_settings(ctx.guild.id, {"$set": {'music_request_channel': {
+            "text_channel_id": channel.id,
+            "controller_msg_id": message.id,
+        }}})
+        await send(ctx, "createSongRequestChannel", channel.mention)
 
     @app_commands.command(name="debug")
     async def debug(self, interaction: discord.Interaction):
@@ -268,7 +308,7 @@ async def debug(self, interaction: discord.Interaction):
             value=f"```• VERSION: {func.settings.version}\n" \
                   f"• LATENCY: {self.bot.latency:.2f}ms\n" \
                   f"• GUILDS:  {len(self.bot.guilds)}\n" \
-                  f"• USERS:   {sum([guild.member_count for guild in self.bot.guilds])}\n" \
+                  f"• USERS:   {sum([guild.member_count or 0 for guild in self.bot.guilds])}\n" \
                   f"• PLAYERS: {len(self.bot.voice_clients)}```",
             inline=False
         )