From 764f90577eeadd653f3f6248fbf2b0918c97a3d5 Mon Sep 17 00:00:00 2001
From: "Alex Pooley (@zuedev)" <zuedev@gmail.com>
Date: Tue, 21 Jul 2026 17:01:54 +0100
Subject: fix oncall w/ pocketbase controller

---
 174bg/discord-bot/commands/oncall-check.js |  7 ++++---
 174bg/discord-bot/commands/pocketbase.js   | 17 ++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to '174bg/discord-bot/commands')

diff --git a/174bg/discord-bot/commands/oncall-check.js b/174bg/discord-bot/commands/oncall-check.js
index 7af986a..7a3886d 100644
--- a/174bg/discord-bot/commands/oncall-check.js
+++ b/174bg/discord-bot/commands/oncall-check.js
@@ -1,5 +1,5 @@
 import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js";
-import PocketBase from "pocketbase";
+import { login } from "../controllers/pocketbase.js";
 
 export default {
   data: new SlashCommandBuilder()
@@ -12,8 +12,7 @@ export default {
     const dateUTCMinutes = date.getUTCMinutes();
     const dateUTCDay = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][date.getUTCDay()];
 
-    const pb = new PocketBase(process.env.POCKETBASE_URL);
-    pb.authStore.save(process.env.POCKETBASE_AUTH_TOKEN, null);
+    const pb = await login();
 
     const members = await pb.collection("members").getFullList();
 
@@ -32,6 +31,8 @@ export default {
             const endHours = end.split(":")[0];
             const endMinutes = end.split(":")[1];
 
+            console.log(`Checking on-call schedule for member ${member.name}: ${start} - ${end} (UTC)`);
+
             if ((dateUTCHours > startHours || (dateUTCHours === startHours && dateUTCMinutes >= startMinutes)) && (dateUTCHours < endHours || (dateUTCHours === endHours && dateUTCMinutes <= endMinutes))) {
               membersOnCall.push(member);
             }
diff --git a/174bg/discord-bot/commands/pocketbase.js b/174bg/discord-bot/commands/pocketbase.js
index e223ec4..5724568 100644
--- a/174bg/discord-bot/commands/pocketbase.js
+++ b/174bg/discord-bot/commands/pocketbase.js
@@ -1,5 +1,5 @@
 import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js";
-import PocketBase from "pocketbase";
+import { login } from "../controllers/pocketbase.js";
 import uex from "../.cache/uex.json" with { type: "json" };
 
 export default {
@@ -70,8 +70,7 @@ export default {
 };
 
 async function populateUexItems(interaction) {
-  const pb = new PocketBase(process.env.POCKETBASE_URL);
-  pb.authStore.save(process.env.POCKETBASE_AUTH_TOKEN, null);
+  const pb = await login();
 
   const items = uex.items ?? [];
 
@@ -131,8 +130,7 @@ async function populateUexItems(interaction) {
 }
 
 async function populateUexSpaceStations(interaction) {
-  const pb = new PocketBase(process.env.POCKETBASE_URL);
-  pb.authStore.save(process.env.POCKETBASE_AUTH_TOKEN, null);
+  const pb = await login();
 
   const stations = uex.space_stations ?? [];
 
@@ -192,8 +190,7 @@ async function populateUexSpaceStations(interaction) {
 }
 
 async function populateUexPointsOfInterest(interaction) {
-  const pb = new PocketBase(process.env.POCKETBASE_URL);
-  pb.authStore.save(process.env.POCKETBASE_AUTH_TOKEN, null);
+  const pb = await login();
 
   const pointsOfInterest = uex.points_of_interest ?? [];
 
@@ -248,8 +245,7 @@ async function populateUexPointsOfInterest(interaction) {
 }
 
 async function populateInventoryLocations(interaction) {
-  const pb = new PocketBase(process.env.POCKETBASE_URL);
-  pb.authStore.save(process.env.POCKETBASE_AUTH_TOKEN, null);
+  const pb = await login();
 
   const stations = uex.space_stations ?? [];
   const pointsOfInterest = uex.points_of_interest ?? [];
@@ -340,8 +336,7 @@ async function populateInventoryLocations(interaction) {
 }
 
 async function populateUexVehicles(interaction) {
-  const pb = new PocketBase(process.env.POCKETBASE_URL);
-  pb.authStore.save(process.env.POCKETBASE_AUTH_TOKEN, null);
+  const pb = await login();
 
   const vehicles = uex.vehicles ?? [];
 
-- 
cgit v1.2.3