diff --git a/discord_rss_bot/main.py b/discord_rss_bot/main.py index d0132c2..d622804 100644 --- a/discord_rss_bot/main.py +++ b/discord_rss_bot/main.py @@ -27,7 +27,6 @@ Functions: Runs on startup. """ import urllib.parse -from datetime import datetime from typing import Any, Iterable import uvicorn @@ -51,7 +50,7 @@ from starlette.templating import _TemplateResponse # noqa from discord_rss_bot.feeds import send_to_discord from discord_rss_bot.search import create_html_for_search_results -from discord_rss_bot.settings import get_reader, get_webhooks +from discord_rss_bot.settings import get_reader, list_webhooks app: FastAPI = FastAPI() app.mount("/static", StaticFiles(directory="discord_rss_bot/static"), name="static") @@ -94,7 +93,7 @@ async def add_webhook(webhook_name: str = Form(), webhook_url: str = Form()) -> clean_webhook_url: str = webhook_url.strip() # Get current webhooks from the database if they exist otherwise use an empty list. - webhooks = get_webhooks(reader) + webhooks = list_webhooks(reader) # Only add the webhook if it doesn't already exist. if not any(webhook["name"] == clean_webhook_name for webhook in webhooks): @@ -128,7 +127,7 @@ async def delete_webhook(webhook_url: str = Form()) -> RedirectResponse | dict[s clean_webhook_url: str = webhook_url.strip() # Get current webhooks from the database if they exist otherwise use an empty list. - webhooks = get_webhooks(reader) + webhooks = list_webhooks(reader) # Only add the webhook if it doesn't already exist. for webhook in webhooks: diff --git a/discord_rss_bot/settings.py b/discord_rss_bot/settings.py index d58d01d..e2031ea 100644 --- a/discord_rss_bot/settings.py +++ b/discord_rss_bot/settings.py @@ -47,7 +47,7 @@ def get_reader(custom_location: str = "") -> Reader: return make_reader(url=db_location) -def get_webhooks(reader: Reader) -> list[dict[str, str]]: +def list_webhooks(reader: Reader) -> list[dict[str, str]]: """ Get current webhooks from the database if they exist otherwise use an empty list.