Merge branch 'bot-dev'

Author: utlandr

cogs/voice/voice.py

@@ -1,14 +1,16 @@
 import discord
+
+from discord import Reaction, User, Message
 from discord.ext import commands
 
 from cogs.voice.voice_fun import bot_audible_update
-from cogs.voice.voice_fun import create_playing_embed
 from cogs.voice.voice_fun import create_queue_embed
 from cogs.voice.voice_fun import droid_speak_translate
 from cogs.voice.voice_fun import format_duration
 from cogs.voice.voice_fun import play_queue
 from cogs.voice.voice_fun import add_queue
 from cogs.voice.voice_fun import YTDLSource
+from cogs.voice.voice_fun import setup_player
 
 
 class Music(commands.Cog):
@@ -116,6 +118,31 @@ async def volume(self, ctx, *volume: int):
 
         return await ctx.send("Current volume is {}%".format(bot_volume))
 
+    @commands.command()
+    async def flick(self, ctx):
+        """Switch between paused and playing states
+
+        :param ctx: command invocation message context
+        :return: None
+        """
+        if ctx.voice_client.is_playing():
+            ctx.voice_client.pause()
+        elif ctx.voice_client.is_paused():
+            ctx.voice_client.resume()
+
+    @classmethod
+    async def _react_flick(cls, reaction):
+        """Switch between paused and playing states
+
+        :param reaction: Reaction object invoking flick action
+        :return: None
+        """
+        guild = reaction.message.guild
+        if guild.voice_client.is_playing():
+            guild.voice_client.pause()
+        elif guild.voice_client.is_paused():
+            guild.voice_client.resume()
+
     #   Pause current audio stream
     @commands.command()
     async def pause(self, ctx):
@@ -162,6 +189,12 @@ async def skip(self, ctx, *queue_id):
             await ctx.send("Skipping:\t{}".format(player_title))
             ctx.voice_client.stop()
 
+    async def _react_skip(self, reaction):
+        guild_id = reaction.message.guild.id
+        player_title = self.queues[guild_id][0].title
+        await reaction.message.channel.send("Skipping:\t{}".format(player_title))
+        reaction.message.guild.voice_client.stop()
+
     #   Display information about current audio being played
     @commands.command()
     async def player(self, ctx):
@@ -175,8 +208,7 @@ async def player(self, ctx):
             if queue:
                 source = queue[0]
                 status = "Paused" if ctx.voice_client.is_paused() else "Playing"
-                embed_playing = create_playing_embed(source, status)
-                await ctx.send(embed=embed_playing)
+                await setup_player(ctx, source)
 
     #   View the queue of the existing playlist
     @commands.command()
@@ -218,7 +250,8 @@ async def queue(self, ctx, first=5):
             embed_queue.add_field(name=f"Queue (Displaying first {first})",
                                   value=queue_string,
                                   inline=False)
-            await ctx.send(embed=embed_queue)
+            ret_msg: Message = await ctx.send(embed=embed_queue)
+            await ret_msg.delete(delay=10)
 
     @commands.command()
     async def speak(self, ctx, *phrase: str):
@@ -230,6 +263,39 @@ async def speak(self, ctx, *phrase: str):
         if not ctx.voice_client.is_playing() or ctx.voice_client.is_paused():
             await droid_speak_translate(ctx, phrase)
 
+    @staticmethod
+    def _is_not_bot(user):
+        return not user.bot
+
+    @commands.Cog.listener()
+    async def on_reaction_add(self, reaction: Reaction, user: User) -> None:
+        """Listen for all added reactions
+
+        :param reaction: Reaction that was submitted by a User
+        :param user: The User that submitted the Reaction
+        :return:
+        """
+        if self._is_not_bot(user):
+            await self.manage_music(reaction, user)
+
+    async def manage_music(self, reaction: Reaction, user: User) -> None:
+        """For a given Reaction, determine if music player needs to be managed
+
+        :param reaction: a Reaction object
+        :param user: the User who sent the Reaction
+        :return:
+        """
+        if reaction.message.author.bot:  # This loosely rules out reactions to non-bot messages messages.
+            if str(reaction) == "⏭️":
+                await self._react_skip(reaction)
+                await reaction.message.clear_reactions()
+                await reaction.message.delete(delay=10)
+            elif str(reaction) == "⏯️":
+                await self._react_flick(reaction)
+                await reaction.remove(user)
+            else:
+                pass
+
     @stream.before_invoke
     @speak.before_invoke
     async def ensure_voice(self, ctx):

cogs/voice/voice_fun.py

@@ -1,4 +1,6 @@
 import asyncio
+
+from discord import Message
 from emoji import demojize
 import googleapiclient.discovery
 import random
@@ -41,8 +43,6 @@ async def get_info(cls, url):
         """Stream audio from a supplied url instead of searching
 
         :param url: supplied URL
-        :param loop: video looping
-        :param stream: determine if URL is a stream
         :return:
         """
 
@@ -156,13 +156,21 @@ async def add_queue(music, ctx, source: YTDLSource):
 
     if len(source.videos) == 1:
         embed = single_queue_embed(source.videos[0], len(music.queues[guild_id]))
-        await ctx.send(embed=embed)
+        ret_msg: Message = await ctx.send(embed=embed)
+        await ret_msg.delete(delay=10)
     else:
         embed = playlist_queue_embed(source)
-        await ctx.send(embed=embed)
+        ret_msg: Message = await ctx.send(embed=embed)
+        await ret_msg.delete(delay=10)
     return
 
 
+async def setup_player(ctx, source):
+    msg = await ctx.send(embed=create_playing_embed(source, "Playing"))
+    await msg.add_reaction("⏯️")
+    await msg.add_reaction("⏭️")
+
+
 #   Queue player
 def play_queue(music, ctx):
     """Setup and manage the music player
@@ -182,8 +190,7 @@ def play_queue(music, ctx):
                     tmp = source.extract_audio()
                     audio = discord.PCMVolumeTransformer(tmp, volume=music.cur_volume)
                     music.players[guild_id] = audio
-                    asyncio.run_coroutine_threadsafe(ctx.send(embed=create_playing_embed(source, "Playing")),
-                                                     loop=music.bot.loop)
+                    asyncio.run_coroutine_threadsafe(setup_player(ctx, source), loop=music.bot.loop)
                     play_audio(music, audio, ctx)
                 else:
                     pass

mksbot_main.py

@@ -2,17 +2,14 @@
 import sys
 import traceback
 import yaml
+import discord
 
 from cogs.reddit.reddit import Reddit
 from cogs.amusement.amusement import Amusement
 from cogs.voice.voice import Music
 from discord.ext import commands
 
-
-from base_functions import *
-
-#if not discord.opus.is_loaded():
-#    discord.opus.load_opus('opus')
+import base_functions as mks
 
 #   Import config data and extensions (cogs)
 config = yaml.safe_load(open("./config.yml"))
@@ -23,7 +20,7 @@
 cogs = [Reddit(bot),
         Amusement(bot),
         Music(bot)]
-        
+
 if __name__ == '__main__':
     for extension in cogs:
         try:
@@ -68,7 +65,7 @@ async def info(ctx):
 async def user(ctx, *, member: discord.Member):
     """Get user information
     """
-    await ctx.send(embed=user_info_embed(member))
+    await ctx.send(embed=mks.user_info_embed(member))
 
 
 @bot.command(pass_context=True)
@@ -89,7 +86,7 @@ async def rm(ctx, *number):
             if n > 0:
                 limit = n
 
-        except ValueError as e:
+        except ValueError:
             if number[0] == "purge":
                 limit = None
 
@@ -135,8 +132,8 @@ async def help(ctx, *args):
         await ctx.send(embed=embed)
 
     else:
-        c_group = []
-        just_c = []
+        c_group = [group for _ in config["help"] for group in config["help"]]
+        just_c = [c in group for group in config["help"] for c in config["help"][group]]
         command = args[0].replace("!", "")
         [[c_group.append(group) for c in config["help"][group]] for group in config["help"]]
         [[just_c.append(c) for c in config["help"][group]] for group in config["help"]]

requirements.txt

@@ -1,8 +1,7 @@
-google-api-python-client==1.8.0
-praw==6.5.1
-requests==2.23.0
-discord.py==1.3.3
-youtube_dl==2020.7.28
-emoji==0.5.4
+requests==2.24.0
 discord==1.0.1
+emoji==0.6.0
+google_api_python_client==1.10.0
+praw==7.1.0
 PyYAML==5.3.1
+youtube_dl==2020.7.28