Add files via upload

Author: saltuchia-ux

src/events/guildCreate.js

@@ -1,6 +1,7 @@
 import { Events } from 'discord.js';
 import { logger } from '../utils/logger.js';
 import { getGuildConfig, setGuildConfig } from '../services/config/guildConfig.js';
+import { isGuildUnlocked, sendKeyPrompt } from '../services/accessKeyService.js';
 
 export default {
   name: Events.GuildCreate,
@@ -15,6 +16,11 @@ export default {
 
       const config = await getGuildConfig(client, guild.id);
       await setGuildConfig(client, guild.id, config);
+
+      // New servers start locked: ask for the key
+      if (!(await isGuildUnlocked(client, guild.id))) {
+        await sendKeyPrompt(client, guild);
+      }
     } catch (error) {
       logger.error(`Error initializing guild ${guild?.id} on join:`, error);
     }

src/events/guildDelete.js

@@ -0,0 +1,19 @@
+import { Events } from 'discord.js';
+import { logger } from '../utils/logger.js';
+import { lockGuild } from '../services/accessKeyService.js';
+
+export default {
+  name: Events.GuildDelete,
+  async execute(guild, client) {
+    // A server outage is not a removal
+    if (guild?.available === false) return;
+
+    try {
+      // Pepper was removed: the next time it is added, it asks for the key again.
+      await lockGuild(client, guild.id);
+      logger.info('Bot left guild, access key reset', { event: 'guild.delete', guildId: guild.id });
+    } catch (error) {
+      logger.error(`Error resetting access key for guild ${guild?.id}:`, error);
+    }
+  },
+};

src/events/interactionCreate.js

@@ -19,6 +19,7 @@ import { resolveSlashAccessKey } from '../utils/messageAdapter.js';
 import { isCollectorManagedComponent } from '../utils/collectorComponents.js';
 import { ResponseCoordinator } from '../utils/responseCoordinator.js';
 import { enforceDefaultCommandPermissions } from '../utils/permissionGuard.js';
+import { handleAccessInteraction } from '../services/accessKeyService.js';
 
 const COMMAND_ERROR_SUBTYPES = {
   warn: 'warn_failed',
@@ -55,6 +56,11 @@ export default {
 
     return runWithTraceContext(interactionTraceContext, async () => {
       try {
+        // Access key: handles the Enter Key button/modal and blocks everything else in locked servers
+        if (await handleAccessInteraction(interaction, client)) {
+          return;
+        }
+
         InteractionHelper.patchInteractionResponses(interaction);
         ResponseCoordinator.attach(interaction);
 

src/events/ready.js

@@ -10,6 +10,7 @@ import { startTempBanChecker } from "../services/tempBanService.js";
 import { syncAllRoleLinks } from "../services/roleLinkService.js";
 import { ensureAllTicketPanels } from "../services/ticketHubService.js";
 import { syncAllStatusRoles } from "../services/statusRoleService.js";
+import { purgeStaleGuilds, promptLockedGuilds } from "../services/accessKeyService.js";
 
 export default {
   name: Events.ClientReady,
@@ -23,6 +24,14 @@ export default {
       startupLog(`Serving ${client.guilds.cache.size} guild(s)`);
       startupLog(`Loaded ${client.commands.size} commands`);
 
+      // Access key: forget servers Pepper left while offline, then ask locked servers for the key
+      try {
+        await purgeStaleGuilds(client);
+        await promptLockedGuilds(client);
+      } catch (error) {
+        logger.error('Access key startup check failed:', error);
+      }
+
       // Give linked roles to people who already have the trigger role (runs in the background)
       syncAllRoleLinks(client).catch((error) => logger.error('Role link startup sync failed:', error));