Fixes from upgrade (#228)

ebm5025 · Ed Morgan · web-flow · commit 763e84896f45 · 2026-03-28T22:21:25.000-04:00
* Reload private bot sheet data on timer (#224) * Use member cache instead of full fetch (#225) * Fixes from upgrade - auc names, perm checks, data refreshing --------- Co-authored-by: Ed Morgan <edwardmorgan706@gmail.com>
diff --git a/src/db/invite-simple.ts b/src/db/invite-simple.ts
@@ -5,6 +5,7 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { Members } from "../features/invite-list/update-invite-action";
+import { GuildMember } from "discord.js";
 
 @Entity({})
 export class InviteSimple {
@@ -28,12 +29,12 @@ export class InviteSimple {
     return score;
   }
 
-  public getDiscordDisplayName(members: Members) {
-    const member = members?.get(this.discordId);
+  public getDiscordDisplayName(members: GuildMember[]) {
+    const member = members?.find(m => m.id === this.discordId);
     return member ? `**${member.displayName}** (<@${member.id}>)` : `**Left the server** (<@${this.discordId}>)`;
   }
 
-  public getRichLabel(members: Members) {
+  public getRichLabel(members: GuildMember[]) {
     const displayName = this.getDiscordDisplayName(members);
     return `${this.altNote}${displayName} <t:${this.time}:R>`;
   }
diff --git a/src/features/bank-hours/remove-subcommand.ts b/src/features/bank-hours/remove-subcommand.ts
@@ -9,6 +9,7 @@ import { updateBankRequestInfo } from "../bank-request-info/update-action";
 import { BankHour } from "../../db/bank-hour";
 import { Subcommand } from "../../shared/command/subcommand";
 import { requireInteractionMemberRole } from "../../shared/command/util";
+import { getMember } from "../..";
 
 enum Option {
   BankHourID = "hourid",
@@ -63,7 +64,7 @@ class Remove extends Subcommand {
     const weeklyBankAvailabilities = dataSource.getRepository(BankHour);
     const bankHour = await weeklyBankAvailabilities.findBy({});
     await Promise.all(
-      bankHour.map(async (h) => interaction.guild?.members.fetch(h.userId))
+      bankHour.map(async (h) => getMember(h.userId))
     );
     return bankHour?.map((h) => ({
       name: `${
diff --git a/src/features/bp/request-bot-button-command.ts b/src/features/bp/request-bot-button-command.ts
@@ -13,6 +13,7 @@ import { knightRoleId, raiderRoleId } from "../../config";
 import { getClassAbreviation } from "../../shared/classes";
 import { PublicAccountsFactory } from "../../services/bot/bot-factory";
 import { log } from "../../shared/logger";
+import { getMember } from "../..";
 
 export class RequestBotButtonCommand extends ButtonCommand {
   constructor(name: string) {
@@ -30,7 +31,7 @@ export class RequestBotButtonCommand extends ButtonCommand {
 
     const name = interaction.customId.split("_")[1];
     try {
-      const guildUser = await interaction.guild?.members.fetch(
+      const guildUser = await getMember(
         interaction.user.id
       );
       log(
diff --git a/src/features/invite-list/cleanup-invites-command.ts b/src/features/invite-list/cleanup-invites-command.ts
@@ -6,6 +6,7 @@ import { InviteSimple } from "../../db/invite-simple";
 import { ButtonCommand } from "../../shared/command/button-command";
 import { requireInteractionMemberPermission } from "../../shared/command/util";
 import { updateInviteListInfo } from "./update-invite-action";
+import { getMembers } from "../..";
 
 const SECONDS = 1000;
 const MINUTES = 60 * SECONDS;
@@ -29,7 +30,7 @@ class CleanupInvitesCommand extends ButtonCommand {
 
     const [altInvites, mainInvites] = partition(oldInvites, (o) => o.alt);
 
-    await interaction.guild?.members.fetch();
+    await getMembers();
     await this.removeMains(mainInvites, interaction);
     await this.removeAlts(altInvites, interaction);
     const removed = await this.removeFromInviteList(oldInvites);
diff --git a/src/features/invite-list/ping-invite-list-button-command.ts b/src/features/invite-list/ping-invite-list-button-command.ts
@@ -5,7 +5,7 @@ import {
   PermissionFlagsBits,
   Permissions,
 } from "discord.js";
-import { getGuild } from "../..";
+import { getGuild, getMember } from "../..";
 import { inviteListChannelId } from "../../config";
 import { dataSource } from "../../db/data-source";
 import { InviteSimple } from "../../db/invite-simple";
@@ -37,10 +37,10 @@ export const getAttentionMessage = async (users: string[]) => {
   const guild = await getGuild();
   const statuses = await Promise.all(
     users.map(async (user) => {
-      const { presence } = await guild.members.fetch({
+      const { presence } = await getMember(
         user,
-        withPresences: true,
-      });
+        true
+      );
       return {
         user,
         status: getPresenceIcon(presence?.status),
diff --git a/src/features/invite-list/update-invite-action.ts b/src/features/invite-list/update-invite-action.ts
@@ -117,7 +117,7 @@ Please post your best availability in this channel (including time zone) and we
     );
   }
 
-  private async getInviteEmbed(members: Members) {
+  private async getInviteEmbed(members: GuildMember[]) {
     const needInvite = await dataSource.getRepository(InviteSimple).findBy({});
     return new EmbedBuilder({
       title: `Need Invite (${needInvite.length})`,
diff --git a/src/features/raid-bots/park-bot-button-command.ts b/src/features/raid-bots/park-bot-button-command.ts
@@ -12,6 +12,7 @@ import {
   import { PublicAccountsFactory } from "../../services/bot/bot-factory";
   import { BOT_SPREADSHEET_COLUMNS } from "../../services/sheet-updater/public-sheet";
   import { log } from "../../shared/logger";
+import { getMember } from "../..";
   
   export class ParkBotButtonCommand extends ButtonCommand {
     constructor(name: string) {
@@ -27,7 +28,7 @@ import {
       });
   
       const name = interaction.customId.split("_")[1];
-      const guildUser = await interaction.guild?.members.fetch(
+      const guildUser = await getMember(
         interaction.user.id
       );
       log(`${guildUser?.nickname || guildUser?.user.username} clicked bot park button for ${name}`);
diff --git a/src/features/raid-bots/park-subcommand.ts b/src/features/raid-bots/park-subcommand.ts
@@ -5,6 +5,7 @@ import { LocationService } from "../../services/location";
 import { PublicAccountsFactory } from "../../services/bot/bot-factory";
 import { BOT_SPREADSHEET_COLUMNS } from "../../services/sheet-updater/public-sheet";
 import { log } from "../../shared/logger"
+import { getMember } from "../..";
 
 export enum Option {
   Name = "name",
@@ -45,7 +46,7 @@ export class ParkSubcommand extends Subcommand {
           `${name} was released in its previous location`
         );
       }
-      const guildUser = await interaction.guild?.members.fetch(
+      const guildUser = await getMember(
         interaction.user.id
       );
       log(
diff --git a/src/features/raid-bots/requestclass-subcommand.ts b/src/features/raid-bots/requestclass-subcommand.ts
@@ -15,6 +15,7 @@ import { LocationService } from "../../services/location";
 import { PublicAccountsFactory } from "../../services/bot/bot-factory";
 import { BOT_SPREADSHEET_COLUMNS } from "../../services/sheet-updater/public-sheet";
 import { log } from "../../shared/logger";
+import { getMember } from "../..";
 
 
 export enum Option {
@@ -48,7 +49,7 @@ export class RequestClassSubcommand extends Subcommand {
     const release = await this.mutex.acquire();
     const publicAccounts = PublicAccountsFactory.getService();
 
-    const guildUser = await interaction.guild?.members.fetch(
+    const guildUser = await getMember(
       interaction.user.id
     );
 
diff --git a/src/features/raid-bots/requestzone-subcommand.ts b/src/features/raid-bots/requestzone-subcommand.ts
@@ -15,6 +15,7 @@ import { LocationService } from "../../services/location";
 import { PublicAccountsFactory } from "../../services/bot/bot-factory";
 import { BOT_SPREADSHEET_COLUMNS } from "../../services/sheet-updater/public-sheet";
 import { log } from "../../shared/logger";
+import { getMember } from "../..";
 
 export enum Option {
   Location = "location",
@@ -40,7 +41,7 @@ export class RequestZoneSubcommand extends Subcommand {
     const release = await this.mutex.acquire();
     const publicAccounts = PublicAccountsFactory.getService();
 
-    const guildUser = await interaction.guild?.members.fetch(
+    const guildUser = await getMember(
       interaction.user.id
     );
 
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import { ChannelType, Client, GatewayIntentBits, Partials } from "discord.js";
+import { ChannelType, Client, Events, FetchMemberOptions, GatewayIntentBits, Guild, Partials } from "discord.js";
 import { interactionCreateListener } from "./listeners/interaction-create-listener";
 import { guildId, token } from "./config";
 import { readyListener } from "./listeners/ready-listener";
@@ -19,6 +19,8 @@ import "reflect-metadata";
 import { PrismaClient } from "@prisma/client";
 import { log } from "./shared/logger";
 import { openDkpService } from "./services/openDkpService";
+import { accounts } from "./services/accounts";
+import { MINUTES } from "./shared/time";
 
 // Global
 https.globalAgent.maxSockets = 5;
@@ -37,15 +39,6 @@ export const client = new Client({
   partials: [Partials.Message, Partials.Reaction],
 });
 
-export const getGuild = async () => {
-  const guilds = await client.guilds.fetch();
-  const guild = await guilds.get(guildId)?.fetch();
-  if (!guild) {
-    throw new Error("Could not collect guild members");
-  }
-  return guild;
-};
-
 export const getChannel = async (channelId: string) => {
   const guild = await getGuild();
   const channel = await guild.channels.fetch(channelId);
@@ -63,9 +56,34 @@ export const getTextChannel = async (channelId: string) => {
   return channel;
 };
 
+let cachedGuild: Guild | null = null;
+
+export const getGuild = async (): Promise<Guild> => {
+  if (cachedGuild) return cachedGuild;
+  const guilds = await client.guilds.fetch();
+  const guild = await guilds.get(guildId)?.fetch();
+  if (!guild) throw new Error("Could not fetch guild");
+  cachedGuild = guild;
+  return guild;
+};
+
 export const getMembers = async () => {
   const guild = await getGuild();
-  return await guild.members.fetch();
+  if (guild.members.cache.size < guild.memberCount) {
+    await guild.members.fetch();
+  }
+  return [...guild.members.cache.values()];
+};
+
+export const getMember = async (userId: string, withPresences = false) => {
+  const guild = await getGuild();
+  
+  const cached = guild.members.cache.get(userId);
+  if (cached && (!withPresences || cached.presence !== null)) {
+    return cached;
+  }
+
+  return guild.members.fetch({ user: userId, withPresences });
 };
 
 export const getRoles = async () => {
@@ -81,14 +99,14 @@ client.login(token);
 client.on("interactionCreate", interactionCreateListener);
 client.on("messageReactionAdd", messageReactionAddListener);
 client.on("messageCreate", messageCreateListener);
-client.on("ready", readyListener);
 client.on("guildMemberAdd", guildMemberAddListener);
 client.on("guildMemberRemove", guildMemberLeaveListener);
 client.on("guildMemberUpdate", guildMemberUpdateListener);
 client.on("guildScheduledEventCreate", guildScheduledEventListener);
 client.on("guildScheduledEventDelete", guildScheduledEventListener);
 client.on("guildScheduledEventUpdate", guildScheduledEventListener);
 client.on("guildScheduledEventUpdate", guildScheduledEventStartedListener);
+client.on(Events.ClientReady, readyListener);
 
 registerSlashCommands();
 
@@ -99,7 +117,7 @@ prismaClient.$connect();
 
 openDkpService.authenticate();
 setInterval(() => {
-  console.log("Reauthenticating with OpenDKP (token refresh)");
+  log("Reauthenticating with OpenDKP (token refresh)");
   openDkpService.authenticate();
 }, 1500000);
 
diff --git a/src/listeners/ready-listener.ts b/src/listeners/ready-listener.ts
@@ -12,6 +12,8 @@ import {
 } from "../features/raid-bots/update-bots";
 import { HOURS } from "../shared/time";
 import { updateBotEmbed } from "../features/raid-bots/bot-embed";
+import { getGuild } from "..";
+import { readyActionExecutor } from "../shared/action/ready-action-2";
 
 export const updateOptions = { repeatDuration: 1 * HOURS };
 
@@ -27,5 +29,9 @@ export const readyListener = async (client: Client) => {
     updateRaiderInfo(client, updateOptions),
     updateReinforcementInfo(client, updateOptions),
     updateBotEmbed({ repeatDuration: 30000 }),
+    readyActionExecutor(async () => {
+        const guild = await getGuild();
+        await guild.members.fetch(); // warm the cache once
+    }, {repeatDuration: 0})
   ];
 };
diff --git a/src/services/accounts.ts b/src/services/accounts.ts
@@ -20,6 +20,7 @@ import { checkGoogleCredentials } from "./gdrive";
 import moment from "moment";
 import { getClassAbreviation } from "../shared/classes";
 import { log } from "../shared/logger"
+import { Mutex } from "async-mutex";
 
 enum SPREADSHEET_COLUMNS {
   Characters = "Characters",
@@ -74,7 +75,7 @@ interface Account {
 
 const cache = new LRUCache<string, Account>({
   max: 400,
-  ttl: 30 * MINUTES,
+  ttl: 9 * MINUTES,
 });
 
 const authorize = async (sheet: GoogleSpreadsheet) => {
@@ -85,37 +86,45 @@ const authorize = async (sheet: GoogleSpreadsheet) => {
   });
 };
 
+const accountMutex = new Mutex();
+
 const getAccounts = async () => {
-  cache.purgeStale();
-  if (cache.size) {
-    return cache;
-  }
-  log(`Loading bots - cache stale`);
-  const start = moment.now();
-  await authorize(sheet);
-  await sheet.loadInfo();
-  const rows = await sheet.sheetsByIndex[0].getRows();
-  rows.forEach((r) => {
-    const a: Account = {
-      characters: r[SPREADSHEET_COLUMNS.Characters],
-      class: getClassAbreviation(r[SPREADSHEET_COLUMNS.Class])
-        ? getClassAbreviation(r[SPREADSHEET_COLUMNS.Class])
-        : r[SPREADSHEET_COLUMNS.Class],
-      purpose: r[SPREADSHEET_COLUMNS.Purpose],
-      accountName: r[SPREADSHEET_COLUMNS.Account],
-      password: r[SPREADSHEET_COLUMNS.Password],
-      requiredRoles: getRequiredRoles(r),
-    };
-    if (a.characters && a.accountName && a.password) {
-      cache.set(a.characters.toLowerCase(), a);
+  return accountMutex.runExclusive(async () => {
+    cache.purgeStale();
+    if (cache.size) {
+      return cache;
     }
-  });
-  const end = moment.now();
-  log(`Took ${end - start}ms to load bot data`);
-  return cache;
+    await accounts.refreshAccountData();
+    return cache;
+  })
 };
 
 export const accounts = {
+  refreshAccountData: async () => {
+    log(`Reloading private bot data`);
+    const start = moment.now();
+    await authorize(sheet);
+    await sheet.loadInfo();
+    const rows = await sheet.sheetsByIndex[0].getRows();
+    rows.forEach((r) => {
+      const a: Account = {
+        characters: r[SPREADSHEET_COLUMNS.Characters],
+        class: getClassAbreviation(r[SPREADSHEET_COLUMNS.Class])
+          ? getClassAbreviation(r[SPREADSHEET_COLUMNS.Class])
+          : r[SPREADSHEET_COLUMNS.Class],
+        purpose: r[SPREADSHEET_COLUMNS.Purpose],
+        accountName: r[SPREADSHEET_COLUMNS.Account],
+        password: r[SPREADSHEET_COLUMNS.Password],
+        requiredRoles: getRequiredRoles(r),
+      };
+      if (a.characters && a.accountName && a.password) {
+        cache.set(a.characters.toLowerCase(), a);
+      }
+    });
+    const end = moment.now();
+    log(`Took ${end - start}ms to refresh bot data (${cache.size} bots)`);
+
+  },
   getAccountsForRole: async (roleId: string): Promise<Account[]> => {
     const accounts = await getAccounts();
     return [...accounts.values()].filter((c) =>
@@ -155,7 +164,7 @@ export const accounts = {
     if (!d) {
       d = accounts.find((a) => a.characters.includes(toSentenceCase(name)));
       if (!d) {
-        throw new Error(`${name} is not a shared account`);
+        throw new Error(`${name} was not found in the private bot sheet (account details).`);
       }
     }
     const hasRole = some(
diff --git a/src/services/bot/bot-prisma.ts b/src/services/bot/bot-prisma.ts
diff --git a/src/services/openDkpService.ts b/src/services/openDkpService.ts
diff --git a/src/shared/command/util.ts b/src/shared/command/util.ts
diff --git a/src/shared/logger.ts b/src/shared/logger.ts
diff --git a/src/shared/thread/thread-builder.ts b/src/shared/thread/thread-builder.ts

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ Please post your best availability in this channel (including time zone) and we`
`117`	`117`	`);`
`118`	`118`	`}`
`119`	`119`
`120`		`- private async getInviteEmbed(members: Members) {`
	`120`	`+ private async getInviteEmbed(members: GuildMember[]) {`
`121`	`121`	`const needInvite = await dataSource.getRepository(InviteSimple).findBy({});`
`122`	`122`	`return new EmbedBuilder({`
`123`	`123`	title: `Need Invite (${needInvite.length})`,