Skip to content

WIP: Fixed a bug in allowlisting URLs #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DecentralizedDan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: Fixed a bug in allowlisting URLs #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions source/bouncer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,22 +129,26 @@ async def remove_from_allowlist(ctx, url):
@bot.slash_command()
async def add_to_allowlist(ctx, url):
"""Allow a domain in a given server."""
url = urlparse(url)
netloc = url.netloc
url_object = urlparse(url)

if url_object.scheme == '':
url = 'https://' + url
url_object = urlparse(url)

# TODO test is_dupe
is_dupe = session.query(AllowDomain).filter_by(
server_id=ctx.guild.id, hostname=netloc).first()
server_id=ctx.guild.id, hostname=url).first()

if is_dupe == True:
logger.log(MESSAGE, "URL `%s` already in allow list.",
netloc, extra={'server': ctx.guild})
await ctx.respond(_("Note: URL `{}` was already on the allow list.").format(netloc))
url, extra={'server': ctx.guild})
await ctx.respond(_("Note: URL `{}` was already on the allow list.").format(url))
else:
session.add(AllowDomain(url.hostname, str(ctx.guild.id)))
session.add(AllowDomain(url_object.hostname, str(ctx.guild.id)))
session.commit()
logger.log(MESSAGE, "URL `%s` added to allow list.",
url, extra={'server': ctx.guild})
await ctx.respond(_("URL `{}` added to allow list.").format(url.geturl()))
await ctx.respond(_("URL `{}` added to allow list.").format(url))


@bot.slash_command()
Expand Down