YT works, fixed some things

This commit is contained in:
CramMK
2020-02-13 23:40:41 +01:00
parent 4bf09b5588
commit 62ffb375bd
6 changed files with 75 additions and 77 deletions

View File

@@ -50,7 +50,7 @@ async def activity():
status = f"{new_activity[1]} | {loadconfig.__prefix__}aquabot" status = f"{new_activity[1]} | {loadconfig.__prefix__}aquabot"
activity = discord.Activity(name=status, type=new_activity[0]) activity = discord.Activity(name=status, type=new_activity[0])
await bot.change_presence(activity=activity) await bot.change_presence(activity=activity)
await asyncio.sleep(10) # Time in minutes await asyncio.sleep(10*60) # Time in minutes
# BOT STARTING EVENT # BOT STARTING EVENT
@bot.event @bot.event

View File

@@ -32,8 +32,9 @@ class Anime(commands.Cog):
@commands.command(name="waifumedia") @commands.command(name="waifumedia")
async def waifumedia(self, ctx, waifu: str): async def waifumedia(self, ctx, waifu: str):
""" """
Sends a random pic of a waifu (list in config/media.py) Sends a random pic of a waifu
""" """
# config/media.py
try: try:
media = random.choice(loadconfig.__media_waifu__[waifu]) media = random.choice(loadconfig.__media_waifu__[waifu])
await ctx.send(media) await ctx.send(media)

View File

@@ -26,7 +26,6 @@ class General(commands.Cog):
""" """
embed = discord.Embed(colour=discord.Colour.blue()) embed = discord.Embed(colour=discord.Colour.blue())
embed.set_thumbnail(url=ctx.me.avatar_url) embed.set_thumbnail(url=ctx.me.avatar_url)
embed.set_image(url=ctx.me.avatar_url)
embed.add_field(name="Owner", value=self.bot.AppInfo.owner, inline=True) embed.add_field(name="Owner", value=self.bot.AppInfo.owner, inline=True)
embed.add_field(name="Command Prefix", value=loadconfig.__prefix__, inline=True) embed.add_field(name="Command Prefix", value=loadconfig.__prefix__, inline=True)

View File

@@ -22,8 +22,7 @@ class Help(commands.Cog):
""" """
response = ( response = (
"I'm the usele... divine AquaBot!\n" "I'm the usele... divine AquaBot!\n"
"If you need help. try using the `help` command!" "If you need help. try using the `help` command!")
)
await ctx.send(response) await ctx.send(response)

View File

@@ -20,21 +20,19 @@ class Utility(commands.Cog):
# COG BODY # COG BODY
@commands.command(name="invitelink", aliases=["invite"]) @commands.command(name="invitelink", aliases=["invite"])
async def invite_link(self, ctx, age: int, uses: int, unique: bool): async def invite_link(self, ctx):
""" """
Sends the server's invitelink to chat Sends the server's invitelink to chat
""" """
if age is None: age = 60 * 10
age = 60
if uses is None:
uses = 100 uses = 100
if unique is None:
unique = True unique = True
link = await bot.create_invite( channel = ctx.message.channel
link = await channel.create_invite(
max_age = age, max_age = age,
max_uses = uses, max_uses = uses,
unique = uses, unique = unique,
reason = "Created by AquaBot") reason = "Created by AquaBot")
link_embed = discord.Embed(color=discord.Colour.blue()) link_embed = discord.Embed(color=discord.Colour.blue())
@@ -44,7 +42,7 @@ class Utility(commands.Cog):
inline=True) inline=True)
link_embed.set_footer( link_embed.set_footer(
text=f"Age: {age}, Uses: {uses}, Unique: {unique}", text=f"Age: {age}, Uses: {uses}, Unique: {unique}",
icon_url=loadconfig.__avater__ icon_url=loadconfig.__avatar__
) )
await ctx.send(embed=link_embed) await ctx.send(embed=link_embed)

View File

@@ -60,6 +60,13 @@ class Voice(commands.Cog):
# Begin of YouTube Player # Begin of YouTube Player
@commands.command(name="play", aliases=["p"])
@commands.guild_only()
async def play(self, ctx, url: str):
"""
Plays music from YouTube
"""
youtube_dl.utils.bug_reports_message = lambda: '' youtube_dl.utils.bug_reports_message = lambda: ''
ytdl_format_options = { ytdl_format_options = {
'format': 'bestaudio/best', 'format': 'bestaudio/best',
@@ -95,7 +102,7 @@ class Voice(commands.Cog):
self.title = data.get('title') self.title = data.get('title')
self.thumbnail = data.get('thumbnail') self.thumbnail = data.get('thumbnail')
self.description = data.get('description') self.description = data.get('description')
self.duration = self.parse_duration(int(data.get('duration'))) # self.duration = self.parse_duration(int(data.get('duration')))
self.tags = data.get('tags') self.tags = data.get('tags')
self.url = data.get('webpage_url') self.url = data.get('webpage_url')
self.views = data.get('view_count') self.views = data.get('view_count')
@@ -117,19 +124,13 @@ class Voice(commands.Cog):
filename = data['url'] if stream else ytdl.prepare_filename(data) filename = data['url'] if stream else ytdl.prepare_filename(data)
return cls(discord.FFmpegPCMAudio(filename, **ffmpeg_options), data=data) return cls(discord.FFmpegPCMAudio(filename, **ffmpeg_options), data=data)
@commands.command(name="play", aliases=["p"]) voice = get(self.bot.voice_clients, guild=ctx.guild)
@commands.guild_only()
async def play(self, ctx, url: str):
"""
Plays music from YouTube
"""
voice = get(bot.voice_clients, guild=ctx.guild)
async with ctx.typing(): async with ctx.typing():
player = await YTDLSource.from_url(url, loop=self.bot.loop) player = await YTDLSource.from_url(url, loop=self.bot.loop)
ctx.voice.play( voice.play(
player, player,
after=lambda e: print('Player error: %s' % e) if e else None)) after=lambda e: print('Player error: %s' % e) if e else None)
await ctx.send(f"Now playing: {player.title}") await ctx.send(f"Now playing: {player.title}")
# End of YouTube Player # End of YouTube Player