TheLovinator/discord-rss-bot
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor send_entry_to_discord function to require a reader parameter and update related tests

Browse source
This commit is contained in:
Joakim Hellsén 2026-03-15 20:47:41 +01:00
commit 94d5935b78
Signed by: Joakim Hellsén
SSH key fingerprint: SHA256:/9h/CsExpFp+PRhsfA0xznFx2CGfTT5R/kpuFfUgEQk
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
discord_rss_bot/feeds.py
View file

@ -96,26 +96,23 @@ def extract_domain(url: str) -> str: # noqa: PLR0911
return "Other" return "Other"
def send_entry_to_discord(entry: Entry, reader: Reader | None = None) -> str | None: # noqa: C901 def send_entry_to_discord(entry: Entry, reader: Reader) -> str | None: # noqa: C901
"""Send a single entry to Discord. """Send a single entry to Discord.
Args: Args:
entry: The entry to send to Discord. entry: The entry to send to Discord.
reader: The reader to use. If None, the default reader will be used. reader: The reader to use.
Returns: Returns:
str | None: The error message if there was an error, otherwise None. str | None: The error message if there was an error, otherwise None.
""" """
# Get the default reader if we didn't get a custom one.
effective_reader: Reader = get_reader() if reader is None else reader
# Get the webhook URL for the entry. # Get the webhook URL for the entry.
webhook_url: str = str(effective_reader.get_tag(entry.feed_url, "webhook", "")) webhook_url: str = str(reader.get_tag(entry.feed_url, "webhook", ""))
if not webhook_url: if not webhook_url:
return "No webhook URL found." return "No webhook URL found."
# If https://discord.com/quests/<quest_id> is in the URL, send a separate message with the URL. # If https://discord.com/quests/<quest_id> is in the URL, send a separate message with the URL.
send_discord_quest_notification(entry, webhook_url, reader=effective_reader) send_discord_quest_notification(entry, webhook_url, reader=reader)
# Check if this is a c3kay feed # Check if this is a c3kay feed
if is_c3kay_feed(entry.feed.url): if is_c3kay_feed(entry.feed.url):
@ -126,7 +123,7 @@ def send_entry_to_discord(entry: Entry, reader: Reader | None = None) -> str | N
post_data: dict[str, Any] | None = fetch_hoyolab_post(post_id) post_data: dict[str, Any] | None = fetch_hoyolab_post(post_id)
if post_data: if post_data:
webhook = create_hoyolab_webhook(webhook_url, entry, post_data) webhook = create_hoyolab_webhook(webhook_url, entry, post_data)
execute_webhook(webhook, entry, reader=effective_reader) execute_webhook(webhook, entry, reader=reader)
return None return None
logger.warning( logger.warning(
"Failed to create Hoyolab webhook for feed %s, falling back to regular processing", "Failed to create Hoyolab webhook for feed %s, falling back to regular processing",
@ -139,15 +136,15 @@ def send_entry_to_discord(entry: Entry, reader: Reader | None = None) -> str | N
# Try to get the custom message for the feed. If the user has none, we will use the default message. # Try to get the custom message for the feed. If the user has none, we will use the default message.
# This has to be a string for some reason so don't change it to "not custom_message.get_custom_message()" # This has to be a string for some reason so don't change it to "not custom_message.get_custom_message()"
if get_custom_message(effective_reader, entry.feed) != "": # noqa: PLC1901 if get_custom_message(reader, entry.feed) != "": # noqa: PLC1901
webhook_message: str = replace_tags_in_text_message(entry=entry, reader=effective_reader) webhook_message: str = replace_tags_in_text_message(entry=entry, reader=reader)
if not webhook_message: if not webhook_message:
webhook_message = "No message found." webhook_message = "No message found."
# Create the webhook. # Create the webhook.
try: try:
should_send_embed = bool(effective_reader.get_tag(entry.feed, "should_send_embed", True)) should_send_embed = bool(reader.get_tag(entry.feed, "should_send_embed", True))
except StorageError: except StorageError:
logger.exception("Error getting should_send_embed tag for feed: %s", entry.feed.url) logger.exception("Error getting should_send_embed tag for feed: %s", entry.feed.url)
should_send_embed = True should_send_embed = True
@ -157,11 +154,11 @@ def send_entry_to_discord(entry: Entry, reader: Reader | None = None) -> str | N
should_send_embed = False should_send_embed = False
if should_send_embed: if should_send_embed:
webhook = create_embed_webhook(webhook_url, entry, reader=effective_reader) webhook = create_embed_webhook(webhook_url, entry, reader=reader)
else: else:
webhook: DiscordWebhook = DiscordWebhook(url=webhook_url, content=webhook_message, rate_limit_retry=True) webhook: DiscordWebhook = DiscordWebhook(url=webhook_url, content=webhook_message, rate_limit_retry=True)
execute_webhook(webhook, entry, reader=effective_reader) execute_webhook(webhook, entry, reader=reader)
return None return None

2
tests/test_feeds.py
View file

@ -188,7 +188,7 @@ def test_send_entry_to_discord_youtube_feed(
mock_discord_webhook.return_value = mock_webhook mock_discord_webhook.return_value = mock_webhook
# Call the function # Call the function
send_entry_to_discord(mock_entry) send_entry_to_discord(mock_entry, mock_reader)
# Assertions # Assertions
mock_create_embed.assert_not_called() mock_create_embed.assert_not_called()

2
tests/test_main.py
View file

@ -562,7 +562,7 @@ def test_post_entry_uses_feed_url_to_disambiguate_duplicate_ids() -> None:
selected_feed_urls: list[str] = [] selected_feed_urls: list[str] = []
def fake_send_entry_to_discord(entry: Entry, reader: object | None = None) -> None: def fake_send_entry_to_discord(entry: Entry, reader: object) -> None:
selected_feed_urls.append(entry.feed.url) selected_feed_urls.append(entry.feed.url)
app.dependency_overrides[get_reader_dependency] = StubReader app.dependency_overrides[get_reader_dependency] = StubReader