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

Fix warnings; use httpx2 and authors_str

Browse source
This commit is contained in:
Joakim Hellsén 2026-05-31 01:04:58 +02:00
commit c481c7c88f
Signed by: Joakim Hellsén
SSH key fingerprint: SHA256:/9h/CsExpFp+PRhsfA0xznFx2CGfTT5R/kpuFfUgEQk
14 changed files with 65 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.forgejo/workflows/build.yml
View file

@ -49,10 +49,10 @@ jobs:
docker buildx inspect --bootstrap
- name: Lint Python code
run: ruff check --exit-non-zero-on-fix --verbose
run: ruff check --exit-non-zero-on-fix
- name: Check Python formatting
run: ruff format --check --verbose
run: ruff format --check
- name: Lint Dockerfile
run: docker build --check .

8
discord_rss_bot/custom_message.py
View file

@ -155,7 +155,7 @@ def replace_tags_in_text_message(entry: Entry, reader: Reader) -> str:
entry_updated: str = entry.updated.strftime("%Y-%m-%d %H:%M:%S") if entry.updated else "Never"
list_of_replacements: list[dict[str, str]] = [
{"{{feed_author}}": feed.author or ""},
{"{{feed_author}}": feed.authors_str or ""},
{"{{feed_added}}": feed_added},
{"{{feed_last_exception}}": feed_last_exception},
{"{{feed_last_updated}}": feed_last_updated},
@ -168,7 +168,7 @@ def replace_tags_in_text_message(entry: Entry, reader: Reader) -> str:
{"{{feed_user_title}}": feed.user_title or ""},
{"{{feed_version}}": feed.version or ""},
{"{{entry_added}}": entry_added},
{"{{entry_author}}": entry.author or ""},
{"{{entry_author}}": entry.authors_str or ""},
{"{{entry_content}}": content},
{"{{entry_content_raw}}": entry.content[0].value if entry.content else ""},
{"{{entry_id}}": entry.id or ""},
@ -318,7 +318,7 @@ def replace_tags_in_embed(feed: Feed, entry: Entry, reader: Reader) -> CustomEmb
embed.title = ""
list_of_replacements: list[dict[str, str]] = [
{"{{feed_author}}": feed.author or ""},
{"{{feed_author}}": feed.authors_str or ""},
{"{{feed_added}}": feed_added or ""},
{"{{feed_last_exception}}": feed_last_exception},
{"{{feed_last_updated}}": feed_last_updated or ""},
@ -331,7 +331,7 @@ def replace_tags_in_embed(feed: Feed, entry: Entry, reader: Reader) -> CustomEmb
{"{{feed_user_title}}": feed.user_title or ""},
{"{{feed_version}}": feed.version or ""},
{"{{entry_added}}": entry_added or ""},
{"{{entry_author}}": entry.author or ""},
{"{{entry_author}}": entry.authors_str or ""},
{"{{entry_content}}": content or ""},
{"{{entry_content_raw}}": entry.content[0].value if entry.content else ""},
{"{{entry_id}}": entry.id},

37
discord_rss_bot/feeds.py
View file

@ -22,9 +22,11 @@ from urllib.parse import parse_qs
from urllib.parse import urljoin
from urllib.parse import urlparse
import httpx
import httpx2
import tldextract
from fastapi import HTTPException
from httpx2 import HTTPError
from httpx2 import Response
from markdownify import markdownify
from playwright.sync_api import Browser
from playwright.sync_api import Page
@ -702,7 +704,7 @@ def get_webhook_files(webhook: DiscordWebhook) -> list[WebhookFile]: # noqa: C9
return files
def get_retry_after_seconds(response: httpx.Response) -> float | None:
def get_retry_after_seconds(response: Response) -> float | None:
"""Return Discord's retry delay for a rate-limited response when available."""
response_json: JsonObject = get_response_json(response)
retry_after: JsonValue = response_json.get("retry_after")
@ -727,7 +729,7 @@ def request_discord_webhook(
files: list[WebhookFile] | None,
timeout: float,
rate_limit_retry: bool,
) -> httpx.Response:
) -> Response:
"""Send a Discord webhook request with optional multipart files.
Returns:
@ -742,7 +744,7 @@ def request_discord_webhook(
else:
request_kwargs["json"] = payload
response: httpx.Response = httpx.request(method, url, **request_kwargs)
response: Response = httpx2.request(method, url, **request_kwargs)
if not rate_limit_retry or response.status_code != 429: # noqa: PLR2004
return response
@ -751,11 +753,11 @@ def request_discord_webhook(
return response
time.sleep(max(0.0, retry_after))
return httpx.request(method, url, **request_kwargs)
return httpx2.request(method, url, **request_kwargs)
def send_webhook_message(webhook: DiscordWebhook, payload: JsonObject) -> httpx.Response:
"""Execute a Discord webhook message create request using httpx.
def send_webhook_message(webhook: DiscordWebhook, payload: JsonObject) -> Response:
"""Execute a Discord webhook message create request using httpx2.
Returns:
Discord API response.
@ -777,11 +779,11 @@ def edit_sent_webhook_message(
message_id: str,
webhook: DiscordWebhook,
payload: JsonObject,
) -> httpx.Response:
) -> Response:
"""Edit an already-sent Discord webhook message.
Returns:
httpx.Response: Discord API response.
Response: Discord API response.
"""
clean_webhook_url, params = get_webhook_query_params(webhook_url, payload, webhook=webhook, wait=True)
return request_discord_webhook(
@ -938,8 +940,13 @@ def update_sent_webhook_record_for_entry(
now: str = datetime.datetime.now(tz=datetime.UTC).isoformat()
try:
response = edit_sent_webhook_message(webhook_url_value, message_id_value, webhook, edit_payload)
except (AssertionError, RequestException, httpx.HTTPError, OSError, ValueError) as e:
response: Response = edit_sent_webhook_message(
webhook_url=webhook_url_value,
message_id=message_id_value,
webhook=webhook,
payload=edit_payload,
)
except (AssertionError, RequestException, HTTPError, OSError, ValueError) as e:
logger.exception("Failed to edit Discord webhook message %s for entry %s", message_id_value, entry.id)
return (
{
@ -1484,13 +1491,13 @@ def fetch_ttvdrops_campaign_media_items(entry: Entry) -> list[JsonObject]:
return []
try:
response: httpx.Response = httpx.get(api_url, follow_redirects=True, timeout=10.0)
response: Response = httpx2.get(api_url, follow_redirects=True, timeout=10.0)
if response.status_code != 200: # noqa: PLR2004
logger.warning("Failed to fetch ttvdrops campaign data from %s: %s", api_url, response.text[:500])
return []
response_json = cast("JsonValue", response.json())
except (httpx.HTTPError, ValueError, TypeError):
except (HTTPError, ValueError, TypeError):
logger.exception("Failed to fetch ttvdrops campaign data from %s", api_url)
return []
@ -1759,7 +1766,7 @@ def send_to_discord(reader: Reader | None = None, feed: Feed | None = None, *, d
)
try:
update_sent_webhooks_for_modified_entries(effective_reader, modified_entries)
except (AssertionError, ReaderError, RequestException, httpx.HTTPError, OSError, ValueError):
except (AssertionError, ReaderError, RequestException, HTTPError, OSError, ValueError):
logger.exception("Failed to update saved Discord webhooks for modified feed entries.")
# Loop through the unread entries.
@ -1826,7 +1833,7 @@ def execute_webhook(
request_payload: JsonObject = get_webhook_request_payload(webhook)
payload: JsonObject = get_webhook_message_payload(webhook)
response: httpx.Response = send_webhook_message(webhook, request_payload)
response: Response = send_webhook_message(webhook, request_payload)
logger.debug("Discord webhook response for entry %s: status=%s", entry.id, response.status_code)
if response.status_code not in {200, 204}:
msg: str = f"Error sending entry to Discord: {response.text}\n{pprint.pformat(request_payload)}"

2
discord_rss_bot/filter/evaluator.py
View file

@ -245,7 +245,7 @@ def get_entry_fields(entry: Entry) -> dict[str, str]:
"title": entry.title or "",
"summary": entry.summary or "",
"content": content_value,
"author": entry.author or "",
"author": entry.authors_str or "",
}

26
discord_rss_bot/main.py
View file

@ -18,7 +18,7 @@ from typing import Annotated
from typing import TypedDict
from typing import cast
import httpx
import httpx2
import sentry_sdk
import uvicorn
from apscheduler.schedulers.asyncio import AsyncIOScheduler
@ -30,7 +30,8 @@ from fastapi import Request
from fastapi.responses import HTMLResponse
from fastapi.staticfiles import StaticFiles
from fastapi.templating import Jinja2Templates
from httpx import Response
from httpx2 import HTTPError
from httpx2 import Response
from markdownify import markdownify
from reader import Entry
from reader import EntryNotFoundError
@ -82,6 +83,7 @@ from discord_rss_bot.settings import get_reader
if TYPE_CHECKING:
from collections.abc import AsyncGenerator
from collections.abc import Iterable
from pathlib import Path
from reader.types import JSONType
@ -1881,7 +1883,7 @@ def create_html_for_feed( # noqa: C901, PLR0914
html += f"""<div class="p-2 mb-2 border border-dark">
{blacklisted}{whitelisted}{from_another_feed}<a class="text-muted text-decoration-none" href="{entry.link}"><h2>{entry.title}</h2></a>
{feed_link}{f"By {entry.author} @" if entry.author else ""}{published} - {to_discord_html}
{feed_link}{f"By {entry.authors_str} @" if entry.authors_str else ""}{published} - {to_discord_html}
{text}
{video_embed_html}
@ -1939,8 +1941,8 @@ def get_data_from_hook_url(hook_name: str, hook_url: str) -> WebhookInfo:
return our_hook
try:
response: Response = httpx.get(clean_hook_url, timeout=10.0)
except httpx.HTTPError as e:
response: Response = httpx2.get(clean_hook_url, timeout=10.0)
except HTTPError as e:
logger.warning("Failed to fetch webhook metadata for %s: %s", clean_hook_url, e)
return our_hook
@ -2209,7 +2211,7 @@ async def update_feed(
try:
update_sent_webhooks_for_modified_entries(reader, modified_entries)
except (AssertionError, ReaderError, httpx.HTTPError, OSError, ValueError):
except (AssertionError, ReaderError, HTTPError, OSError, ValueError):
logger.exception("Failed to update saved Discord webhooks for manually updated feed: %s", feed_url)
logger.info("Manually updated feed: %s", feed_url)
@ -2230,18 +2232,18 @@ async def manual_backup(
Returns:
RedirectResponse: Redirect to the index page with a success or error message.
"""
backup_path = get_backup_path()
backup_path: Path | None = get_backup_path()
if backup_path is None:
message = "Git backup is not configured. Set GIT_BACKUP_PATH environment variable to enable backups."
message: str = "Git backup is not configured. Set GIT_BACKUP_PATH environment variable to enable backups."
logger.warning("Manual git backup attempted but GIT_BACKUP_PATH is not configured")
return RedirectResponse(url=f"/?message={urllib.parse.quote(message)}", status_code=303)
try:
commit_state_change(reader, "Manual backup triggered from web UI")
message = "Successfully created git backup!"
message: str = "Successfully created git backup!"
logger.info("Manual git backup completed successfully")
except Exception as e:
message = f"Failed to create git backup: {e}"
message: str = f"Failed to create git backup: {e}"
logger.exception("Manual git backup failed")
return RedirectResponse(url=f"/?message={urllib.parse.quote(message)}", status_code=303)
@ -2419,8 +2421,8 @@ def resolve_final_feed_url(url: str) -> tuple[str, str | None]:
return clean_url, "URL is invalid"
try:
response: Response = httpx.get(clean_url, follow_redirects=True, timeout=10.0)
except httpx.HTTPError as e:
response: Response = httpx2.get(clean_url, follow_redirects=True, timeout=10.0)
except HTTPError as e:
return clean_url, str(e)
if not response.is_success:

2
discord_rss_bot/templates/_filter_preview.html
View file

@ -33,7 +33,7 @@
{% endif %}
</h5>
<p class="text-muted small mb-0">
{% if row.entry.author %}By {{ row.entry.author }} |{% endif %}
{% if row.entry.authors_str %}By {{ row.entry.authors_str }} |{% endif %}
{{ row.published_label }}
</p>
</div>

4
discord_rss_bot/templates/custom.html
View file

@ -21,7 +21,7 @@
{% raw %}
{{feed_author}}
{% endraw %}
</code>{{ feed.author }}
</code>{{ feed.authors_str }}
</li>
<li>
<code>
@ -114,7 +114,7 @@
{% raw %}
{{entry_author}}
{% endraw %}
</code>{{ entry.author }}
</code>{{ entry.authors_str }}
</li>
{% if entry.content %}
<li>

4
discord_rss_bot/templates/embed.html
View file

@ -14,7 +14,7 @@
{% raw %}
{{feed_author}}
{% endraw %}
</code>{{feed.author}}
</code>{{feed.authors_str}}
</li>
<li>
<code>
@ -107,7 +107,7 @@
{% raw %}
{{entry_author}}
{% endraw %}
</code>{{entry.author}}
</code>{{entry.authors_str}}
</li>
{% if entry.content %}
<li>

2
discord_rss_bot/webhook.py
View file

@ -82,7 +82,7 @@ class DiscordWebhook:
"""Discord webhook request data.
This intentionally mirrors the subset of `discord-webhook` used by the app
while leaving the actual HTTP transport to `httpx`.
while leaving the actual HTTP transport to `httpx2`.
"""
def __init__( # noqa: D107

2
pyproject.toml
View file

@ -7,7 +7,7 @@ requires-python = ">=3.12"
dependencies = [
"apscheduler>=3.11.0",
"fastapi",
"httpx",
"httpx2",
"jinja2",
"lxml",
"markdownify",

2
tests/test_custom_message.py
View file

@ -42,6 +42,7 @@ def make_feed() -> SimpleNamespace:
return SimpleNamespace(
added=None,
author="Feed Author",
authors_str="Entry Author",
last_exception=None,
last_updated=None,
link="https://example.com/feed",
@ -60,6 +61,7 @@ def make_entry(summary: str) -> SimpleNamespace:
return SimpleNamespace(
added=None,
author="Entry Author",
authors_str="Entry Author",
content=[],
feed=feed,
feed_url=feed.url,

12
tests/test_feeds.py
View file

@ -792,7 +792,7 @@ def test_get_ttvdrops_campaign_api_url_from_campaign_page() -> None:
("https://ttvdrops.lovinator.space/twitch/feed.xml?hide_paid=0&hide_paid=1", False),
],
)
@patch("discord_rss_bot.feeds.httpx.get")
@patch("discord_rss_bot.feeds.httpx2.get")
def test_fetch_ttvdrops_campaign_media_items_extracts_reward_alt_text(
mock_get: MagicMock,
feed_url: str,
@ -1351,8 +1351,8 @@ def test_execute_webhook_does_not_record_when_feed_tracking_disabled(mock_send_w
reader.set_tag.assert_not_called()
@patch("discord_rss_bot.feeds.httpx.request")
def test_send_webhook_message_posts_components_with_httpx(mock_request: MagicMock) -> None:
@patch("discord_rss_bot.feeds.httpx2.request")
def test_send_webhook_message_posts_components_with_httpx2(mock_request: MagicMock) -> None:
response = MagicMock(status_code=200, text='{"id": "message-1"}')
mock_request.return_value = response
components: list[feeds.JsonValue] = [
@ -1383,7 +1383,7 @@ def test_send_webhook_message_posts_components_with_httpx(mock_request: MagicMoc
}
@patch("discord_rss_bot.feeds.httpx.request")
@patch("discord_rss_bot.feeds.httpx2.request")
def test_send_webhook_message_uploads_files_as_multipart(mock_request: MagicMock) -> None:
response = MagicMock(status_code=200, text='{"id": "message-2"}')
mock_request.return_value = response
@ -1462,7 +1462,7 @@ def test_update_sent_webhooks_for_modified_entries_edits_changed_payload(
assert updated_count == 1
mock_edit_sent_webhook_message.assert_called_once()
edit_payload = mock_edit_sent_webhook_message.call_args.args[3]
edit_payload = mock_edit_sent_webhook_message.call_args.kwargs["payload"]
assert edit_payload == {"content": "New title"}
records = state["sent_webhooks"]
assert isinstance(records, list)
@ -1533,7 +1533,7 @@ def test_update_sent_webhook_record_preserves_existing_embed_image_when_updated_
assert record_changed is True
assert message_was_edited is True
edit_payload = mock_edit_sent_webhook_message.call_args.args[3]
edit_payload = mock_edit_sent_webhook_message.call_args.kwargs["payload"]
assert isinstance(edit_payload["embeds"], list)
assert edit_payload["embeds"][0]["image"] == previous_image
assert isinstance(updated_record["payload"], dict)

7
tests/test_main.py
View file

@ -24,7 +24,7 @@ if TYPE_CHECKING:
from pathlib import Path
import pytest
from httpx import Response
from httpx2 import Response
from reader import Entry
from reader import Reader
@ -330,6 +330,7 @@ def test_blacklist_preview_uses_50_entry_limit() -> None:
title: str
summary: str
author: str
authors_str: str
link: str
published: datetime | None
content: list[DummyContent] = field(default_factory=lambda: [DummyContent("content")])
@ -347,6 +348,7 @@ def test_blacklist_preview_uses_50_entry_limit() -> None:
title=f"Entry {index}",
summary=f"Summary {index}",
author="Author",
authors_str="Author",
link=f"https://example.com/entry-{index}",
published=datetime(2024, 1, 1, tzinfo=UTC),
),
@ -403,6 +405,7 @@ def test_blacklist_preview_shows_labeled_field_values_for_substring_match() -> N
title: str
summary: str
author: str
authors_str: str
link: str
published: datetime | None
content: list[DummyContent] = field(default_factory=list)
@ -419,6 +422,7 @@ def test_blacklist_preview_shows_labeled_field_values_for_substring_match() -> N
title="World of Warcraft",
summary="<p>Massive MMO news update</p>",
author="Blizzard",
authors_str="Blizzard",
link="https://example.com/wow-1",
published=datetime(2024, 1, 1, tzinfo=UTC),
content=[DummyContent("<p>The expansion launches soon.</p>")],
@ -1461,6 +1465,7 @@ def test_create_html_marks_entries_from_another_feed(monkeypatch: pytest.MonkeyP
link: str = "https://example.com/post"
title: str = "Example title"
author: str = "Author"
authors_str: str = "Author"
summary: str = "Summary"
content: list[DummyContent] = field(default_factory=lambda: [DummyContent("Content")])
published: None = None

2
tests/test_update_interval.py
View file

@ -8,7 +8,7 @@ from fastapi.testclient import TestClient
from discord_rss_bot.main import app
if TYPE_CHECKING:
from httpx import Response
from httpx2 import Response
client: TestClient = TestClient(app)
webhook_name: str = "Test Webhook for Update Interval"