From 80ea0b49a219e8d22720537851d8706873ec89cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Mon, 5 Dec 2022 09:03:40 +0100 Subject: [PATCH] Get feed_url from entity instead of argument --- discord_rss_bot/feeds.py | 6 +++--- discord_rss_bot/main.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/discord_rss_bot/feeds.py b/discord_rss_bot/feeds.py index 3097d6d..6f464d6 100644 --- a/discord_rss_bot/feeds.py +++ b/discord_rss_bot/feeds.py @@ -14,15 +14,15 @@ def check_feed(feed_url: str) -> None: """Check a single feed""" reader.update_feeds() entry = reader.get_entries(feed=feed_url, read=False) - _check_feed(entry, feed_url) + _check_feed(entry) -def _check_feed(entries, feed_url: str) -> None: +def _check_feed(entries) -> None: for entry in entries: reader.mark_entry_as_read(entry) logger.debug(f"New entry: {entry.title}") - webhook_url = reader.get_tag(feed_url, "webhook") + webhook_url = reader.get_tag(entry.feed.url, "webhook") if webhook_url: logger.debug(f"Sending to webhook: {webhook_url}") webhook = DiscordWebhook(url=str(webhook_url), content=f":robot: :mega: New entry: {entry.title}\n" diff --git a/discord_rss_bot/main.py b/discord_rss_bot/main.py index 21baaed..888e067 100644 --- a/discord_rss_bot/main.py +++ b/discord_rss_bot/main.py @@ -28,7 +28,7 @@ def check_feed(request: Request, feed_url: str = Form()): """Check all feeds""" reader.update_feeds() entry = reader.get_entries(feed=feed_url, read=False) - _check_feed(entry, feed_url) + _check_feed(entry) logger.info(f"Get feed: {feed_url}") feed = reader.get_feed(feed_url)