From 5135306aee09a28f1144fd141e9af7f8d8c52c22 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Sat, 20 Nov 2021 10:48:26 +0530 Subject: [PATCH 1/8] Update utilities.py --- cogs/utilities.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/cogs/utilities.py b/cogs/utilities.py index 66ae042..ae58a10 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -13,7 +13,7 @@ def __init__(self, bot): @commands.command(pass_context=True) - async def lyrics(ctx, *args): + async def lyrics(self, ctx, *args): track = " ".join(args) user = ctx.author for activity in user.activities: @@ -47,6 +47,27 @@ async def lyrics(ctx, *args): await wait.edit(embed=embed, content="") except: await wait.edit(content=":x: Something went wrong, can't show lyrics ") + + @commands.command(aliases=['ethereum']) + async def eth(self, ctx): + r = requests.get('https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD,EUR') + r = r.json() + usd = r['USD'] + eur = r['EUR'] + em = discord.Embed(description=f'USD: `{str(usd)}$`\nEUR: `{str(eur)}€`') + em.set_author(name='Ethereum', icon_url='https://cdn.disnakeapp.com/attachments/271256875205525504/374282740218200064/2000px-Ethereum_logo.png') + await ctx.reply(embed=em) + + @commands.command(aliases=['bitcoin']) + async def btc(self, ctx): + r = requests.get('https://min-api.cryptocompare.com/data/price?fsym=BTC&tsyms=USD,EUR') + r = r.json() + usd = r['USD'] + eur = r['EUR'] + em = discord.Embed(description=f'USD: `{str(usd)}$`\nEUR: `{str(eur)}€`') + em.set_author(name='Bitcoin', icon_url='https://cdn.pixabay.com/photo/2013/12/08/12/12/bitcoin-225079_960_720.png') + await ctx.reply(embed=em) + def setup(bot): From b6dfa461cb4e50d43c744c6eceb801c8d10438df Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:02:48 +0530 Subject: [PATCH 2/8] Update utilities.py --- cogs/utilities.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cogs/utilities.py b/cogs/utilities.py index ae58a10..b449691 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -67,6 +67,23 @@ async def btc(self, ctx): em = discord.Embed(description=f'USD: `{str(usd)}$`\nEUR: `{str(eur)}€`') em.set_author(name='Bitcoin', icon_url='https://cdn.pixabay.com/photo/2013/12/08/12/12/bitcoin-225079_960_720.png') await ctx.reply(embed=em) + + + + @Yui.command() + async def pingweb(ctx, website = None): + if website is None: + embed=discord.Embed(title="Error!", description="You didn't enter a website to ping for ;-;", color=0x243e7b) + await ctx.send(embed=embed) + else: + try: + r = requests.get(website).status_code + except Exception as e: + await ctx.send(f"Error raised :- ```{e}```) + if r == 404: + await ctx.send(f'Site is down, responded with a status code of {r}') + else: + await ctx.send(f'Site is up, responded with a status code of {r From b0fbf013106089eee359c9ad24ac66f772cb58e3 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:09:12 +0530 Subject: [PATCH 3/8] Update utilities.py --- cogs/utilities.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cogs/utilities.py b/cogs/utilities.py index b449691..dc9d73b 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -4,7 +4,7 @@ import LyricsScraper import requests import aiohttp - +bot_embed_color = 0x4548a8 class utilities(commands.Cog): @@ -70,8 +70,8 @@ async def btc(self, ctx): - @Yui.command() - async def pingweb(ctx, website = None): + @commands.command() + async def pingweb(self, ctx, website = None): if website is None: embed=discord.Embed(title="Error!", description="You didn't enter a website to ping for ;-;", color=0x243e7b) await ctx.send(embed=embed) @@ -83,7 +83,15 @@ async def pingweb(ctx, website = None): if r == 404: await ctx.send(f'Site is down, responded with a status code of {r}') else: - await ctx.send(f'Site is up, responded with a status code of {r + await ctx.send(f'Site is up, responded with a status code of {r}') + + + @Yui.command(aliases=['pfp', 'avatar']) + async def av(ctx, *, user: discord.Member): + av = user.display_avatar.url + embed = discord.Embed(title="{}'s pfp".format(user.name), description="Here it is!", color=bot_embed_color) + embed.set_image(url=av) + await ctx.send(embed=embed) From 6d057e7cfae64eb4551e3790df0403376065bc46 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:10:00 +0530 Subject: [PATCH 4/8] Update utilities.py --- cogs/utilities.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/utilities.py b/cogs/utilities.py index dc9d73b..36f77de 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -86,8 +86,8 @@ async def pingweb(self, ctx, website = None): await ctx.send(f'Site is up, responded with a status code of {r}') - @Yui.command(aliases=['pfp', 'avatar']) - async def av(ctx, *, user: discord.Member): + @commands.command(aliases=['pfp', 'avatar']) + async def av(self, ctx, *, user: discord.Member): av = user.display_avatar.url embed = discord.Embed(title="{}'s pfp".format(user.name), description="Here it is!", color=bot_embed_color) embed.set_image(url=av) From 5b9c51ff22ec02952631d968e0a774d8b28d37de Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:14:31 +0530 Subject: [PATCH 5/8] Update utilities.py --- cogs/utilities.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cogs/utilities.py b/cogs/utilities.py index 36f77de..359e9ce 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -93,6 +93,16 @@ async def av(self, ctx, *, user: discord.Member): embed.set_image(url=av) await ctx.send(embed=embed) + + @commands.command(aliases=['server', 'serverinfo']) + async def sinfo(ctx): + embed = discord.Embed(title=f"{ctx.guild.name}", description="Here is the server info :-", color=bot_embed_color) + embed.add_field(name="Server created at", value=f"{ctx.guild.created_at}") + embed.add_field(name="Server Owner", value=f"{ctx.guild.owner}") + embed.add_field(name="Server Region", value=f"{ctx.guild.region}") + embed.add_field(name="Server ID", value=f"{ctx.guild.id}") + embed.set_thumbnail(url=f"{ctx.guild.icon}") + await ctx.reply(embed=embed) def setup(bot): From 8e792732a042332d6fcc89fae9bbedb645666bb7 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:15:23 +0530 Subject: [PATCH 6/8] Update utilities.py --- cogs/utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/utilities.py b/cogs/utilities.py index 359e9ce..9099992 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -95,7 +95,7 @@ async def av(self, ctx, *, user: discord.Member): @commands.command(aliases=['server', 'serverinfo']) - async def sinfo(ctx): + async def sinfo(self, ctx): embed = discord.Embed(title=f"{ctx.guild.name}", description="Here is the server info :-", color=bot_embed_color) embed.add_field(name="Server created at", value=f"{ctx.guild.created_at}") embed.add_field(name="Server Owner", value=f"{ctx.guild.owner}") From 338ce860c5cc811259716a8ed7986d864659c79d Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:23:32 +0530 Subject: [PATCH 7/8] Update utilities.py --- cogs/utilities.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/cogs/utilities.py b/cogs/utilities.py index 9099992..1d09929 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -103,6 +103,33 @@ async def sinfo(self, ctx): embed.add_field(name="Server ID", value=f"{ctx.guild.id}") embed.set_thumbnail(url=f"{ctx.guild.icon}") await ctx.reply(embed=embed) + + + + @commands.command(aliases=['geolocate', 'iptogeo', 'iptolocation', 'ip2geo', 'ip']) + async def geoip(self, ctx, *, ipaddr: str = '1.3.3.7'): + r = requests.get(f'http://extreme-ip-lookup.com/json/{ipaddr}') + geo = r.json() + em = discord.Embed() + fields = [ + {'name': 'IP', 'value': geo['query']}, + {'name': 'ipType', 'value': geo['ipType']}, + {'name': 'Country', 'value': geo['country']}, + {'name': 'City', 'value': geo['city']}, + {'name': 'Continent', 'value': geo['continent']}, + {'name': 'Country', 'value': geo['country']}, + {'name': 'IPName', 'value': geo['ipName']}, + {'name': 'ISP', 'value': geo['isp']}, + {'name': 'Latitute', 'value': geo['lat']}, + {'name': 'Longitude', 'value': geo['lon']}, + {'name': 'Org', 'value': geo['org']}, + {'name': 'Region', 'value': geo['region']}, + {'name': 'Status', 'value': geo['status']}, + ] + for field in fields: + if field['value']: + em.add_field(name=field['name'], value=field['value'], inline=True) + return await ctx.send(embed=em) def setup(bot): From 7394a9e7cb84314ff56e66c9865e9f7c64882949 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Mon, 22 Nov 2021 07:38:10 +0530 Subject: [PATCH 8/8] Update utilities.py --- cogs/utilities.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/cogs/utilities.py b/cogs/utilities.py index 1d09929..e879663 100644 --- a/cogs/utilities.py +++ b/cogs/utilities.py @@ -130,6 +130,50 @@ async def geoip(self, ctx, *, ipaddr: str = '1.3.3.7'): if field['value']: em.add_field(name=field['name'], value=field['value'], inline=True) return await ctx.send(embed=em) + + + + @commands.command() + async def truth(self, ctx, rating = None): + if rating == None: + r = requests.get(f"https://api.truthordarebot.xyz/api/truth/?rating=") + res = r.json() + Tile = f"Here is a truth for you" + Desc = res['question'] + embed=discord.Embed(title=Tile, description=Desc, color=bot_embed_color) + await ctx.reply(embed=embed) + else: + try: + r = requests.get(f"https://api.truthordarebot.xyz/api/truth/?rating={rating}") + res = r.json() + Tile = f"Here is a {rating} rated question for you" + Desc = res['question'] + embed=discord.Embed(title=Tile, description=Desc, color=bot_embed_color) + await ctx.replyembed=embed) + except: + await ctx.reply("Please send a valid rating!! Valid parameters are `pg`,`pg13`,`r`") + + + + @commands.command() + async def dare(self, ctx, rating = None): + if rating == None: + r = requests.get(f"https://api.truthordarebot.xyz/api/dare/?rating=") + res = r.json() + Tile = f"Here is a truth for you" + Desc = res['question'] + embed=discord.Embed(title=Tile, description=Desc, color=bot_embed_color) + await ctx.reply(embed=embed) + else: + try: + r = requests.get(f"https://api.truthordarebot.xyz/api/dare/?rating={rating}") + res = r.json() + Tile = f"Here is a {rating} rated question for you" + Desc = res['question'] + embed=discord.Embed(title=Tile, description=Desc, color=bot_embed_color) + await ctx.replyembed=embed) + except: + await ctx.reply("Please send a valid rating!! Valid parameters are `pg`,`pg13`,`r`") def setup(bot):