misc: docker ci to automatically push new images and update to accountinfo, more accurately showing membership statuses and correct time zone

Author: vegardev

.github/workflows/docker.yaml

@@ -0,0 +1,28 @@
+name: Build and publish new Docker image
+on:
+  push:
+    branches: main
+
+jobs:
+  # Build and push the latest image
+  docker-publish:
+    name: "Docker build and push image"
+    runs-on: ubuntu-latest
+    steps:
+      - # Login to Docker Hub
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PAT }}
+
+      - # Docker Buildx
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - # Build and push latest image
+        name: Docker build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: ${{ secrets.USERNAME }}/ntnui-membership-bot:latest,${{ secrets.USERNAME }}/ntnui-membership-bot:${{ github.sha }}

commands/functionality/accountinfo.js

@@ -20,34 +20,72 @@ module.exports = {
 
     const valid = accountInfo.get("has_valid_group_membership");
 
-    const expiry_date = DateTime.fromISO(
-      accountInfo.get("ntnui_contract_expiry_date")
+    const expiryDate = DateTime.fromISO(
+      accountInfo.get("ntnui_contract_expiry_date"),
+      { setZone: true }
     )
       .setZone("Europe/Oslo")
-      .setLocale("en")
-      .toFormat("DDD");
+      .setLocale("en");
+    if (!expiryDate.isValid) {
+      return interaction.editReply({
+        content: `❌ There was an error processing your membership expiry date.`,
+        flags: MessageFlags.Ephemeral,
+      });
+    }
+
+    const ntnuiExpiryDate = expiryDate.toFormat("DDD");
 
-    const registry_date = DateTime.fromISO(accountInfo.get("createdAt"))
+    const registryDateTime = DateTime.fromISO(accountInfo.get("createdAt"), {
+      setZone: true,
+    })
       .setZone("Europe/Oslo")
-      .setLocale("en")
-      .toFormat("DDD', 'T");
+      .setLocale("en");
+
+    if (!registryDateTime.isValid) {
+      return interaction.editReply({
+        content: `❌ There was an error processing your membership registry date.`,
+        flags: MessageFlags.Ephemeral,
+      });
+    }
+
+    const registryDate = registryDateTime.toFormat("DDD', 'T");
 
-    const updateDateTime = DateTime.fromISO(accountInfo.get("updatedAt"))
+    const updateDateTime = DateTime.fromISO(accountInfo.get("updatedAt"), {
+      setZone: true,
+    })
       .setZone("Europe/Oslo")
       .setLocale("en");
 
-    const update_date = updateDateTime.toFormat("DDD', 'T");
+    if (!updateDateTime.isValid) {
+      return interaction.editReply({
+        content: `❌ There was an error processing your membership update date.`,
+        flags: MessageFlags.Ephemeral,
+      });
+    }
+
+    const updateDate = updateDateTime.toFormat("DDD', 'T");
     const timestamp = updateDateTime.toFormat("X");
 
-    if (!valid) {
+    const now = DateTime.now().setZone("Europe/Oslo");
+
+    if (expiryDate < now) {
+      // Both memberships expired (until NTNUI membership is renewed)
       return interaction.editReply({
-        content: `⌛ Your membership has expired.\n\n🕒 You registered at ${registry_date}.\n🔃 Updated at ${update_date} (${timestamp}).`,
+        content: `⌛ Your **${process.env.GROUP_NAME}** and **NTNUI** membership have expired.\n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
+        flags: MessageFlags.Ephemeral,
+      });
+    } else if (!valid) {
+      // Group membership expired
+      return interaction.editReply({
+        content: `⌛ Your **${process.env.GROUP_NAME}** membership has expired. Your **NTNUI** membership expires ${ntnuiExpiryDate}. \n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
+        flags: MessageFlags.Ephemeral,
+      });
+    } else {
+      // Both memberships in good standing
+      return interaction.editReply({
+        content: `✅ Your **${process.env.GROUP_NAME}** membership is in good standing!\n⏳ Your **NTNUI** membership expires ${ntnuiExpiryDate}\n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
         flags: MessageFlags.Ephemeral,
       });
     }
-    return interaction.editReply({
-      content: `⏳ Your membership expires ${expiry_date}\n\n🕒 You registered at ${registry_date}.\n🔃 Updated at ${update_date} (${timestamp}).`,
-      flags: MessageFlags.Ephemeral,
-    });
   },
 };

scheduler.js

@@ -10,6 +10,9 @@ function refreshSchedule(client) {
 
     const membershipMap = await fetchMemberships();
     // iterate over every membership in group
+    if (!membershipMap) {
+      return console.log("Schedule could not run, membershipMap is empty.");
+    }
     for (const membership of membershipMap.values()) {
       const currentRow = await Membership.findOne({
         ntnui_no: membership.ntnui_no,