Merge pull request #17 from lladawn/dev

Add /mumbl join for one-step team room joins from Slack

Author: lladawn

app/api/slack/commands/route.js

@@ -32,10 +32,12 @@ export async function POST(request) {
     const triggerId = cleanString(form.get("trigger_id"), 200);
     const roomName = parseRoomCommand(text);
     const pinSlug = parsePinCommand(text);
+    const joinSlug = parseJoinCommand(text);
 
     if (!teamId || !slackUserId) return ok(ephemeralText("couldn't tell which Slack workspace this came from."));
     if (!text || text.toLowerCase() === "help") return ok(slackHelpPayload());
     if (pinSlug !== null && !pinSlug) return ok(ephemeralText("try `/mumbl pin` followed by the room invite link."));
+    if (joinSlug !== null && !joinSlug) return ok(ephemeralText("try `/mumbl join` followed by the room invite link your teammate shared."));
     if (roomName !== null && !roomName) {
       after(async () => {
         try {
@@ -54,9 +56,11 @@ export async function POST(request) {
             ? await startRoomFromSlack({ teamId, slackUserId, name: roomName })
             : pinSlug !== null
               ? await pinSpaceFromSlack({ teamId, slackUserId, slug: pinSlug })
+            : joinSlug !== null
+              ? await joinSpaceFromSlack({ teamId, slackUserId, slug: joinSlug })
             : await saveOrConnect({ teamId, slackUserId, content: text, sourceMeta: { trigger: "slash_command" } });
         await postSlackResponse(responseUrl, result);
-        if (roomName !== null || pinSlug !== null) {
+        if (roomName !== null || pinSlug !== null || joinSlug !== null) {
           try {
             await publishSlackAppHome({ teamId, slackUserId });
           } catch (error) {
@@ -91,6 +95,29 @@ function parsePinCommand(text) {
   return null;
 }
 
+function parseJoinCommand(text) {
+  const trimmed = cleanString(text, 4000);
+  const lower = trimmed.toLowerCase();
+  if (lower === "join") return "";
+  if (lower.startsWith("join ")) return cleanString(trimmed.slice(5), 2000);
+  return null;
+}
+
+// Accept the `<room-name> <key>` two-token form (what we tell teams to share) and
+// normalize it into the slug-or-URL string findSpaceForSlackPin already understands.
+// A pasted full invite URL still works for backwards compatibility.
+function joinArgsToLookup(args) {
+  const raw = cleanString(args, 2000) || "";
+  if (/\/r\/|https?:/i.test(raw)) return raw;
+  const parts = raw.split(/\s+/).filter(Boolean);
+  const slug = parts[0] || "";
+  const key = parts[1] || "";
+  if (!slug) return "";
+  // Slack may wrap a pasted slug in <...>; strip stray angle brackets.
+  const cleanSlug = slug.replace(/[<>]/g, "");
+  return key ? `/r/${cleanSlug}?key=${key}` : cleanSlug;
+}
+
 async function startRoomFromSlack({ teamId, slackUserId, name }) {
   return createSlackStartedSpacePayload({ teamId, slackUserId, name });
 }
@@ -103,6 +130,15 @@ async function pinSpaceFromSlack({ teamId, slackUserId, slug }) {
   return ephemeralText(`${space.name} ${alreadyPinned ? "was already pinned" : "is pinned"} for team reads.${channelText}`);
 }
 
+async function joinSpaceFromSlack({ teamId, slackUserId, slug }) {
+  const lookup = joinArgsToLookup(slug);
+  const { space, channelJoin } = await pinSlackSpaceBySlug({ teamId, slackUserId, slug: lookup });
+  const channel = channelJoin?.channelName ? `#${channelJoin.channelName}` : "the team reads channel";
+  return channelJoin?.joined
+    ? ephemeralText(`you're in 🎉 — ${space.name} reads will land in ${channel}, and the room is pinned in your mumbl App Home.`)
+    : ephemeralText(`pinned ${space.name} for you. ask whoever set up the room to add you to ${channel} if you don't see it yet.`);
+}
+
 async function saveOrConnect({ teamId, slackUserId, content, sourceMeta }) {
   const existingConnection = await findSlackConnection({ teamId, slackUserId });
   if (existingConnection) {

docs/slack-app-setup.md

@@ -108,13 +108,14 @@ Create a slash command:
 - Command: `/mumbl`
 - Request URL: `https://mumbl.wtf/api/slack/commands`
 - Short description: `Save a private thought to Mumbl`
-- Usage hint: `[thought]`, `room [team name]`, or `pin [space-slug]`
+- Usage hint: `[thought]`, `room [team name]`, `join [room-name] [key]`, or `pin [invite-link]`
 
 Expected behavior:
 
 - `/mumbl something I want to keep` saves a private dump.
 - `/mumbl room platform team` creates a Mumbl room.
 - `/mumbl start platform team` is an alias.
+- `/mumbl join <room-name> <key>` is how teammates join in one step: it best-effort joins the room's private Slack reads channel and pins the room in that user's App Home. The two-token form (room slug + read key as separate words) is used instead of a pasted URL because Slack auto-linkifies URLs and crops the `key=`. Private rooms require the key because the join is access-gated by the room read token; it reuses the same lookup path as `pin` (a full invite URL is still accepted for backwards compatibility).
 - `/mumbl pin platform-team` pins an existing Mumbl room and best-effort joins the room's Slack reads channel if it exists.
 - Unpinning from App Home removes only that user's publish shortcut and best-effort removes them from the linked Slack reads channel if one exists.
 

src/server/slack.js

@@ -1332,6 +1332,24 @@ function slackRoomReadsUrl(space, accessToken = "") {
   return `${appUrl}${roomInvitePath(slug, token)}`;
 }
 
+// Build the copy-pasteable `/mumbl join <slug> <key>` command from a room invite URL.
+// Two plain tokens (not a URL) so Slack never linkifies and crops the room key.
+export function slackJoinCommand(roomUrl) {
+  const raw = cleanString(roomUrl, 2000) || "";
+  const slug = raw.match(/\/r\/([^/?#]+)/)?.[1] || "";
+  let key = "";
+  const keyMatch = raw.match(/[?&]key=([^&]+)/);
+  if (keyMatch) {
+    try {
+      key = decodeURIComponent(keyMatch[1]);
+    } catch {
+      key = keyMatch[1];
+    }
+  }
+  if (!slug) return "/mumbl join";
+  return key ? `/mumbl join ${slug} ${key}` : `/mumbl join ${slug}`;
+}
+
 async function pinSlackSpace({ connection, spaceId }) {
   const supabase = getSupabaseAdmin();
   const { data: existingPins, error: existingError } = await supabase
@@ -1549,7 +1567,7 @@ export function slackHelpPayload() {
   return blockResponse({
     text: "use /mumbl to save a private thought or create a room.",
     blocks: [
-      section("*mumbl in Slack*\n`/mumbl the thing I want to keep` saves a private dump.\n`/mumbl room platform team` creates a Mumbl room from Slack.\n`/mumbl pin <invite-link>` pins a room to your Slack publish list."),
+      section("*mumbl in Slack*\n`/mumbl the thing I want to keep` saves a private dump.\n`/mumbl room platform team` creates a Mumbl room from Slack.\n`/mumbl join <room-name> <key>` joins your team's room — reads land in Slack and the room pins in your App Home.\n`/mumbl pin <invite-link>` pins a room to your Slack publish list."),
       context("Private dumps stay private. Team reads only post to Slack if you enable them."),
     ],
   });
@@ -1579,9 +1597,9 @@ export function slackRoomCreatedPayload({ space, openUrl, roomUrl, teamReadsUrl,
         { text: "share with team", actionId: "share_room_invite", value: JSON.stringify({ roomUrl, spaceName: space.name }) },
       ]),
       context(
-        pinned
-          ? `Pinned for publishing. Invite link: <${roomUrl}|${roomUrl}>`
-          : `Pin this room in Mumbl App Home, or run \`/mumbl pin\` with the invite link: <${roomUrl}|${roomUrl}>`,
+        `Share this with your team so they can join in one step:\n\`${slackJoinCommand(roomUrl)}\`\n${
+          pinned ? "Pinned for publishing." : "Pin this room in Mumbl App Home, or run `/mumbl pin` with the invite link."
+        }`,
       ),
     ],
   });
@@ -1604,16 +1622,18 @@ export function slackRoomCreatedModalView({ space, openUrl, roomUrl, teamReadsUr
         { text: "share with team", actionId: "share_room_invite", value: JSON.stringify({ roomUrl, spaceName: space.name }) },
       ]),
       context(
-        pinned
-          ? "Pinned for publishing. Slack reads channel is optional and only mirrors published team reads."
-          : "After connecting, Mumbl can pin this space for publishing from Slack.",
+        `Share with your team so they join in one step:\n\`${slackJoinCommand(roomUrl)}\`\n${
+          pinned
+            ? "The Slack reads channel only mirrors published team reads."
+            : "After connecting, Mumbl can pin this space for publishing from Slack."
+        }`,
       ),
     ],
   };
 }
 
 export function slackShareRoomInviteModalView({ roomUrl, spaceName }) {
-  const inviteMessage = `hey team — just set up a mumbl room for ${spaceName || "us"}.\nwrite private work thoughts, publish as team reads when ready.\n\njoin here: ${roomUrl}`;
+  const inviteMessage = `hey team — just set up a mumbl room for ${spaceName || "us"}.\nwrite private work thoughts, publish as team reads when ready.\n\nto join, run this in Slack:\n${slackJoinCommand(roomUrl)}`;
   return {
     type: "modal",
     callback_id: "share_room_invite",
@@ -1998,7 +2018,7 @@ async function slackAppHomeBlocks({ teamId, slackUserId }) {
     section(
       pinnedSpaces.length
         ? `*pinned teamspaces*\n${pinnedList}`
-        : "*join your team's room*\nPaste a room invite link to pin it, or create a new team room.",
+        : "*join your team's room*\nGot a join command from a teammate? Run `/mumbl join <room-name> <key>` to join. You can also pin a room from its invite link, or create a new team room.",
     ),
     actions(
       pinnedSpaces.length