feat: add push notifications

.gitignore

@@ -56,3 +56,10 @@ package-lock.json
 # Virtual environments
 venv/
 .venv/
+
+# Webpush
+/keys/webpush/
+/keys/
+
+# Keys
+*.pem

config/docker/initial_setup.sh

@@ -39,6 +39,9 @@ echo -e "${BLUE}${BOLD}Creating eighth period blocks...${CLEAR}"
 python3 create_blocks.py -l A B -c 60
 python3 create_blocks.py -l A B C -i 4 -c 15
 
+echo -e "${BLUE}${BOLD}Generating vapid keys...${CLEAR}"
+python3 create_vapid_keys.py
+
 echo -e "${BLUE}${BOLD}Cleaning up scripts...${CLEAR}"
 for file in config/scripts/*.py; do
     rm "$(basename "$file")"

config/scripts/create_vapid_keys.py

@@ -0,0 +1,25 @@
+import base64
+import os
+
+from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
+from py_vapid import Vapid
+
+PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+os.makedirs(os.path.join(PROJECT_ROOT, "keys", "webpush"))
+
+# Generate VAPID key pair
+vapid = Vapid()
+vapid.generate_keys()
+
+# Get public and private keys for the vapid key pair
+vapid.save_public_key(os.path.join(PROJECT_ROOT, "keys", "webpush", "public_key.pem"))
+public_key_bytes = vapid.public_key.public_bytes(Encoding.X962, PublicFormat.UncompressedPoint)
+
+vapid.save_key(os.path.join(PROJECT_ROOT, "keys", "webpush", "private_key.pem"))
+
+
+# Convert the public key to applicationServerKey format
+application_server_key = base64.urlsafe_b64encode(public_key_bytes).replace(b"=", b"").decode("utf8")
+
+with open(os.path.join(PROJECT_ROOT, "keys", "webpush", "ApplicationServerKey.key"), "w", encoding="utf-8") as f:
+    f.write(application_server_key)

cron/eighth-absence.sh

@@ -4,4 +4,5 @@
 timestamp=$(date +"%Y-%m-%d-%H%M")
 cd /usr/local/www/intranet3
 ./cron/env.sh ./manage.py absence_email --silent
-echo "Absence email sent at $timestamp." >> /var/log/ion/email.log
+./cron/env.sh ./manage.py absence_notify --silent
+echo "Absence email and push notification sent at $timestamp." >> /var/log/ion/email.log

docs/sourcedoc/intranet.apps.announcements.rst

@@ -76,6 +76,102 @@ intranet.apps.announcements.views module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.announcements.views\_BACKUP\_1087 module
+------------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_BACKUP_1087
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_BACKUP\_1114 module
+------------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_BACKUP_1114
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_BACKUP\_1972 module
+------------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_BACKUP_1972
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_BASE\_1087 module
+----------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_BASE_1087
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_BASE\_1114 module
+----------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_BASE_1114
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_BASE\_1972 module
+----------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_BASE_1972
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_LOCAL\_1087 module
+-----------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_LOCAL_1087
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_LOCAL\_1114 module
+-----------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_LOCAL_1114
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_LOCAL\_1972 module
+-----------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_LOCAL_1972
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_REMOTE\_1087 module
+------------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_REMOTE_1087
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_REMOTE\_1114 module
+------------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_REMOTE_1114
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.announcements.views\_REMOTE\_1972 module
+------------------------------------------------------
+
+.. automodule:: intranet.apps.announcements.views_REMOTE_1972
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/sourcedoc/intranet.apps.bus.rst

@@ -76,6 +76,14 @@ intranet.apps.bus.urls module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.bus.utils module
+------------------------------
+
+.. automodule:: intranet.apps.bus.utils
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.bus.views module
 ------------------------------
 

docs/sourcedoc/intranet.apps.eighth.management.commands.rst

@@ -12,6 +12,14 @@ intranet.apps.eighth.management.commands.absence\_email module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.eighth.management.commands.absence\_notify module
+---------------------------------------------------------------
+
+.. automodule:: intranet.apps.eighth.management.commands.absence_notify
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.eighth.management.commands.delete\_duplicate\_signups module
 --------------------------------------------------------------------------
 

docs/sourcedoc/intranet.apps.notifications.rst

@@ -4,6 +4,22 @@ intranet.apps.notifications package
 Submodules
 ----------
 
+intranet.apps.notifications.admin module
+----------------------------------------
+
+.. automodule:: intranet.apps.notifications.admin
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+intranet.apps.notifications.api module
+--------------------------------------
+
+.. automodule:: intranet.apps.notifications.api
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.notifications.emails module
 -----------------------------------------
 
@@ -12,6 +28,14 @@ intranet.apps.notifications.emails module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.notifications.forms module
+----------------------------------------
+
+.. automodule:: intranet.apps.notifications.forms
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.notifications.models module
 -----------------------------------------
 
@@ -20,6 +44,14 @@ intranet.apps.notifications.models module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.notifications.serializers module
+----------------------------------------------
+
+.. automodule:: intranet.apps.notifications.serializers
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.notifications.tasks module
 ----------------------------------------
 
@@ -28,6 +60,14 @@ intranet.apps.notifications.tasks module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.notifications.tests module
+----------------------------------------
+
+.. automodule:: intranet.apps.notifications.tests
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.notifications.urls module
 ---------------------------------------
 
@@ -36,6 +76,14 @@ intranet.apps.notifications.urls module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.notifications.utils module
+----------------------------------------
+
+.. automodule:: intranet.apps.notifications.utils
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.notifications.views module
 ----------------------------------------
 

docs/sourcedoc/intranet.apps.polls.rst

@@ -28,6 +28,14 @@ intranet.apps.polls.models module
    :undoc-members:
    :show-inheritance:
 
+intranet.apps.polls.notifications module
+----------------------------------------
+
+.. automodule:: intranet.apps.polls.notifications
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 intranet.apps.polls.tests module
 --------------------------------
 

intranet/apps/announcements/forms.py

@@ -23,7 +23,12 @@ class Meta:
         fields = ["title", "author", "content", "groups", "expiration_date", "notify_post", "notify_email_all", "update_added_date", "pinned"]
         help_texts = {
             "expiration_date": "By default, announcements expire after two weeks. Choose the shortest time necessary.",
-            "notify_post": "If this box is checked, students who have signed up for notifications will receive an email.",
+            "notify_post": (
+                "If this box is checked, students who have signed up for email "
+                "notifications will receive an email "
+                "and those who have signed up for push notifications will receive a "
+                "push notification."
+            ),
             "notify_email_all": (
                 "This will send an email notification to all of the users who can see this post. "
                 "This option does NOT take users' email notification preferences into account, so please use with care."
@@ -50,9 +55,12 @@ def __init__(self, user, *args, **kwargs):
         else:
             self.fields["activity"].queryset = []
         self.fields["activity"].required = True
-        self.fields[
-            "notify_post"
-        ].help_text = "If this box is checked, students who have subscribed to your club's announcements will receive an email."
+        self.fields["notify_post"].help_text = (
+            "If this box is checked, students who have signed up for email "
+            "notifications will receive an email "
+            "and those who have signed up for push notifications will receive a "
+            "push notification."
+        )
 
         if "instance" in kwargs:  # Don't allow changing the activity once the announcement has been created
             self.fields["activity"].widget.attrs["disabled"] = True
@@ -92,7 +100,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["expiration_date"].help_text = "By default, announcements expire after two weeks. Choose the shortest time necessary."
 
-        self.fields["notify_post_resend"].help_text = "If this box is checked, students who have signed up for notifications will receive an email."
+        self.fields["notify_post_resend"].help_text = (
+            "If this box is checked, students who have signed up for email "
+            "notifications will receive an email "
+            "and those who have signed up for push notifications will "
+            "receive a push notification."
+        )
 
         self.fields["notify_email_all_resend"].help_text = (
             "This will resend an email notification to all of the users who can see this post. This option "
@@ -153,7 +166,12 @@ class AnnouncementAdminForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["notify_post"].help_text = "If this box is checked, students who have signed up for notifications will receive an email."
+        self.fields["notify_post"].help_text = (
+            "If this box is checked, students who have signed up for email "
+            "notifications will receive an email "
+            "and those who have signed up for push notifications will receive a "
+            "push notification."
+        )
         self.fields["notify_email_all"].help_text = (
             "This will send an email notification to all of the users who can see this post. This option "
             "does NOT take users' email notification preferences into account, so please use with care."