From 42ea4ced74384dbd41a5a0820f90d2a481407870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Tue, 6 Dec 2022 10:25:22 +0100 Subject: [PATCH] Fix /add --- discord_rss_bot/feeds.py | 3 +-- discord_rss_bot/main.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/discord_rss_bot/feeds.py b/discord_rss_bot/feeds.py index 9badb9e..b7079bd 100644 --- a/discord_rss_bot/feeds.py +++ b/discord_rss_bot/feeds.py @@ -32,7 +32,6 @@ from reader import ( StorageError, TagNotFoundError, ) -from reader.types import EntryLike from requests import Response from discord_rss_bot.settings import logger, reader @@ -82,7 +81,7 @@ def add_feed(feed_url: str, webhook: str, exist_ok=False, allow_invalid_url=Fals IfFeedError: Error or not. """ try: - reader.add_feed(feed=feed_url, exist_ok=exist_ok, allow_invalid_url=allow_invalid_url) + reader.add_feed(feed_url, exist_ok=exist_ok, allow_invalid_url=allow_invalid_url) except FeedExistsError as error: error_msg = "Feed already exists" logger.error(error_msg, exc_info=True) diff --git a/discord_rss_bot/main.py b/discord_rss_bot/main.py index 342b2fc..e942262 100644 --- a/discord_rss_bot/main.py +++ b/discord_rss_bot/main.py @@ -76,12 +76,12 @@ async def create_feed(feed_url: str = Form(), webhook_dropdown: str = Form()) -> logger.info(f"Add feed: {feed_url}") logger.info(f"Webhook: {webhook_dropdown}") - # Update a single feed. The feed will be updated even if updates are disabled for it. - updated_feed: IfFeedError = update_feed(feed_url, webhook_dropdown) - # Add a new feed to the database. added_feed: IfFeedError = add_feed(feed_url, webhook_dropdown) + # Update a single feed. The feed will be updated even if updates are disabled for it. + updated_feed: IfFeedError = update_feed(feed_url, webhook_dropdown) + if updated_feed.error or added_feed.error: error_dict = { "error": updated_feed.error,