mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-21 00:07:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug where playlist bot attempts to process replies in PMs.

Browse Source
This commit is contained in:
shrx 2016-03-01 15:23:46 +01:00 committed by Rapptz
parent 6a31f6af1e
commit 8c4f928684
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/playlist.py
View File

@ -39,42 +39,43 @@ class Bot(discord.Client):
if message.channel.is_private:
await self.send_message(message.channel, 'You cannot use this bot in private messages.')
if message.content.startswith('$join'):
elif message.content.startswith('$join'):
if self.is_voice_connected():
await self.send_message(message.channel, 'Already connected to a voice channel')
channel_name = message.content[5:].strip()
check = lambda c: c.name == channel_name and c.type == discord.ChannelType.voice
channel = discord.utils.find(check, message.server.channels)
if channel is None:
await self.send_message(message.channel, 'Cannot find a voice channel by that name.')
await self.join_voice_channel(channel)
self.starter = message.author
else:
await self.join_voice_channel(channel)
self.starter = message.author
elif message.content.startswith('$leave'):
if not self.can_control_song(message.author):
return
self.starter = None
await self.voice.disconnect()
elif message.content.startswith('$pause'):
if not self.can_control_song(message.author):
fmt = 'Only the requester ({0.current.requester}) can control this song'
await self.send_message(message.channel, fmt.format(self))
if self.player.is_playing():
elif self.player.is_playing():
self.player.pause()
elif message.content.startswith('$resume'):
if not self.can_control_song(message.author):
fmt = 'Only the requester ({0.current.requester}) can control this song'
await self.send_message(message.channel, fmt.format(self))
if self.player is not None and not self.is_playing():
elif self.player is not None and not self.is_playing():
self.player.resume()
elif message.content.startswith('$next'):
filename = message.content[5:].strip()
await self.songs.put(VoiceEntry(message, filename))
await self.send_message(message.channel, 'Successfully registered {}'.format(filename))
elif message.content.startswith('$play'):
if self.player is not None and self.player.is_playing():
await self.send_message(message.channel, 'Already playing a song')
@ -83,7 +84,6 @@ class Bot(discord.Client):
if not self.is_voice_connected():
await self.send_message(message.channel, 'Not connected to a voice channel')
return
self.play_next_song.clear()
self.current = await self.songs.get()
self.player = self.voice.create_ffmpeg_player(self.current.song, after=self.toggle_next_song)