aa-rss-to-discord 2.4.0__tar.gz → 2.5.0__tar.gz

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-rss-to-discord
-Version: 2.4.0
+Version: 2.5.0
 Summary: Alliance Auth module to post news from RSS feeds to your Discord
 Project-URL: Changelog, https://github.com/ppfeufer/aa-rss-to-discord/blob/master/CHANGELOG.md
 Project-URL: Codecov, https://codecov.io/gh/ppfeufer/aa-rss-to-discord
@@ -705,7 +705,7 @@ Requires-Python: <3.14,>=3.10
 Requires-Dist: allianceauth-discordbot>=3.0.5
 Requires-Dist: allianceauth<5,>=4.3.1
 Requires-Dist: feedparser
-Requires-Dist: py-cord>=2.7.0rc2; python_version == '3.13'
+Requires-Dist: py-cord>=2.7.0rc2; python_version >= '3.13'
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
 Requires-Dist: django-webtest; extra == 'tests-allianceauth-latest'
@@ -773,7 +773,7 @@ Make sure you're in the virtual environment (venv) of your Alliance Auth
 installation Then install the latest release directly from PyPi.
 
 ```shell
-pip install aa-rss-to-discord==2.4.0
+pip install aa-rss-to-discord==2.5.0
 ```
 
 ### Step 2: Configure Alliance Auth<a name="step-2-configure-alliance-auth"></a>
@@ -828,7 +828,7 @@ To update your existing installation of Alliance Auth RSS to Discord, first enab
 virtual environment (venv) of your Alliance Auth installation.
 
 ```bash
-pip install aa-rss-to-discord==2.4.0
+pip install aa-rss-to-discord==2.5.0
 
 python manage.py migrate
 ```

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/README.md

@@ -60,7 +60,7 @@ Make sure you're in the virtual environment (venv) of your Alliance Auth
 installation Then install the latest release directly from PyPi.
 
 ```shell
-pip install aa-rss-to-discord==2.4.0
+pip install aa-rss-to-discord==2.5.0
 ```
 
 ### Step 2: Configure Alliance Auth<a name="step-2-configure-alliance-auth"></a>
@@ -115,7 +115,7 @@ To update your existing installation of Alliance Auth RSS to Discord, first enab
 virtual environment (venv) of your Alliance Auth installation.
 
 ```bash
-pip install aa-rss-to-discord==2.4.0
+pip install aa-rss-to-discord==2.5.0
 
 python manage.py migrate
 ```

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/__init__.py

@@ -5,6 +5,6 @@ App init
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.4.0"
+__version__ = "2.5.0"
 __title__ = "RSS to Discord"
 __title_translated__ = _("RSS to Discord")

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/cs_CZ/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Czech <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/cs/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/de/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2025-04-25 14:24+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/de/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/django.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: AA RSS to Discord 2.4.0\n"
+"Project-Id-Version: AA RSS to Discord 2.5.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/es/LC_MESSAGES/django.po

@@ -2,24 +2,26 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Zigor Fernandez Moreno <sietehierros@gmail.com>, 2023, 2024.
+# Ivan <isangar2000@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
-"PO-Revision-Date: 2024-05-10 14:10+0000\n"
-"Last-Translator: Zigor Fernandez Moreno <sietehierros@gmail.com>\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
+"PO-Revision-Date: 2025-12-18 23:47+0000\n"
+"Last-Translator: Ivan <isangar2000@gmail.com>\n"
 "Language-Team: Spanish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5.3\n"
+"X-Generator: Weblate 5.14.3\n"
 
 #: aa_rss_to_discord/__init__.py:10
+#, fuzzy
 msgid "RSS to Discord"
-msgstr ""
+msgstr "RSS ir discord"
 
 #: aa_rss_to_discord/models.py:44
 msgid "RSS Feed"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/fr_FR/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2025-08-03 04:24+0000\n"
 "Last-Translator: The “Devcutter” Guy <mick162534@gmail.com>\n"
 "Language-Team: French <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/fr/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/it_IT/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Italian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/it/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/ja/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-08-05 10:10+0000\n"
 "Last-Translator: Anata_no_Usiro <yt23542354m@gmail.com>\n"
 "Language-Team: Japanese <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/ja/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/ko_KR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Hue Radient <seataoji@gmail.com>\n"
 "Language-Team: Korean <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/ko/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/nl_NL/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Dutch <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/nl/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/pl_PL/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Polish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/pl/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Dromiel <dimhry@yandex.ru>\n"
 "Language-Team: Russian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/ru/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/sk/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
 "PO-Revision-Date: 2024-05-10 14:10+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Slovak <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/sk/>\n"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/uk/LC_MESSAGES/django.po

@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Peter Pfeufer <info@ppfeufer.de>, 2023, 2024.
 # s0k0l -_- <salarysalo@gmail.com>, 2025.
+# Варрус <horowiserus@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
-"PO-Revision-Date: 2025-08-27 20:43+0000\n"
-"Last-Translator: s0k0l -_- <salarysalo@gmail.com>\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
+"PO-Revision-Date: 2025-12-15 14:17+0000\n"
+"Last-Translator: Варрус <horowiserus@gmail.com>\n"
 "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : (n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.13\n"
+"X-Generator: Weblate 5.14.3\n"
 
 #: aa_rss_to_discord/__init__.py:10
 msgid "RSS to Discord"
@@ -24,7 +25,7 @@ msgstr "RSS до Діскорду"
 
 #: aa_rss_to_discord/models.py:44
 msgid "RSS Feed"
-msgstr "RSS-фід"
+msgstr "RSS-стрічка"
 
 #: aa_rss_to_discord/models.py:45
 msgid "RSS Feeds"

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/aa_rss_to_discord/locale/zh_Hans/LC_MESSAGES/django.po

@@ -1,39 +1,38 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# AKA Patrick <hsc844766246@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA RSS to Discord 2.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-rss-to-discord/issues\n"
-"POT-Creation-Date: 2025-12-02 08:06+0100\n"
-"PO-Revision-Date: 2024-05-10 14:10+0000\n"
-"Last-Translator: Anonymous <noreply@weblate.org>\n"
-"Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/zh_Hans/>\n"
+"POT-Creation-Date: 2026-01-05 22:28+0100\n"
+"PO-Revision-Date: 2025-12-08 09:17+0000\n"
+"Last-Translator: AKA Patrick <hsc844766246@gmail.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-rss-to-discord/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.5.3\n"
+"X-Generator: Weblate 5.14.3\n"
 
 #: aa_rss_to_discord/__init__.py:10
 msgid "RSS to Discord"
-msgstr ""
+msgstr "链接Discord的Rss"
 
 #: aa_rss_to_discord/models.py:44
 msgid "RSS Feed"
-msgstr ""
+msgstr "RSS源"
 
 #: aa_rss_to_discord/models.py:45
 msgid "RSS Feeds"
-msgstr ""
+msgstr "RSS源"
 
 #: aa_rss_to_discord/models.py:72
 msgid "Last Item"
-msgstr ""
+msgstr "最后一项"
 
 #: aa_rss_to_discord/models.py:73
 msgid "Last Items"
-msgstr ""
+msgstr "最后几项"

aa_rss_to_discord-2.5.0/aa_rss_to_discord/tasks.py

@@ -0,0 +1,154 @@
+"""
+AA RSS To Discord Tasks
+"""
+
+# Standard Library
+import re
+
+# Third Party
+import feedparser
+from aadiscordbot.tasks import send_message
+from celery import group, shared_task
+
+# Alliance Auth
+from allianceauth.services.hooks import get_extension_logger
+from allianceauth.services.tasks import QueueOnce
+
+# AA RSS to Discord
+from aa_rss_to_discord import __title__
+from aa_rss_to_discord.constants import USER_AGENT
+from aa_rss_to_discord.models import LastItem, RssFeeds
+from aa_rss_to_discord.providers import AppLogger
+
+logger = AppLogger(get_extension_logger(__name__), __title__)
+
+
+def remove_emoji(string: str) -> str:
+    """
+    Removing these dumb as fuck emojis from the title string.
+    Like honestly, who in the hell needs that shit?
+
+    :param string: Input string
+    :type string: str
+    :return: String without emojis
+    :rtype: str
+    """
+
+    emoji_pattern = re.compile(
+        pattern="["
+        "\U0001f600-\U0001f64f"  # Emoticons
+        "\U0001f300-\U0001f5ff"  # Symbols & pictographs
+        "\U0001f680-\U0001f6ff"  # Transport & map symbols
+        "\U0001f1e0-\U0001f1ff"  # Flags (iOS)
+        "\U00002500-\U00002bef"  # Chinese char
+        "\U00002702-\U000027b0"
+        "\U00002702-\U000027b0"
+        "\U000024c2-\U0001f251"
+        "\U0001f926-\U0001f937"
+        "\U00010000-\U0010ffff"
+        "\u2640-\u2642"
+        "\u2600-\u2b55"
+        "\u200d"
+        "\u23cf"
+        "\u23e9"
+        "\u231a"
+        "\ufe0f"  # Dingbats
+        "\u3030"
+        "]+",
+        flags=re.UNICODE,
+    )
+
+    return emoji_pattern.sub(repl=r"", string=string)
+
+
+@shared_task(**{"base": QueueOnce})
+def fetch_rss() -> None:
+    """
+    Fetch all enabled RSS feeds and dispatch processing tasks.
+
+    :return: None
+    :rtype: None
+    """
+
+    rss_feeds = RssFeeds.objects.select_enabled()
+    if not rss_feeds:
+        logger.debug("No RSS feeds found to parse.")
+        return
+
+    feed_ids = [f.id for f in rss_feeds]
+    if not feed_ids:
+        logger.debug("No RSS feed ids to dispatch.")
+        return
+
+    group(_process_feed.s(fid) for fid in feed_ids).apply_async()
+
+
+@shared_task
+def _process_feed(rss_feed_id: int) -> None:
+    """
+    Process a single RSS feed by fetching its latest entry and posting to Discord if it's new.
+
+    :param rss_feed_id: ID of the RSS feed to process
+    :type rss_feed_id: int
+    :return: None
+    :rtype: None
+    """
+
+    try:
+        rss_feed = RssFeeds.objects.select_related("discord_channel").get(
+            id=rss_feed_id
+        )
+    except RssFeeds.DoesNotExist:
+        logger.debug("RSS feed %s not found", rss_feed_id)
+        return
+
+    logger.info(f'Fetching RSS Feed "{rss_feed.name}"')
+    feed = feedparser.parse(rss_feed.url, agent=USER_AGENT)
+
+    latest_entry = next(iter(getattr(feed, "entries", [])), None)
+    if not latest_entry:
+        logger.debug(f'No entries found for feed "{rss_feed.name}".')
+        return
+
+    feed_entry_title = remove_emoji(latest_entry.get("title", "No title"))
+    feed_entry_link = latest_entry.get("link")
+    feed_entry_time = latest_entry.get("published", latest_entry.get("updated"))
+    feed_entry_guid = latest_entry.get("id")
+
+    last_item = LastItem.objects.filter(rss_feed=rss_feed).first()
+    if last_item and (
+        last_item.rss_item_time,
+        last_item.rss_item_title,
+        last_item.rss_item_link,
+        last_item.rss_item_guid,
+    ) == (feed_entry_time, feed_entry_title, feed_entry_link, feed_entry_guid):
+        logger.debug(
+            'News item "%s" for RSS Feed "%s" has already been posted to your Discord',
+            feed_entry_title,
+            rss_feed.name,
+        )
+        return
+
+    if not last_item:
+        logger.debug("This seems to be a completely new RSS feed: %s", rss_feed.name)
+
+    logger.info(
+        'New entry found for RSS feed "%s", posting to Discord channel %s',
+        rss_feed.name,
+        rss_feed.discord_channel,
+    )
+
+    LastItem.objects.update_or_create(
+        rss_feed=rss_feed,
+        defaults={
+            "rss_item_time": feed_entry_time,
+            "rss_item_title": feed_entry_title,
+            "rss_item_link": feed_entry_link,
+            "rss_item_guid": feed_entry_guid,
+        },
+    )
+
+    send_message(
+        channel_id=rss_feed.discord_channel.channel,
+        message=f"**{rss_feed.name}**\n{feed_entry_link}",
+    )

aa_rss_to_discord-2.5.0/aa_rss_to_discord/tests/test_tasks.py

@@ -0,0 +1,236 @@
+"""
+Test cases for the fetch_rss task
+"""
+
+# Standard Library
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+# AA RSS to Discord
+from aa_rss_to_discord.constants import USER_AGENT
+from aa_rss_to_discord.models import RssFeeds
+from aa_rss_to_discord.tasks import _process_feed, fetch_rss
+from aa_rss_to_discord.tests import BaseTestCase
+
+
+class TestFetchRss(BaseTestCase):
+    """
+    Test cases for the fetch_rss task
+    """
+
+    def test_fetch_rss_logs_message_when_no_rss_feeds_found(self):
+        """
+        Test that fetch_rss logs a message when no RSS feeds are found.
+
+        :return:
+        :rtype:
+        """
+
+        with (
+            patch(
+                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled"
+            ) as mock_select_enabled,
+            patch("aa_rss_to_discord.tasks.logger.debug") as mock_logger_debug,
+        ):
+            mock_select_enabled.return_value = []
+
+            fetch_rss()
+
+            mock_logger_debug.assert_called_once_with("No RSS feeds found to parse.")
+
+    def test_fetch_rss_dispatches_tasks_for_enabled_feeds(self):
+        """
+        Test that fetch_rss dispatches tasks for enabled RSS feeds.
+
+        :return:
+        :rtype:
+        """
+
+        with (
+            patch(
+                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled"
+            ) as mock_select_enabled,
+            patch("aa_rss_to_discord.tasks.group") as mock_group,
+        ):
+            mock_rss_feed_1 = MagicMock(id=1)
+            mock_rss_feed_2 = MagicMock(id=2)
+            mock_select_enabled.return_value = [mock_rss_feed_1, mock_rss_feed_2]
+
+            fetch_rss()
+
+            mock_group.assert_called_once()
+            mock_group.return_value.apply_async.assert_called_once()
+            dispatched_tasks = mock_group.call_args[0][0]
+            dispatched_list = list(dispatched_tasks)
+            self.assertEqual(len(dispatched_list), 2)
+            self.assertEqual(dispatched_list[0].args[0], 1)
+            self.assertEqual(dispatched_list[1].args[0], 2)
+
+    def test_handles_empty_rss_feed_ids_gracefully(self):
+        """
+        Test that fetch_rss handles an empty list of RSS feed IDs gracefully.
+
+        :return:
+        :rtype:
+        """
+
+        with (
+            patch(
+                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled"
+            ) as mock_select_enabled,
+            patch("aa_rss_to_discord.tasks.group") as mock_group,
+            patch("aa_rss_to_discord.tasks.logger.debug") as mock_logger_debug,
+        ):
+            mock_select_enabled.return_value = iter([])
+
+            fetch_rss()
+
+            mock_group.assert_not_called()
+            mock_logger_debug.assert_called_once_with("No RSS feed ids to dispatch.")
+
+
+class TestHelperProcessRssFeed(BaseTestCase):
+    """
+    Test cases for the _process_feed task
+    """
+
+    def test_handles_missing_rss_feed_gracefully(self):
+        """
+        Test that _process_feed handles a missing RSS feed gracefully.
+
+        :return:
+        :rtype:
+        """
+
+        with patch(
+            "aa_rss_to_discord.tasks.RssFeeds.objects.select_related"
+        ) as mock_select_related:
+            mock_select_related.return_value.get.side_effect = RssFeeds.DoesNotExist
+
+            _process_feed(1)
+
+            mock_select_related.return_value.get.assert_called_once_with(id=1)
+
+    def test_logs_and_skips_when_no_entries_in_feed(self):
+        """
+        Test that _process_feed logs and skips processing when no entries are found in the feed.
+
+        :return:
+        :rtype:
+        """
+
+        with (
+            patch(
+                "aa_rss_to_discord.tasks.RssFeeds.objects.select_related"
+            ) as mock_select_related,
+            patch(
+                "aa_rss_to_discord.tasks.feedparser.parse", return_value={}
+            ) as mock_parse,
+        ):
+            mock_rss_feed = MagicMock(url="http://example.com", name="No Entries Feed")
+            mock_select_related.return_value.get.return_value = mock_rss_feed
+
+            _process_feed(1)
+
+            mock_parse.assert_called_once_with(mock_rss_feed.url, agent=USER_AGENT)
+
+    def test_posts_new_entry_to_discord(self):
+        """
+        Test that _process_feed posts a new entry to Discord when it's not a duplicate.
+
+        :return:
+        :rtype:
+        """
+
+        entry = {"title": "New Entry", "link": "http://example.com", "id": "123"}
+
+        with (
+            patch(
+                "aa_rss_to_discord.tasks.RssFeeds.objects.select_related"
+            ) as mock_select_related,
+            patch(
+                "aa_rss_to_discord.tasks.feedparser.parse",
+                return_value=SimpleNamespace(entries=[entry]),
+            ) as mock_parse,
+            patch("aa_rss_to_discord.tasks.LastItem.objects.filter") as mock_filter,
+            patch(
+                "aa_rss_to_discord.tasks.LastItem.objects.update_or_create"
+            ) as mock_update_or_create,
+            patch("aa_rss_to_discord.tasks.send_message") as mock_send_message,
+        ):
+            mock_rss_feed = MagicMock(
+                discord_channel=MagicMock(channel=12345),
+                name="Test Feed",
+                url="http://example.com",
+            )
+            mock_select_related.return_value.get.return_value = mock_rss_feed
+            mock_filter.return_value.first.return_value = None
+            mock_update_or_create.return_value = (MagicMock(), True)
+
+            _process_feed(1)
+
+            mock_parse.assert_called_once_with(mock_rss_feed.url, agent=USER_AGENT)
+            mock_update_or_create.assert_called_once()
+            self.assertTrue(
+                mock_send_message.called,
+                f"send_message not called. calls: {mock_send_message.call_args_list}",
+            )
+
+            call_args, call_kwargs = mock_send_message.call_args
+            called_channel = (
+                call_kwargs.get("channel_id")
+                if "channel_id" in call_kwargs
+                else (call_args[0] if len(call_args) > 0 else None)
+            )
+            called_message = (
+                call_kwargs.get("message")
+                if "message" in call_kwargs
+                else (
+                    call_args[1]
+                    if len(call_args) > 1
+                    else (call_args[0] if len(call_args) == 1 else None)
+                )
+            )
+
+            self.assertEqual(called_channel, 12345)
+            self.assertIsNotNone(called_message)
+            self.assertIn(mock_rss_feed.url, called_message)
+
+    def test_skips_posting_duplicate_entry(self):
+        """
+        Test that _process_feed skips posting a duplicate entry to Discord.
+
+        :return:
+        :rtype:
+        """
+
+        entry = {"title": "Duplicate Entry", "link": "http://example.com", "id": "123"}
+
+        with (
+            patch(
+                "aa_rss_to_discord.tasks.RssFeeds.objects.select_related"
+            ) as mock_select_related,
+            patch(
+                "aa_rss_to_discord.tasks.feedparser.parse",
+                return_value=SimpleNamespace(entries=[entry]),
+            ),
+            patch("aa_rss_to_discord.tasks.LastItem.objects.filter") as mock_filter,
+            patch("aa_rss_to_discord.tasks.send_message") as mock_send_message,
+        ):
+            mock_rss_feed = MagicMock(
+                discord_channel=MagicMock(channel=12345),
+                name="Dup Feed",
+                url="http://example.com",
+            )
+            mock_select_related.return_value.get.return_value = mock_rss_feed
+            mock_existing = MagicMock(
+                rss_item_time=None,
+                rss_item_title="Duplicate Entry",
+                rss_item_link="http://example.com",
+                rss_item_guid="123",
+            )
+            mock_filter.return_value.first.return_value = mock_existing
+
+            _process_feed(1)
+
+            mock_send_message.assert_not_called()

{aa_rss_to_discord-2.4.0 → aa_rss_to_discord-2.5.0}/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
     "allianceauth>=4.3.1,<5",
     "allianceauth-discordbot>=3.0.5",
     "feedparser",
-    "py-cord>=2.7.0rc2; python_version=='3.13'",
+    "py-cord>=2.7.0rc2; python_version>='3.13'",
 ]
 optional-dependencies.tests-allianceauth-latest = [
     "coverage",

aa_rss_to_discord-2.4.0/aa_rss_to_discord/tasks.py

@@ -1,131 +0,0 @@
-"""
-AA RSS To Discord Tasks
-"""
-
-# Standard Library
-import re
-
-# Third Party
-import feedparser
-from aadiscordbot.tasks import send_message
-from celery import shared_task
-
-# Alliance Auth
-from allianceauth.services.hooks import get_extension_logger
-from allianceauth.services.tasks import QueueOnce
-
-# AA RSS to Discord
-from aa_rss_to_discord import __title__
-from aa_rss_to_discord.constants import USER_AGENT
-from aa_rss_to_discord.models import LastItem, RssFeeds
-from aa_rss_to_discord.providers import AppLogger
-
-logger = AppLogger(get_extension_logger(__name__), __title__)
-
-
-def remove_emoji(string):
-    """
-    Removing these dumb as fuck emojis from the title string.
-    Like honestly, who in the hell needs that shit?
-
-    :param string:
-    :type string:
-    :return:
-    :rtype:
-    """
-
-    emoji_pattern = re.compile(
-        pattern="["
-        "\U0001f600-\U0001f64f"  # Emoticons
-        "\U0001f300-\U0001f5ff"  # Symbols & pictographs
-        "\U0001f680-\U0001f6ff"  # Transport & map symbols
-        "\U0001f1e0-\U0001f1ff"  # Flags (iOS)
-        "\U00002500-\U00002bef"  # Chinese char
-        "\U00002702-\U000027b0"
-        "\U00002702-\U000027b0"
-        "\U000024c2-\U0001f251"
-        "\U0001f926-\U0001f937"
-        "\U00010000-\U0010ffff"
-        "\u2640-\u2642"
-        "\u2600-\u2b55"
-        "\u200d"
-        "\u23cf"
-        "\u23e9"
-        "\u231a"
-        "\ufe0f"  # Dingbats
-        "\u3030"
-        "]+",
-        flags=re.UNICODE,
-    )
-
-    return emoji_pattern.sub(repl=r"", string=string)
-
-
-@shared_task(**{"base": QueueOnce})
-def fetch_rss() -> None:
-    """
-    Fetch RSS feeds and post new entries to Discord channels.
-
-    :return:
-    :rtype:
-    """
-
-    rss_feeds = RssFeeds.objects.select_enabled()
-
-    if not rss_feeds:
-        logger.debug("No RSS feeds found to parse.")
-
-        return
-
-    for rss_feed in rss_feeds:
-        logger.info(f'Fetching RSS Feed "{rss_feed.name}"')
-        feed = feedparser.parse(rss_feed.url, agent=USER_AGENT)
-
-        try:
-            latest_entry = feed.entries[0]
-            feed_entry_title = remove_emoji(latest_entry.get("title", "No title"))
-            feed_entry_link = latest_entry.get("link")
-            feed_entry_time = latest_entry.get("published", latest_entry.updated)
-            feed_entry_guid = latest_entry.get("id")
-        except (AttributeError, IndexError) as exc:
-            logger.debug(f'Error processing feed "{rss_feed.name}": {exc}')
-
-            continue
-
-        try:
-            last_item = LastItem.objects.get(rss_feed=rss_feed)
-            is_duplicate = (
-                last_item.rss_item_time == feed_entry_time
-                and last_item.rss_item_title == feed_entry_title
-                and last_item.rss_item_link == feed_entry_link
-                and last_item.rss_item_guid == feed_entry_guid
-            )
-
-            if is_duplicate:
-                logger.debug(
-                    f'News item "{feed_entry_title}" for RSS Feed "{rss_feed.name}" '
-                    "has already been posted to your Discord"
-                )
-
-                continue
-        except LastItem.DoesNotExist:
-            logger.debug("This seems to be a completely new RSS feed.")
-
-        logger.info(
-            f"New entry found, posting to Discord channel {rss_feed.discord_channel}"
-        )
-
-        LastItem.objects.update_or_create(
-            rss_feed=rss_feed,
-            defaults={
-                "rss_item_time": feed_entry_time,
-                "rss_item_title": feed_entry_title,
-                "rss_item_link": feed_entry_link,
-                "rss_item_guid": feed_entry_guid,
-            },
-        )
-
-        send_message(
-            channel_id=rss_feed.discord_channel.channel,
-            message=f"**{rss_feed.name}**\n{feed_entry_link}",
-        )

aa_rss_to_discord-2.4.0/aa_rss_to_discord/tests/test_tasks.py

@@ -1,176 +0,0 @@
-"""
-Test cases for the fetch_rss task
-"""
-
-# Standard Library
-from unittest.mock import MagicMock, patch
-
-# AA RSS to Discord
-from aa_rss_to_discord.models import LastItem
-from aa_rss_to_discord.tasks import fetch_rss
-from aa_rss_to_discord.tests import BaseTestCase
-
-
-class TestFetchRss(BaseTestCase):
-    """
-    Test fetch_rss task
-    """
-
-    def test_logs_warning_if_no_rss_feeds_found(self):
-        """
-        Test that a warning is logged if no RSS feeds are found.
-
-        :return:
-        :rtype:
-        """
-
-        with (
-            patch(
-                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled",
-                return_value=[],
-            ),
-            patch("aa_rss_to_discord.tasks.logger.debug") as mock_debug,
-        ):
-            fetch_rss()
-            mock_debug.assert_called_once_with("No RSS feeds found to parse.")
-
-    def test_processes_valid_rss_feed_entry(self):
-        """
-        Test that a valid RSS feed entry is processed and sent to Discord.
-
-        :return:
-        :rtype:
-        """
-
-        discord_channel = MagicMock()
-        discord_channel.channel = 12345
-
-        rss_feed = MagicMock()
-        rss_feed.name = "Valid Feed"
-        rss_feed.url = "http://example.com/rss"
-        rss_feed.discord_channel = discord_channel
-
-        # Use a MagicMock that acts like feedparser entry with both dict and attribute access
-        feed_entry = MagicMock()
-        feed_entry.get = lambda key, default=None: {
-            "title": "Valid Entry",
-            "link": "http://example.com/valid-entry",
-            "published": "2023-10-01T12:00:00Z",
-            "id": "entry-1",
-        }.get(key, default)
-        feed_entry.updated = (
-            "2023-10-01T12:00:00Z"  # Fallback if 'published' is missing
-        )
-
-        parsed_feed = MagicMock()
-        parsed_feed.entries = [feed_entry]
-
-        with (
-            patch(
-                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled",
-                return_value=[rss_feed],
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.feedparser.parse",
-                return_value=parsed_feed,
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.LastItem.objects.get",
-                side_effect=LastItem.DoesNotExist,
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.LastItem.objects.update_or_create",
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.send_message",
-            ) as mock_send_message,
-        ):
-            fetch_rss()
-
-            mock_send_message.assert_called_once()
-            call_args = mock_send_message.call_args
-            self.assertEqual(call_args.kwargs.get("channel_id"), 12345)
-            message = call_args.kwargs.get("message", "")
-            self.assertIn("http://example.com/valid-entry", message)
-            self.assertIn("Valid Feed", message)
-
-    def test_skips_duplicate_rss_feed_entry(self):
-        """
-        Test that a duplicate RSS feed entry is skipped.
-
-        :return:
-        :rtype:
-        """
-
-        rss_feed = MagicMock()
-        rss_feed.name = "Duplicate Feed"
-        rss_feed.url = "http://example.com/rss"
-
-        # Create feed entry that supports both dict-style and attribute access
-        feed_entry = MagicMock()
-        feed_entry.get = lambda key, default=None: {
-            "title": "Duplicate Entry",
-            "link": "http://example.com/duplicate-entry",
-            "published": "2023-10-01T12:00:00Z",
-            "id": "entry-1",
-        }.get(key, default)
-        feed_entry.updated = "2023-10-01T12:00:00Z"
-
-        last_item = MagicMock(
-            rss_item_time="2023-10-01T12:00:00Z",
-            rss_item_title="Duplicate Entry",
-            rss_item_link="http://example.com/duplicate-entry",
-            rss_item_guid="entry-1",
-        )
-
-        with (
-            patch(
-                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled",
-                return_value=[rss_feed],
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.feedparser.parse",
-                return_value=MagicMock(entries=[feed_entry]),
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.LastItem.objects.get",
-                return_value=last_item,
-            ),
-            patch("aa_rss_to_discord.tasks.logger.debug") as mock_debug,
-            patch("aa_rss_to_discord.tasks.send_message") as mock_send_message,
-        ):
-            fetch_rss()
-
-            mock_send_message.assert_not_called()
-            mock_debug.assert_any_call(
-                'News item "Duplicate Entry" for RSS Feed "Duplicate Feed" has already been posted to your Discord'
-            )
-
-    def test_skips_rss_feed_with_no_entries(self):
-        """
-        Test that an RSS feed with no entries is skipped.
-
-        :return:
-        :rtype:
-        """
-
-        rss_feed = MagicMock()
-        rss_feed.name = "Empty Feed"
-        rss_feed.url = "http://example.com/rss"
-
-        with (
-            patch(
-                "aa_rss_to_discord.tasks.RssFeeds.objects.select_enabled",
-                return_value=[rss_feed],
-            ),
-            patch(
-                "aa_rss_to_discord.tasks.feedparser.parse",
-                return_value=MagicMock(entries=[]),
-            ),
-            patch("aa_rss_to_discord.tasks.logger.debug") as mock_debug,
-        ):
-            fetch_rss()
-
-            mock_debug.assert_any_call(
-                'Error processing feed "Empty Feed": list index out of range'
-            )