Skip to content
This repository has been archived by the owner on Jun 27, 2023. It is now read-only.

Commit

Permalink
Release v2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TheKaushikGoswami committed Feb 1, 2022
1 parent 15c8e70 commit e0c9dc3
Show file tree
Hide file tree
Showing 7 changed files with 289 additions and 287 deletions.
8 changes: 4 additions & 4 deletions cogs/api_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ async def wasted(self, ctx, member: Option(discord.Member, "Select the Wasted Me
member = ctx.author

async with aiohttp.ClientSession() as session:
async with session.get(f'https://some-random-api.ml/canvas/wasted?avatar={member.display_avatar.with_static_format("png").url}') as af:
async with session.get(f'https://some-random-api.ml/canvas/wasted?avatar={member.display_avatar.with_format("png").url}') as af:
if 300 > af.status >= 200:
fp = io.BytesIO (await af.read())
fileee = discord.File(fp, "wasted.png")
Expand All @@ -284,7 +284,7 @@ async def passed(self, ctx, member: Option(discord.Member, "Select the Member wh
member = ctx.author

async with aiohttp.ClientSession() as session:
async with session.get(f'https://some-random-api.ml/canvas/passed?avatar={member.display_avatar.with_static_format("png").url}') as af:
async with session.get(f'https://some-random-api.ml/canvas/passed?avatar={member.display_avatar.with_format("png").url}') as af:
if 300 > af.status >= 200:
fp = io.BytesIO (await af.read())
fileee = discord.File(fp, "passed.png")
Expand All @@ -300,7 +300,7 @@ async def comment(self, ctx, comment: Option(str, "The Contents of the Comment",
if member == None:
member = ctx.author
name = str(member.name).replace(" ", "+")
avatar=member.display_avatar.with_static_format("png").url
avatar=member.display_avatar.with_format("png").url
comment=comment.replace(" ", "+")
image = f"https://some-random-api.ml/canvas/youtube-comment?username={name}&avatar={avatar}&comment={comment}"
await ctx.respond(image)
Expand All @@ -314,7 +314,7 @@ async def tweet(self, ctx, tweet: Option(str, "The Contents of the Tweet", requi
member = ctx.author
username=str(member.name).replace(" ", "+")
displayname=str(member.display_name).replace(" ", "+")
avatar=member.display_avatar.with_static_format("png").url
avatar=member.display_avatar.with_format("png").url
comment=tweet.replace(" ", "+")
image = f"https://some-random-api.ml/canvas/tweet?username={username}&displayname={displayname}&comment={comment}&avatar={avatar}"
await ctx.respond(image)
Expand Down
12 changes: 4 additions & 8 deletions cogs/fun.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ async def _8ball(self, ctx, *, question: Option(str, "Write Your Question", requ
e = discord.Embed(title=f"MAGIC 8-BALL", color=ctx.author.color)
e.set_thumbnail(
url=f'https://media.tenor.com/images/47ceded02690a48da88d02bb7c1f5f46/tenor.gif')
e.add_field(name=f"🔮Question by `{ctx.author}`: `{question}`",
value=f"**My Magic Foretells me:\n `{random.choice(responses)}`**",)
e.add_field(name=f"**🔮Question by `{ctx.author}`:**", value=f"`{question}`", inline=False)
e.add_field(name=f"**My Magic Foretells me:**", value = f"`{random.choice(responses)}`", inline=False)
await ctx.respond(embed=e)

# Lovemeter
Expand Down Expand Up @@ -520,12 +520,8 @@ async def snap(self, ctx, member: Option(discord.Member, "Choose the Member", re
d.text((90, 25+w), message, font=titlefnt, fill=colour["content"])

img.save('img.png')
if member.avatar.is_animated():
await member.display_avatar.with_static_format("gif").save("pfp.gif")
f2 = Image.open("pfp.gif")
else:
await member.display_avatar.with_static_format("png").save("pfp.png")
f2 = Image.open("pfp.png")
await member.display_avatar.with_format("png").save("pfp.png")
f2 = Image.open("pfp.png")
f1 = Image.open("img.png")
f2.thumbnail((50, 55))
f2.save("pfp.png")
Expand Down
4 changes: 2 additions & 2 deletions cogs/help.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async def help(self, ctx):
embed1.set_thumbnail(
url=f"https://media2.giphy.com/media/401pPJe8AtsC55e1y8/source.gif")
embed1.add_field(
name="🛡️ Moderation", value=f'`nick` `purge` `purgeuser` `mute` `unmute` `kick` `ban` `nuke` `role` `slowmode` `lock` `unlock` `name_role`', inline=False)
name="🛡️ Moderation", value=f'`nick` `purge` `purgeuser` `mute` `unmute` `kick` `ban` `nuke` `role` `slowmode` `lock` `unlock`', inline=False)
embed1.add_field(
name="⚽ Fun & Games", value=f'`8ball` `activity` `lovemeter` `rps` `sad/happy/angry` `hello` `lenny` `flip` `f` `calculator` `diceroll` `password` `slots` `cheers` `simp` `iq` `roast` `kill`', inline=False)
embed1.add_field(
Expand All @@ -36,7 +36,7 @@ async def help(self, ctx):
embed1.add_field(
name="🤖 Olympus", value=f'`about` `ping` `invite` `support` `help` `uptime`', inline=False)
embed1.add_field(
name=f"👑 Owner Only", value=f'`stats` `serverlist` `createinvite` `leave`', inline=False)
name=f"👑 Owner Only", value=f'`stats` `serverlist` `createinvite` `leave` `change_presence`', inline=False)

embed1.set_footer(
text=f"Olympus is made with ❤️ | _TheKauchikG_#5300", icon_url=f'{ctx.author.avatar.url}')
Expand Down
Loading

0 comments on commit e0c9dc3

Please sign in to comment.