Bug fixes

Author: Aayush-Agnihotri

src/coffeeChats/coffeeChatActions.ts

@@ -8,6 +8,7 @@ import {
   setTrioPairingPreference,
   getTrioPairingPreference,
 } from "./coffeeChatService";
+import { CoffeeChatPairingModel } from "./coffeeChatModels";
 
 export function registerCoffeeChatActions(slackbot: App) {
   // Action handler for opting out of coffee chats
@@ -126,9 +127,27 @@ export function registerCoffeeChatActions(slackbot: App) {
       await ack();
 
       try {
+        const userId = body.user.id;
         const action = body.actions[0];
         const pairingId = ("value" in action ? action.value : "") as string;
 
+        // Verify the user clicking the button is actually part of this pairing
+        const pairing = await CoffeeChatPairingModel.findById(pairingId);
+        if (!pairing) {
+          await respond({
+            text: `❌ Pairing not found.`,
+            replace_original: false,
+          });
+          return;
+        }
+        if (!pairing.userIds.includes(userId)) {
+          await respond({
+            text: `❌ You can only confirm meetups that you are part of.`,
+            replace_original: false,
+          });
+          return;
+        }
+
         await confirmMeetup(pairingId);
 
         const confirmationSections: KnownBlock[] = [

src/coffeeChats/coffeeChatCommands.ts

@@ -18,11 +18,10 @@ import { DEFAULT_PAIRING_FREQUENCY_DAYS } from "../app";
 const isUserAdmin = async (slackbot: App, userId: string): Promise<boolean> => {
   try {
     const userInfo = await slackbot.client.users.info({ user: userId });
-    return (
+    return !!(
       userInfo.user?.is_admin ||
       userInfo.user?.is_owner ||
-      userInfo.user?.is_primary_owner ||
-      false
+      userInfo.user?.is_primary_owner
     );
   } catch {
     return false;

src/coffeeChats/coffeeChatService.ts

@@ -82,17 +82,28 @@ const getRandomActivity = (): string => {
 export const getChannelMembers = async (
   channelId: string,
 ): Promise<string[]> => {
-  const result = await slackbot.client.conversations.members({
-    channel: channelId,
-  });
+  const allMemberIds: string[] = [];
+  let cursor: string | undefined = undefined;
+
+  // Paginate through all members using Slack's cursor-based pagination
+  do {
+    const result = await slackbot.client.conversations.members({
+      channel: channelId,
+      limit: 200,
+      ...(cursor ? { cursor } : {}),
+    });
 
-  if (!result.ok || !result.members) {
-    throw new Error(`Failed to get members for channel ${channelId}`);
-  }
+    if (!result.ok || !result.members) {
+      throw new Error(`Failed to get members for channel ${channelId}`);
+    }
+
+    allMemberIds.push(...result.members);
+    cursor = result.response_metadata?.next_cursor || undefined;
+  } while (cursor);
 
   // Filter out bots
   const memberDetails = await Promise.all(
-    result.members.map(async (userId) => {
+    allMemberIds.map(async (userId) => {
       const userInfo = await slackbot.client.users.info({ user: userId });
       return {
         id: userId,
@@ -481,6 +492,8 @@ export const createCoffeeChatsForChannel = async (
       logWithTime(
         `Not enough members in ${config.channelName} for coffee chats (need at least 2)`,
       );
+      // Still clear skip flags so users who skipped this round aren't permanently excluded
+      await clearSkipFlags(config.channelId);
       return;
     }
 

tests/coffeeChats/coffeeChatService.test.ts

@@ -989,8 +989,7 @@ describe("coffeeChatService", () => {
 
       const commandsBlock = blocks.find(
         (b) =>
-          b.type === "section" &&
-          b.text?.text.includes("Available Commands"),
+          b.type === "section" && b.text?.text.includes("Available Commands"),
       );
       expect(commandsBlock).toBeDefined();
       expect(commandsBlock?.text?.text).toContain("/coffee-chat-status");