CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-08 20:28:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed !loop, added title to !song

Browse Source 
Audio now recognizes owner
This commit is contained in:
Twentysix 2016-02-11 07:36:50 +01:00
parent f7fa78403d
commit 6385c3614f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cogs/audio.py
View File

@ -63,9 +63,8 @@ class Audio:
if self.is_playlist_valid([link]): # reusing a function if self.is_playlist_valid([link]): # reusing a function
if await self.is_alone_or_admin(msg.author): if await self.is_alone_or_admin(msg.author):
self.queue = [] self.queue = []
self.playlist = []
self.current = -1 self.current = -1
await self.play_video(link) self.playlist = [link]
else: else:
self.playlist = [] self.playlist = []
self.current = -1 self.current = -1
@ -79,7 +78,9 @@ class Audio:
"""Shows song title """Shows song title
""" """
if self.downloader["TITLE"]: if self.downloader["TITLE"]:
await self.bot.say(self.downloader["TITLE"]) url = ""
if self.downloader["URL"]: url = 'Link : "' + self.downloader["URL"] + '"'
await self.bot.say(self.downloader["TITLE"] + "\n" + url)
else: else:
await self.bot.say("No title available.") await self.bot.say("No title available.")
@ -182,10 +183,7 @@ class Audio:
msg = ctx.message msg = ctx.message
if self.music_player.is_playing(): if self.music_player.is_playing():
if await self.is_alone_or_admin(msg.author): if await self.is_alone_or_admin(msg.author):
if self.playlist: self.playlist = [self.downloader["URL"]]
self.playlist = self.playlist[[self.current]]
elif self.queue:
self.playlist = self.playlist[[self.queue[0]]]
await self.bot.say("I will play this song on repeat.") await self.bot.say("I will play this song on repeat.")
else: else:
await self.bot.say("I'm in queue mode. Controls are disabled if you're in a room with multiple people.") await self.bot.say("I'm in queue mode. Controls are disabled if you're in a room with multiple people.")
@ -254,6 +252,8 @@ class Audio:
async def is_alone_or_admin(self, author): #Direct control. fix everything async def is_alone_or_admin(self, author): #Direct control. fix everything
if not self.settings["QUEUE_MODE"]: if not self.settings["QUEUE_MODE"]:
return True return True
elif author.id == checks.settings["OWNER"]:
return True
elif discord.utils.get(author.roles, name=checks.settings["ADMIN_ROLE"]) is not None: elif discord.utils.get(author.roles, name=checks.settings["ADMIN_ROLE"]) is not None:
return True return True
elif discord.utils.get(author.roles, name=checks.settings["MOD_ROLE"]) is not None: elif discord.utils.get(author.roles, name=checks.settings["MOD_ROLE"]) is not None: