aa-bulletin-board 1.10.1__tar.gz → 1.11.0__tar.gz

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-bulletin-board
-Version: 1.10.1
+Version: 1.11.0
 Summary: A simple bulletin board for Alliance Auth
 Project-URL: Homepage, https://github.com/ppfeufer/aa-bulletin-board
 Project-URL: Documentation, https://github.com/ppfeufer/aa-bulletin-board/blob/master/README.md

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/__init__.py

@@ -8,7 +8,7 @@ from importlib import metadata
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = metadata.version("aa-bulletin-board")
+__version__ = metadata.version(distribution_name="aa-bulletin-board")
 __title__ = _("Bulletin Board")
 
 del metadata

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/auth_hooks.py

@@ -23,21 +23,24 @@ class AaBulletinBoardMenuItem(MenuItemHook):  # pylint: disable=too-few-public-m
 
         MenuItemHook.__init__(
             self,
-            __title__,
-            "fas fa-clipboard-list fa-fw",
-            "aa_bulletin_board:dashboard",
+            text=__title__,
+            classes="fas fa-clipboard-list fa-fw",
+            url_name="aa_bulletin_board:dashboard",
             navactive=["aa_bulletin_board:"],
         )
 
     def render(self, request):
         """
         Check if the user has the permission to view this app
+
         :param request:
+        :type request:
         :return:
+        :rtype:
         """
 
-        if request.user.has_perm("aa_bulletin_board.basic_access"):
-            return MenuItemHook.render(self, request)
+        if request.user.has_perm(perm="aa_bulletin_board.basic_access"):
+            return MenuItemHook.render(self, request=request)
 
         return ""
 
@@ -46,7 +49,9 @@ class AaBulletinBoardMenuItem(MenuItemHook):  # pylint: disable=too-few-public-m
 def register_menu():
     """
     Register our menu item
+
     :return:
+    :rtype:
     """
 
     return AaBulletinBoardMenuItem()
@@ -56,7 +61,11 @@ def register_menu():
 def register_urls():
     """
     Register our base url
+
     :return:
+    :rtype:
     """
 
-    return UrlHook(urls, "aa_bulletin_board", r"^bulletin-board/")
+    return UrlHook(
+        urls=urls, namespace="aa_bulletin_board", base_url=r"^bulletin-board/"
+    )

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/forms.py

@@ -29,7 +29,7 @@ class SpecialModelChoiceIterator(forms.models.ModelChoiceIterator):
         queryset = self.queryset
 
         for obj in queryset:
-            yield self.choice(obj)
+            yield self.choice(obj=obj)
 
 
 class SpecialModelMultipleChoiceField(forms.ModelMultipleChoiceField):
@@ -47,7 +47,7 @@ class SpecialModelMultipleChoiceField(forms.ModelMultipleChoiceField):
         self._queryset = queryset
         self.widget.choices = self.choices
 
-    queryset = property(_get_queryset, _set_queryset)
+    queryset = property(fget=_get_queryset, fset=_set_queryset)
 
 
 class BulletinForm(ModelForm):
@@ -90,12 +90,14 @@ class BulletinForm(ModelForm):
         model = Bulletin
         fields = ["title", "content", "groups"]
 
-    def clean_content(self):
+    def clean_content(self) -> str:
         """
         Cleanup the content
+
         :return:
+        :rtype:
         """
 
-        message = string_cleanup(self.cleaned_data["content"])
+        message = string_cleanup(string=self.cleaned_data["content"])
 
         return message

aa_bulletin_board-1.11.0/aa_bulletin_board/helpers.py

@@ -0,0 +1,34 @@
+"""
+Our little helpers
+"""
+
+# Standard Library
+import re
+
+
+def string_cleanup(string: str) -> str:
+    """
+    Clean up a string by removing JS, CSS and Head tags
+
+    :param string:
+    :type string:
+    :return:
+    :rtype:
+    """
+
+    re_head = re.compile(
+        pattern=r"<\s*head[^>]*>.*?<\s*/\s*head\s*>", flags=re.S | re.I
+    )
+    re_script = re.compile(
+        pattern=r"<\s*script[^>]*>.*?<\s*/\s*script\s*>", flags=re.S | re.I
+    )
+    re_css = re.compile(
+        pattern=r"<\s*style[^>]*>.*?<\s*/\s*style\s*>", flags=re.S | re.I
+    )
+
+    # Strip JS
+    string = re_head.sub(repl="", string=string)
+    string = re_script.sub(repl="", string=string)
+    string = re_css.sub(repl="", string=string)
+
+    return string

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/locale/de/LC_MESSAGES/django.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-27 22:06+0200\n"
-"PO-Revision-Date: 2023-07-28 22:39+0000\n"
+"POT-Creation-Date: 2023-08-02 15:50+0200\n"
+"PO-Revision-Date: 2023-08-09 15:40+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/"
 "alliance-auth-apps/aa-bulletin-board/de/>\n"
@@ -41,37 +41,37 @@ msgstr ""
 "Gruppenbeschränkungen bestehen, kann jeder der Zugriff auf dieses Modul hat, "
 "dieses Bulletin lesen."
 
-#: models.py:74
+#: models.py:81
 msgid "Title"
 msgstr "Titel"
 
-#: models.py:76
+#: models.py:83
 msgid "Content"
 msgstr "Inhalt"
 
 #. Translators: This is the date and time the bulletin has been created
-#: models.py:81
+#: models.py:88
 msgid "Created"
 msgstr "Erstellt"
 
 #. Translators: This is the date and time the bulletin has been updated
-#: models.py:87
+#: models.py:94
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: models.py:96
+#: models.py:103
 msgid "User"
 msgstr "Nutzer"
 
-#: models.py:102
+#: models.py:109
 msgid "Group restrictions"
 msgstr "Gruppenbeschränkungen"
 
-#: models.py:113
+#: models.py:120
 msgid "Bulletin"
 msgstr "Bulletin"
 
-#: models.py:114
+#: models.py:121
 msgid "Bulletins"
 msgstr "Bulletins"
 
@@ -119,48 +119,43 @@ msgstr "Bulletin aktualisieren"
 msgid "Create Bulletin"
 msgstr "Bulletin erstellen"
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:4
-msgid "Join our team of translators!"
-msgstr "Tritt unserm Team von Übersetzern bei!"
-
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:7
-#, python-format
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:5
 msgid ""
-"\n"
-"            Do you want to help translate this app into your language or "
-"improve the existing translation? - %(weblate_link)s\n"
-"        "
+"Do you want to help translate this app into your language or improve the "
+"existing translation?"
 msgstr ""
-"\n"
-"            Du möchtest helfen diese App in Deine Sprache zu übersetzen oder "
-"die bestehende Übersetzung verbessern? - %(weblate_link)s\n"
-"        "
+"Du möchtest helfen diese App in Deine Sprache zu übersetzen oder die "
+"bestehende Übersetzung verbessern?"
+
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:8
+msgid "Join our team of translators!"
+msgstr "Tritt unserm Team von Übersetzern bei!"
 
-#: views.py:65
+#: views.py:80
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" created."
 msgstr "Bulletin \"{bulletin__title}\" erstellt."
 
-#: views.py:92
+#: views.py:123
 msgid ""
 "The bulletin you are looking for does not exist, or you don't have access to "
 "it."
 msgstr "Dieses Bulletin existiert nicht, oder Du hast keinen Zugriff darauf."
 
-#: views.py:129
+#: views.py:165
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" updated."
 msgstr "Bulletin \"{bulletin__title}\" aktualisiert."
 
-#: views.py:140
+#: views.py:184
 msgid "The bulletin you are trying to edit does not exist."
 msgstr "Das Bulletin das Du bearbeiten möchtest scheint nicht zu existieren."
 
-#: views.py:159
+#: views.py:208
 #, python-brace-format
 msgid "Bulletin \"{bulletin.title}\" deleted."
 msgstr "Bulletin \"{bulletin.title}\" gelöscht."
 
-#: views.py:164
+#: views.py:215
 msgid "The bulletin you are trying to delete does not exist."
 msgstr "Das Bulletin das Du versuchst zu löschen scheint nicht zu existieren."

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/locale/django.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-27 22:06+0200\n"
+"POT-Creation-Date: 2023-08-02 15:50+0200\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"
@@ -37,37 +37,37 @@ msgid ""
 "place, everyone who has access to this module can read this bulletin."
 msgstr ""
 
-#: models.py:74
+#: models.py:81
 msgid "Title"
 msgstr ""
 
-#: models.py:76
+#: models.py:83
 msgid "Content"
 msgstr ""
 
 #. Translators: This is the date and time the bulletin has been created
-#: models.py:81
+#: models.py:88
 msgid "Created"
 msgstr ""
 
 #. Translators: This is the date and time the bulletin has been updated
-#: models.py:87
+#: models.py:94
 msgid "Updated"
 msgstr ""
 
-#: models.py:96
+#: models.py:103
 msgid "User"
 msgstr ""
 
-#: models.py:102
+#: models.py:109
 msgid "Group restrictions"
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Bulletin"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Bulletins"
 msgstr ""
 
@@ -115,44 +115,41 @@ msgstr ""
 msgid "Create Bulletin"
 msgstr ""
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:4
-msgid "Join our team of translators!"
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:5
+msgid ""
+"Do you want to help translate this app into your language or improve the "
+"existing translation?"
 msgstr ""
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:7
-#, python-format
-msgid ""
-"\n"
-"            Do you want to help translate this app into your language or "
-"improve the existing translation? - %(weblate_link)s\n"
-"        "
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:8
+msgid "Join our team of translators!"
 msgstr ""
 
-#: views.py:65
+#: views.py:80
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" created."
 msgstr ""
 
-#: views.py:92
+#: views.py:123
 msgid ""
 "The bulletin you are looking for does not exist, or you don't have access to "
 "it."
 msgstr ""
 
-#: views.py:129
+#: views.py:165
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" updated."
 msgstr ""
 
-#: views.py:140
+#: views.py:184
 msgid "The bulletin you are trying to edit does not exist."
 msgstr ""
 
-#: views.py:159
+#: views.py:208
 #, python-brace-format
 msgid "Bulletin \"{bulletin.title}\" deleted."
 msgstr ""
 
-#: views.py:164
+#: views.py:215
 msgid "The bulletin you are trying to delete does not exist."
 msgstr ""

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-27 22:06+0200\n"
+"POT-Creation-Date: 2023-08-02 15:50+0200\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"
@@ -38,37 +38,37 @@ msgid ""
 "place, everyone who has access to this module can read this bulletin."
 msgstr ""
 
-#: models.py:74
+#: models.py:81
 msgid "Title"
 msgstr ""
 
-#: models.py:76
+#: models.py:83
 msgid "Content"
 msgstr ""
 
 #. Translators: This is the date and time the bulletin has been created
-#: models.py:81
+#: models.py:88
 msgid "Created"
 msgstr ""
 
 #. Translators: This is the date and time the bulletin has been updated
-#: models.py:87
+#: models.py:94
 msgid "Updated"
 msgstr ""
 
-#: models.py:96
+#: models.py:103
 msgid "User"
 msgstr ""
 
-#: models.py:102
+#: models.py:109
 msgid "Group restrictions"
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Bulletin"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Bulletins"
 msgstr ""
 
@@ -116,44 +116,41 @@ msgstr ""
 msgid "Create Bulletin"
 msgstr ""
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:4
-msgid "Join our team of translators!"
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:5
+msgid ""
+"Do you want to help translate this app into your language or improve the "
+"existing translation?"
 msgstr ""
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:7
-#, python-format
-msgid ""
-"\n"
-"            Do you want to help translate this app into your language or "
-"improve the existing translation? - %(weblate_link)s\n"
-"        "
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:8
+msgid "Join our team of translators!"
 msgstr ""
 
-#: views.py:65
+#: views.py:80
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" created."
 msgstr ""
 
-#: views.py:92
+#: views.py:123
 msgid ""
 "The bulletin you are looking for does not exist, or you don't have access to "
 "it."
 msgstr ""
 
-#: views.py:129
+#: views.py:165
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" updated."
 msgstr ""
 
-#: views.py:140
+#: views.py:184
 msgid "The bulletin you are trying to edit does not exist."
 msgstr ""
 
-#: views.py:159
+#: views.py:208
 #, python-brace-format
 msgid "Bulletin \"{bulletin.title}\" deleted."
 msgstr ""
 
-#: views.py:164
+#: views.py:215
 msgid "The bulletin you are trying to delete does not exist."
 msgstr ""

{aa_bulletin_board-1.10.1 → aa_bulletin_board-1.11.0}/aa_bulletin_board/locale/fr_FR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-27 22:06+0200\n"
+"POT-Creation-Date: 2023-08-02 15:50+0200\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"
@@ -37,37 +37,37 @@ msgid ""
 "place, everyone who has access to this module can read this bulletin."
 msgstr ""
 
-#: models.py:74
+#: models.py:81
 msgid "Title"
 msgstr ""
 
-#: models.py:76
+#: models.py:83
 msgid "Content"
 msgstr ""
 
 #. Translators: This is the date and time the bulletin has been created
-#: models.py:81
+#: models.py:88
 msgid "Created"
 msgstr ""
 
 #. Translators: This is the date and time the bulletin has been updated
-#: models.py:87
+#: models.py:94
 msgid "Updated"
 msgstr ""
 
-#: models.py:96
+#: models.py:103
 msgid "User"
 msgstr ""
 
-#: models.py:102
+#: models.py:109
 msgid "Group restrictions"
 msgstr ""
 
-#: models.py:113
+#: models.py:120
 msgid "Bulletin"
 msgstr ""
 
-#: models.py:114
+#: models.py:121
 msgid "Bulletins"
 msgstr ""
 
@@ -115,44 +115,41 @@ msgstr ""
 msgid "Create Bulletin"
 msgstr ""
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:4
-msgid "Join our team of translators!"
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:5
+msgid ""
+"Do you want to help translate this app into your language or improve the "
+"existing translation?"
 msgstr ""
 
-#: templates/aa_bulletin_board/partials/app-translation-footer.html:7
-#, python-format
-msgid ""
-"\n"
-"            Do you want to help translate this app into your language or "
-"improve the existing translation? - %(weblate_link)s\n"
-"        "
+#: templates/aa_bulletin_board/partials/footer/app-translation-footer.html:8
+msgid "Join our team of translators!"
 msgstr ""
 
-#: views.py:65
+#: views.py:80
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" created."
 msgstr ""
 
-#: views.py:92
+#: views.py:123
 msgid ""
 "The bulletin you are looking for does not exist, or you don't have access to "
 "it."
 msgstr ""
 
-#: views.py:129
+#: views.py:165
 #, python-brace-format
 msgid "Bulletin \"{bulletin__title}\" updated."
 msgstr ""
 
-#: views.py:140
+#: views.py:184
 msgid "The bulletin you are trying to edit does not exist."
 msgstr ""
 
-#: views.py:159
+#: views.py:208
 #, python-brace-format
 msgid "Bulletin \"{bulletin.title}\" deleted."
 msgstr ""
 
-#: views.py:164
+#: views.py:215
 msgid "The bulletin you are trying to delete does not exist."
 msgstr ""