Compare commits

..

No commits in common. "5603b8895920bdd746c3d99e74c5f529ca4c5fa1" and "1d666a569cc140c3904f6c8d25657a360a6c0179" have entirely different histories.

2 changed files with 10 additions and 6 deletions

View file

@ -329,6 +329,7 @@ class Moderation(commands.Cog):
resolved_user = await self.fetch_user_dict(interaction, case_dict['resolved_by'])
resolved_name = resolved_user['name'] if resolved_user['discriminator'] == "0" else f"{resolved_user['name']}#{resolved_user['discriminator']}"
embed.add_field(name='Resolve Reason', value=f"Resolved by {resolved_name} ({resolved_user['id']}) for:\n```{case_dict['resolve_reason']}```", inline=False)
return embed
else:
target_user = await self.fetch_user_dict(interaction, case_dict['target_id'])
moderator_user = await self.fetch_user_dict(interaction, case_dict['moderator_id'])
@ -340,7 +341,7 @@ class Moderation(commands.Cog):
td = timedelta(**{unit: int(val) for unit, val in zip(["hours", "minutes", "seconds"], case_dict["duration"].split(":"))})
embed.description = embed.description + f"\n**Duration:** {humanize.precisedelta(td)} | <t:{case_dict['end_timestamp']}:R>"
embed.add_field(name='Reason', value=f"```{case_dict['reason']}```", inline=False)
return embed
return embed
raise(TypeError("'type' argument is invalid!"))
@ -901,7 +902,7 @@ class Moderation(commands.Cog):
await ctx.send(f"Logging channel set to {channel.mention}.")
else:
await self.config.guild(ctx.guild).log_channel.set(" ")
await ctx.send("Logging channel disabled.")
await ctx.send(f"Logging channel disabled.")
@moderationset.command(name="mysql")
@checks.is_owner()

View file

@ -60,9 +60,9 @@ class YouTubeDownloader(commands.Cog):
try:
self.blacklist_checker(ctx.author.id)
except self.UserBlacklisted:
await ctx.send("You are blacklisted from running this command!")
await ctx.send(f"You are blacklisted from running this command!")
return
def youtube_download(url: str, path: str):
def youtube_download(self, url: str, path: str):
"""This function does the actual downloading of the YouTube Video."""
yt = YouTube(url=url)
filename = f"{yt.title} ({yt.video_id})"
@ -74,7 +74,10 @@ class YouTubeDownloader(commands.Cog):
stream = yt.streams.filter(progressive=True, mime_type='video/mp4')
stream = stream.order_by('resolution')
filename_format = filename + ".mp4"
previously_existed = bool(os.path.isfile(path + f"{os.sep}{filename_format}"))
if os.path.isfile(path + f"{os.sep}{filename_format}"):
previously_existed = True
else:
previously_existed = False
return stream.desc().first().download(filename=filename, output_path=path), previously_existed, filename_format
data_path = await self.config.save_directory()
if subfolder and await self.bot.is_owner(ctx.author):
@ -105,7 +108,7 @@ class YouTubeDownloader(commands.Cog):
msg = ctx.send
message = await msg("YouTube Downloader started!")
try:
output = youtube_download(url, data_path)
output = youtube_download(self, url, data_path)
except exceptions.RegexMatchError:
await message.edit(content="Please provide a link to YouTube and not another site.")
return