PyPI - aa-rss-to-discord - Versions diffs - 1.8.1__tar.gz → 2.0.0b1__tar.gz - Mend

aa-rss-to-discord 1.8.1tar.gz → 2.0.0b1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/.gitignore RENAMED Viewed

@@ -2,14 +2,15 @@
 /dist/
 /*.egg-info/
 .idea/
+.tox/
+htmlcov/
+node_modules/
 *.log
 *.tmp
 *.bak
 *.old
 __pycache__
-/.coverage
-/htmlcov/
-/.tox/
+.coverage
 /coverage.xml
+alliance_auth.sqlite3

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-rss-to-discord
-Version: 1.8.1
+Version: 2.0.0b1
 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: Documentation, https://github.com/ppfeufer/aa-rss-to-discord/blob/master/README.md
@@ -697,13 +697,17 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Requires-Dist: allianceauth-app-utils>=1.14.2
 Requires-Dist: allianceauth-discordbot>=3.0.5
-Requires-Dist: allianceauth>=3
+Requires-Dist: allianceauth>=4.0.0b1
 Requires-Dist: feedparser
+Provides-Extra: tests-allianceauth-latest
+Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
+Requires-Dist: django-webtest; extra == 'tests-allianceauth-latest'
 Description-Content-Type: text/markdown
 # Alliance Auth RSS to Discord<a name="alliance-auth-rss-to-discord"></a>

aa_rss_to_discord-2.0.0b1/aa_rss_to_discord/__init__.py ADDED Viewed

@@ -0,0 +1,9 @@
+"""
+App init
+"""
+# Django
+from django.utils.translation import gettext_lazy as _
+__version__ = "2.0.0-beta.1"
+__title__ = _("RSS to Discord")

aa_rss_to_discord-2.0.0b1/aa_rss_to_discord/locale/de/LC_MESSAGES/django.mo ADDED Viewed

Binary file

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/de/LC_MESSAGES/django.po RENAMED Viewed

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
-"PO-Revision-Date: 2023-09-24 13:13+0000\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
+"PO-Revision-Date: 2023-11-16 18:04+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"
@@ -16,20 +16,24 @@ msgstr ""
 "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.0.2\n"
+"X-Generator: Weblate 5.1\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr "RSS zu Discord"
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr "RSS Feed"
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr "RSS Feeds"
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr "Letztes Element"
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr "Letzte Elemente"

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/django.pot RENAMED Viewed

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-19 01:27+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+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"
@@ -17,18 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr ""
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr ""
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr ""
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr ""

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/es/LC_MESSAGES/django.po RENAMED Viewed

@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+0000\n"
 "Last-Translator: Zigor Fernandez Moreno <sietehierros@gmail.com>\n"
-"Language-Team: Spanish <https://weblate.ppfeufer.de/projects/"
-"alliance-auth-apps/aa-rss-to-discord/es/>\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"
@@ -18,18 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr "RSS Feed"
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr "RSS Feeds"
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr "Último artículo"
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr "Últimos artículos"

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/fr_FR/LC_MESSAGES/django.po RENAMED Viewed

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
-"Language-Team: French <https://weblate.ppfeufer.de/projects/"
-"alliance-auth-apps/aa-rss-to-discord/fr/>\n"
+"Language-Team: French <https://weblate.ppfeufer.de/projects/alliance-auth-"
+"apps/aa-rss-to-discord/fr/>\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr ""
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr ""
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr ""
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr ""

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/it_IT/LC_MESSAGES/django.po RENAMED Viewed

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+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"
+"Language-Team: Italian <https://weblate.ppfeufer.de/projects/alliance-auth-"
+"apps/aa-rss-to-discord/it/>\n"
 "Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr ""
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr ""
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr ""
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr ""

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/ja/LC_MESSAGES/django.po RENAMED Viewed

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
-"Language-Team: Japanese <https://weblate.ppfeufer.de/projects/"
-"alliance-auth-apps/aa-rss-to-discord/ja/>\n"
+"Language-Team: Japanese <https://weblate.ppfeufer.de/projects/alliance-auth-"
+"apps/aa-rss-to-discord/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr ""
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr ""
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr ""
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr ""

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/ko_KR/LC_MESSAGES/django.po RENAMED Viewed

@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+0000\n"
 "Last-Translator: Author50CO <tkddlschry@gmail.com>\n"
-"Language-Team: Korean <https://weblate.ppfeufer.de/projects/"
-"alliance-auth-apps/aa-rss-to-discord/ko/>\n"
+"Language-Team: Korean <https://weblate.ppfeufer.de/projects/alliance-auth-"
+"apps/aa-rss-to-discord/ko/>\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr "RSS 피드"
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr "RSS 피드"
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr "마지막 항목"
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr "마지막 항목"

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/ru/LC_MESSAGES/django.mo RENAMED Viewed

Binary file

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/ru/LC_MESSAGES/django.po RENAMED Viewed

@@ -2,13 +2,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Nikolay <nick.postnikov@gmail.com>, 2023.
+# Dromiel <dimhry@yandex.ru>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
-"PO-Revision-Date: 2023-09-24 13:13+0000\n"
-"Last-Translator: Nikolay <nick.postnikov@gmail.com>\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
+"PO-Revision-Date: 2024-01-17 18:05+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"
 "Language: ru\n"
@@ -17,20 +18,24 @@ msgstr ""
 "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.0.2\n"
+"X-Generator: Weblate 5.3.1\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr "RSS к Дискорду"
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr "RSS лента"
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr "RSS ленты"
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr "Последний элемент"
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr "Последние элементы"

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/uk/LC_MESSAGES/django.po RENAMED Viewed

@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-19 01:27+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
-"Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/"
-"alliance-auth-apps/aa-rss-to-discord/uk/>\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"
@@ -19,18 +19,22 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr "RSS-канал"
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr "RSS-канали"
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr "Останній елемент"
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr "Останні Елемети"

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/locale/zh_Hans/LC_MESSAGES/django.po RENAMED Viewed

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-12 09:17+0200\n"
+"POT-Creation-Date: 2023-11-15 18:12+0100\n"
 "PO-Revision-Date: 2023-09-24 13:13+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/"
@@ -19,18 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.0.2\n"
-#: models.py:41
+#: aa_rss_to_discord/__init__.py:9
+msgid "RSS to Discord"
+msgstr ""
+#: aa_rss_to_discord/models.py:41
 msgid "RSS Feed"
 msgstr ""
-#: models.py:42
+#: aa_rss_to_discord/models.py:42
 msgid "RSS Feeds"
 msgstr ""
-#: models.py:69
+#: aa_rss_to_discord/models.py:69
 msgid "Last Item"
 msgstr ""
-#: models.py:70
+#: aa_rss_to_discord/models.py:70
 msgid "Last Items"
 msgstr ""

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/aa_rss_to_discord/tasks.py RENAMED Viewed

@@ -31,6 +31,7 @@ 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:
@@ -38,7 +39,7 @@ def remove_emoji(string):
     """
     emoji_pattern = re.compile(
-        "["
+        pattern="["
         "\U0001F600-\U0001F64F"  # Emoticons
         "\U0001F300-\U0001F5FF"  # Symbols & pictographs
         "\U0001F680-\U0001F6FF"  # Transport & map symbols
@@ -61,28 +62,32 @@ def remove_emoji(string):
         flags=re.UNICODE,
     )
-    return emoji_pattern.sub(r"", string)
+    return emoji_pattern.sub(repl=r"", string=string)
 @shared_task(**{"base": QueueOnce})
-def fetch_rss() -> None:  # pylint: disable=too-many-statements
+def fetch_rss() -> None:  # pylint: disable=too-many-statements, too-many-branches
     """
     Fetch RSS feeds and post to Discord
     :return:
     :rtype:
     """
-    if apps.is_installed("aadiscordbot"):  # pylint: disable=too-many-nested-blocks
+    # pylint: disable=too-many-nested-blocks
+    if apps.is_installed(app_name="aadiscordbot"):
         # Third Party
-        import aadiscordbot.tasks  # pylint: disable=import-outside-toplevel
+        from aadiscordbot.tasks import (  # pylint: disable=import-outside-toplevel
+            send_message,
+        )
         rss_feeds = RssFeeds.objects.select_enabled()
         if rss_feeds:
             for rss_feed in rss_feeds:
-                logger.info(f'Fetching RSS Feed "{rss_feed.name}"')
+                logger.info(msg=f'Fetching RSS Feed "{rss_feed.name}"')
-                feed = feedparser.parse(rss_feed.url)
+                feed = feedparser.parse(url_file_stream_or_string=rss_feed.url)
                 feed_entry_title = "No title"
                 feed_entry_link = None
@@ -90,19 +95,28 @@ def fetch_rss() -> None:  # pylint: disable=too-many-statements
                 feed_entry_guid = None
                 has_last_item = False
                 last_item = None
+                post_entry = False
                 try:
                     latest_entry = feed.entries[0]
                     feed_entry_title = remove_emoji(
-                        latest_entry.get("title", "No title")
+                        string=latest_entry.get("title", "No title")
                     )
                     feed_entry_link = latest_entry.get("link", None)
                     feed_entry_time = latest_entry.get(
                         "published", latest_entry.updated
                     )
                     feed_entry_guid = latest_entry.get("id", None)
+                except AttributeError as exc:
+                    logger.debug(
+                        msg=f'Malformed RSS feed item in feed "{rss_feed.name}". Error: {exc}'
+                    )
+                except IndexError as exc:
+                    logger.debug(
+                        msg=f'Could not index the RSS feed "{rss_feed.name}". Error: {exc}'
+                    )
+                else:
                     post_entry = True
                     has_last_item = True
@@ -117,27 +131,26 @@ def fetch_rss() -> None:  # pylint: disable=too-many-statements
                             and last_item.rss_item_guid == feed_entry_guid
                         ):
                             logger.debug(
-                                f'News item "{feed_entry_title}" for RSS Feed '
-                                f'"{rss_feed.name}" has already been posted to your Discord'
+                                msg=(
+                                    f'News item "{feed_entry_title}" for RSS Feed '
+                                    f'"{rss_feed.name}" has already been posted to your Discord'
+                                )
                             )
                             post_entry = False
                     except LastItem.DoesNotExist:
-                        logger.debug("This seems to be a completely new RSS feed.")
+                        logger.debug(msg="This seems to be a completely new RSS feed.")
                         has_last_item = False
-                except IndexError as ex:
-                    logger.debug(f"Could not index the RSS feed. Error: {ex}")
-                    post_entry = False
                 logger.debug(
-                    "RSS Information gathered: "
-                    f"post_entry => {post_entry}, "
-                    f'feed_entry_link => "{feed_entry_link}", '
-                    f'feed_entry_title => "{feed_entry_title}", '
-                    f"feed_entry_time => {feed_entry_time}, "
-                    f"feed_entry_guid => {feed_entry_guid}"
+                    msg=(
+                        "RSS Information gathered: "
+                        f"post_entry => {post_entry}, "
+                        f'feed_entry_link => "{feed_entry_link}", '
+                        f'feed_entry_title => "{feed_entry_title}", '
+                        f"feed_entry_time => {feed_entry_time}, "
+                        f"feed_entry_guid => {feed_entry_guid}"
+                    )
                 )
                 if (
@@ -146,8 +159,10 @@ def fetch_rss() -> None:  # pylint: disable=too-many-statements
                     and feed_entry_guid is not None
                 ):
                     logger.info(
-                        "New entry found, posting to Discord channel "
-                        f"{rss_feed.discord_channel}"
+                        msg=(
+                            "New entry found, posting to Discord channel "
+                            f"{rss_feed.discord_channel}"
+                        )
                     )
                     if has_last_item is True:
@@ -169,21 +184,24 @@ def fetch_rss() -> None:  # pylint: disable=too-many-statements
                     discord_message = f"**{rss_feed.name}**\n{feed_entry_link}"
-                    aadiscordbot.tasks.send_channel_message_by_discord_id.delay(
-                        rss_feed.discord_channel.channel,
-                        discord_message,
-                        embed=False,
+                    send_message(
+                        channel_id=rss_feed.discord_channel.channel,
+                        message=discord_message,
                     )
                 else:
                     logger.debug(
-                        f'No item for feed "{rss_feed.name}" to post. '
-                        'Missing either "post_entry" to be "True" or '
-                        'either "feed_entry_link" or "feed_entry_guid" is "None".'
+                        msg=(
+                            f'No item for feed "{rss_feed.name}" to post. '
+                            'Missing either "post_entry" to be "True" or '
+                            'either "feed_entry_link" or "feed_entry_guid" is "None".'
+                        )
                     )
         else:
-            logger.debug("No RSS feeds found to parse.")
+            logger.debug(msg="No RSS feeds found to parse.")
     else:
         logging.info(
-            "AA Discordbot (https://github.com/pvyParts/allianceauth-discordbot) "
-            "needs to be installed and configured."
+            msg=(
+                "AA Discordbot (https://github.com/pvyParts/allianceauth-discordbot) "
+                "needs to be installed and configured."
+            )
         )

{aa_rss_to_discord-1.8.1 → aa_rss_to_discord-2.0.0b1}/pyproject.toml RENAMED Viewed

@@ -6,7 +6,6 @@ requires = [
 [project]
 name = "aa-rss-to-discord"
-version = "1.8.1"
 description = "Alliance Auth module to post news from RSS feeds to your Discord"
 readme = "README.md"
 keywords = [
@@ -33,15 +32,24 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
+dynamic = [
+    "version",
+]
 dependencies = [
-    "allianceauth>=3",
+    "allianceauth>=4.0.0b1",
     "allianceauth-app-utils>=1.14.2",
     "allianceauth-discordbot>=3.0.5",
     "feedparser",
 ]
+[project.optional-dependencies]
+tests-allianceauth-latest = [
+    "coverage",
+    "django-webtest",
+]
 [project.urls]
 Changelog = "https://github.com/ppfeufer/aa-rss-to-discord/blob/master/CHANGELOG.md"
 Documentation = "https://github.com/ppfeufer/aa-rss-to-discord/blob/master/README.md"
@@ -54,3 +62,6 @@ Tracker = "https://github.com/ppfeufer/aa-rss-to-discord/issues"
 include = [
     "/aa_rss_to_discord",
 ]
+[tool.hatch.version]
+path = "aa_rss_to_discord/__init__.py"

aa_rss_to_discord-1.8.1/aa_rss_to_discord/__init__.py DELETED Viewed

@@ -1,11 +0,0 @@
-"""
-App init
-"""
-# Standard Library
-from importlib import metadata
-__version__ = metadata.version("aa-rss-to-discord")
-__title__ = "RSS to Discord"
-del metadata