nex/college-bot-v1
1
0
Fork 0
mirror of https://github.com/nexy7574/LCC-bot.git synced 2024-09-19 18:16:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make filter async

Browse source
This commit is contained in:
nex 2023-01-03 15:17:09 +00:00
parent 4047c11f1d
commit 67fef765c8
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cogs/other.py
View file

@ -3,7 +3,10 @@ import io
import os import os
import random import random
import re import re
import textwrap
import dns.resolver import dns.resolver
import aiofiles
from time import sleep as time_sleep from time import sleep as time_sleep
from typing import Literal from typing import Literal
from typing import Tuple, Optional, Dict from typing import Tuple, Optional, Dict
@ -368,15 +371,16 @@ class OtherCog(commands.Cog):
url = urlparse(url) url = urlparse(url)
await ctx.respond(f"Taking screenshot of {url.geturl()}..."[:2000]) await ctx.respond(f"Preparing to screenshot {textwrap.shorten(url.geturl(), 100)}... (checking local filters)")
with open("domains.txt") as blacklist: async with aiofiles.open("domains.txt") as blacklist:
for line in blacklist: for line in await blacklist.readlines():
if not line.strip(): if not line.strip():
continue continue
if re.match(line.strip(), url.netloc): if re.match(line.strip(), url.netloc):
return await ctx.edit(content="That domain is blacklisted.") return await ctx.edit(content="That domain is blacklisted.")
await ctx.respond(f"Preparing to screenshot {textwrap.shorten(url.geturl(), 100)}... (checking DNS filters)")
try: try:
for response in await asyncio.to_thread(dns.resolver.resolve, url.netloc, "A"): for response in await asyncio.to_thread(dns.resolver.resolve, url.netloc, "A"):
if response.address == "0.0.0.0": if response.address == "0.0.0.0":
@ -386,6 +390,7 @@ class OtherCog(commands.Cog):
except dns.resolver.NoAnswer: except dns.resolver.NoAnswer:
return await ctx.edit(content="DNS resolver did not respond.") return await ctx.edit(content="DNS resolver did not respond.")
await ctx.respond(f"Preparing to screenshot {textwrap.shorten(url.geturl(), 100)}... (Filters OK)")
try: try:
screenshot = await self.screenshot_website( screenshot = await self.screenshot_website(
ctx, ctx,
@ -407,8 +412,8 @@ class OtherCog(commands.Cog):
await ctx.defer() await ctx.defer()
if not await self.bot.is_owner(ctx.user): if not await self.bot.is_owner(ctx.user):
return await ctx.respond("You are not allowed to do that.") return await ctx.respond("You are not allowed to do that.")
with open("domains.txt", "a") as blacklist: async with aiofiles.open("domains.txt", "a") as blacklist:
blacklist.write(domain.lower() + "\n") await blacklist.write(domain.lower() + "\n")
await ctx.respond("Added domain to blacklist.") await ctx.respond("Added domain to blacklist.")
@domains.command(name="remove") @domains.command(name="remove")
@ -417,12 +422,12 @@ class OtherCog(commands.Cog):
await ctx.defer() await ctx.defer()
if not await self.bot.is_owner(ctx.user): if not await self.bot.is_owner(ctx.user):
return await ctx.respond("You are not allowed to do that.") return await ctx.respond("You are not allowed to do that.")
with open("domains.txt") as blacklist: async with aiofiles.open("domains.txt") as blacklist:
lines = blacklist.readlines() lines = await blacklist.readlines()
with open("domains.txt", "w") as blacklist: async with aiofiles.open("domains.txt", "w") as blacklist:
for line in lines: for line in lines:
if line.strip() != domain.lower(): if line.strip() != domain.lower():
blacklist.write(line) await blacklist.write(line)
await ctx.respond("Removed domain from blacklist.") await ctx.respond("Removed domain from blacklist.")
@commands.group(name="domains", invoke_without_command=True) @commands.group(name="domains", invoke_without_command=True)

1
requirements.txt
View file

@ -9,3 +9,4 @@ psutil==5.9.4
selenium==4.7.2 selenium==4.7.2
chromedriver==2.24.1 chromedriver==2.24.1
dnspython==2.2.1 dnspython==2.2.1
aiofiles=22.1.0