gnouseu/tuxbot-bot
4
0
Fork 0
Code Issues Pull requests Wiki Activity

update(commands:down?|Network): change api to improve results

Browse source
This commit is contained in:
Romain J 2021-04-25 18:48:21 +02:00
parent 56e45b52b5
commit fcc23d87df
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tuxbot/cogs/Network/network.py
View file

@ -93,7 +93,9 @@ class Network(commands.Cog):
@tasks.loop(hours=1.0) @tasks.loop(hours=1.0)
async def _update_peering_db(self): async def _update_peering_db(self):
try: try:
async with aiohttp.ClientSession(connector=TCPConnector(verify_ssl=False)) as cs: async with aiohttp.ClientSession(
connector=TCPConnector(verify_ssl=False)
) as cs:
async with cs.get( async with cs.get(
"https://3.233.208.117/api/net", "https://3.233.208.117/api/net",
timeout=aiohttp.ClientTimeout(total=60), timeout=aiohttp.ClientTimeout(total=60),
@ -306,26 +308,25 @@ class Network(commands.Cog):
@command_extra(name="isdown", aliases=["is_down", "down?"], deletable=True) @command_extra(name="isdown", aliases=["is_down", "down?"], deletable=True)
async def _isdown(self, ctx: ContextPlus, domain: IPConverter): async def _isdown(self, ctx: ContextPlus, domain: IPConverter):
try: try:
url = f"https://www.isthissitedown.org/site/{domain}"
async with aiohttp.ClientSession() as cs: async with aiohttp.ClientSession() as cs:
async with cs.get( async with cs.get(
f"https://isitdown.site/api/v3/{domain}", url,
timeout=aiohttp.ClientTimeout(total=8), timeout=aiohttp.ClientTimeout(total=8),
) as s: ) as s:
json = await s.json() text = await s.text()
if json["isitdown"]: if "is up!" in text:
title = _("Down...", ctx, self.bot.config)
color = 0xDC3545
else:
title = _("Up!", ctx, self.bot.config) title = _("Up!", ctx, self.bot.config)
color = 0x28A745 color = 0x28A745
else:
title = _("Down...", ctx, self.bot.config)
color = 0xDC3545
e = discord.Embed(title=title, color=color) e = discord.Embed(title=title, color=color)
e.set_thumbnail(
url=f"https://http.cat/{json['response_code']}"
)
await ctx.send(embed=e) await ctx.send(url, embed=e)
except ( except (
ClientConnectorError, ClientConnectorError,