diff --git a/src/actions/index.ts b/src/actions/index.ts
index 991e642..b14d191 100644
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -1,333 +1,9 @@
-import { ActionError, defineAction } from "astro:actions";
-import { z } from "astro/zod";
-import { AtUri } from "@atproto/api";
-
-import { getAtmosphereCommunityDid } from "../lib/community/atmosphere";
-import { resolveHandleToDid } from "../lib/community/identity";
-import { type JoinStatusCode } from "../lib/community/join-status";
-import {
-  type ShareStatusCode,
-  type UnshareStatusCode,
-} from "../lib/community/share-status";
-import { runJoin, runLeave } from "../lib/community/membership-mutations";
-import { parseSharedDocumentRef } from "../lib/community/shared-content";
-import {
-  getRepoRecordByUri,
-  getShareCandidateByUri,
-} from "../lib/community/share-candidates";
-import {
-  OpenSocialCommunityError,
-  getMembership,
-} from "../lib/opensocial/membership";
-import {
-  SHARED_CONTENT_COLLECTION,
-  shareContentWithCommunity,
-  unshareContentWithCommunity,
-} from "../lib/opensocial/content-sharing";
-import {
-  RSVP_STATUS_GOING,
-  RSVP_STATUS_NOT_GOING,
-  setRsvpStatus,
-  type RsvpStatus,
-} from "../lib/rsvps";
-
-
-function joinPayload(status: JoinStatusCode, community?: string) {
-  return { status, community };
-}
-
-const EVENT_COLLECTION = "community.lexicon.calendar.event";
-
-function isValidEventUri(uri: string): boolean {
-  try {
-    const parsed = new AtUri(uri);
-    return (
-      parsed.host.startsWith("did:") &&
-      parsed.collection === EVENT_COLLECTION &&
-      parsed.rkey.length > 0
-    );
-  } catch {
-    return false;
-  }
-}
-
-function parseSharedContentRecordUri(
-  uri: string,
-  communityDid: string,
-): AtUri | null {
-  try {
-    const parsed = new AtUri(uri);
-    return parsed.host === communityDid &&
-      parsed.collection === SHARED_CONTENT_COLLECTION &&
-      parsed.rkey.length > 0
-      ? parsed
-      : null;
-  } catch {
-    return null;
-  }
-}
-
-const FORM_STATUS_TO_RSVP_STATUS: Record<"going" | "notgoing", RsvpStatus> = {
-  going: RSVP_STATUS_GOING,
-  notgoing: RSVP_STATUS_NOT_GOING,
-};
-
-function throwActionError(
-  code: "UNAUTHORIZED" | "FORBIDDEN" | "BAD_REQUEST" | "INTERNAL_SERVER_ERROR",
-  message: string,
-): never {
-  throw new ActionError({ code, message });
-}
-
-function isPermissionError(error: unknown): boolean {
-  const maybeError = error as {
-    status?: number;
-    error?: string;
-    message?: string;
-  };
-  const text = `${maybeError.error ?? ""} ${
-    maybeError.message ?? ""
-  }`.toLowerCase();
-  return (
-    maybeError.status === 401 ||
-    maybeError.status === 403 ||
-    text.includes("scope")
-  );
-}
+import { membershipActions } from "./membership";
+import { sharingActions } from "./sharing";
+import { rsvpActions } from "./rsvp";
 
 export const server = {
-  joinAtmosphereCommunity: defineAction({
-    accept: "form",
-    handler: async (_input, ctx) => {
-      const loggedInUser = ctx.locals.loggedInUser;
-      if (!loggedInUser) {
-        return joinPayload("signin");
-      }
-      const status = await runJoin(loggedInUser, await getAtmosphereCommunityDid());
-      return joinPayload(status);
-    },
-  }),
-
-  // Listing-page join for any opensocial community, addressed by handle.
-  joinOpenSocialCommunity: defineAction({
-    accept: "form",
-    input: z.object({ handle: z.string().min(1) }),
-    handler: async (input, ctx) => {
-      const loggedInUser = ctx.locals.loggedInUser;
-      if (!loggedInUser) {
-        return joinPayload("signin", input.handle);
-      }
-      let communityDid: string;
-      try {
-        communityDid = await resolveHandleToDid(input.handle);
-      } catch {
-        return joinPayload("missing", input.handle);
-      }
-      const status = await runJoin(loggedInUser, communityDid);
-      return joinPayload(status, input.handle);
-    },
-  }),
-
-  // Listing-page leave for any opensocial community, addressed by handle.
-  leaveOpenSocialCommunity: defineAction({
-    accept: "form",
-    input: z.object({ handle: z.string().min(1) }),
-    handler: async (input, ctx) => {
-      const loggedInUser = ctx.locals.loggedInUser;
-      if (!loggedInUser) {
-        return joinPayload("signin", input.handle);
-      }
-      let communityDid: string;
-      try {
-        communityDid = await resolveHandleToDid(input.handle);
-      } catch {
-        return joinPayload("missing", input.handle);
-      }
-      const status = await runLeave(loggedInUser, communityDid);
-      return joinPayload(status, input.handle);
-    },
-  }),
-
-  leaveAtmosphereCommunity: defineAction({
-    accept: "form",
-    handler: async (_input, ctx) => {
-      const loggedInUser = ctx.locals.loggedInUser;
-      if (!loggedInUser) {
-        return joinPayload("signin");
-      }
-      const status = await runLeave(loggedInUser, await getAtmosphereCommunityDid());
-      return joinPayload(status);
-    },
-  }),
-
-  shareAtmosphereContent: defineAction({
-    accept: "form",
-    input: z.object({
-      candidateUri: z.string().min(1),
-      sourceRepo: z.string().min(1).optional(),
-    }),
-    handler: async (input, ctx): Promise<{ status: ShareStatusCode }> => {
-      const loggedInUser = ctx.locals.loggedInUser;
-      if (!loggedInUser) {
-        return { status: "signin" };
-      }
-
-      try {
-        const communityDid = await getAtmosphereCommunityDid();
-        const membership = await getMembership({
-          communityDid,
-          userDid: loggedInUser.did,
-        });
-        if (!membership.isMember && !membership.isAdmin) {
-          return { status: "not-member" };
-        }
-
-        const sourceRepo = input.sourceRepo ?? loggedInUser.handle;
-        const candidate = await getShareCandidateByUri(
-          sourceRepo,
-          input.candidateUri,
-        );
-        if (!candidate) {
-          return { status: "not-found" };
-        }
-
-        await shareContentWithCommunity({
-          communityDid,
-          userDid: loggedInUser.did,
-          candidate,
-        });
-        return { status: "ok" };
-      } catch (err) {
-        if (err instanceof OpenSocialCommunityError) {
-          if (err.code === "PermissionDenied") {
-            return { status: "no-permission" };
-          }
-          console.warn("[shareAtmosphereContent] OpenSocial error", err);
-          return { status: "failed" };
-        }
-        if (isPermissionError(err)) {
-          return { status: "no-permission" };
-        }
-        console.warn("[shareAtmosphereContent] unexpected error", err);
-        return { status: "failed" };
-      }
-    },
-  }),
-
-  unshareAtmosphereContent: defineAction({
-    accept: "form",
-    input: z.object({
-      shareRecordUri: z.string().min(1),
-    }),
-    handler: async (
-      input,
-      ctx,
-    ): Promise<{ status: UnshareStatusCode; shareRecordUri: string }> => {
-      const loggedInUser = ctx.locals.loggedInUser;
-      if (!loggedInUser) {
-        return { status: "signin", shareRecordUri: input.shareRecordUri };
-      }
-
-      try {
-        const communityDid = await getAtmosphereCommunityDid();
-        const parsedShareRecordUri = parseSharedContentRecordUri(
-          input.shareRecordUri,
-          communityDid,
-        );
-        if (!parsedShareRecordUri) {
-          return { status: "not-found", shareRecordUri: input.shareRecordUri };
-        }
-
-        const response = await getRepoRecordByUri(input.shareRecordUri);
-        if (!response || typeof response.value !== "object" || response.value === null) {
-          return { status: "not-found", shareRecordUri: input.shareRecordUri };
-        }
-
-        const sharedRecord = parseSharedDocumentRef(
-          response.value as Record<string, unknown>,
-          {
-            source: communityDid,
-            shareRecordUri: response.uri,
-            shareRecordRkey: parsedShareRecordUri.rkey,
-          },
-        );
-        if (!sharedRecord) {
-          return { status: "not-found", shareRecordUri: input.shareRecordUri };
-        }
-
-        const isOriginalSharer = sharedRecord.sharedBy === loggedInUser.did;
-        if (!isOriginalSharer) {
-          const membership = await getMembership({
-            communityDid,
-            userDid: loggedInUser.did,
-          });
-          if (!membership.isAdmin) {
-            return { status: "not-author", shareRecordUri: input.shareRecordUri };
-          }
-        }
-
-        await unshareContentWithCommunity({
-          communityDid,
-          userDid: loggedInUser.did,
-          shareRecordRkey: sharedRecord.shareRecordRkey,
-        });
-        return { status: "ok", shareRecordUri: input.shareRecordUri };
-      } catch (err) {
-        if (err instanceof OpenSocialCommunityError) {
-          if (err.code === "RecordNotFound") {
-            return { status: "missing", shareRecordUri: input.shareRecordUri };
-          }
-          if (err.code === "PermissionDenied") {
-            return { status: "no-permission", shareRecordUri: input.shareRecordUri };
-          }
-          console.warn("[unshareAtmosphereContent] OpenSocial error", err);
-          return { status: "failed", shareRecordUri: input.shareRecordUri };
-        }
-        if (isPermissionError(err)) {
-          return { status: "no-permission", shareRecordUri: input.shareRecordUri };
-        }
-        console.warn("[unshareAtmosphereContent] unexpected error", err);
-        return { status: "failed", shareRecordUri: input.shareRecordUri };
-      }
-    },
-  }),
-
-
-  rsvpEvent: defineAction({
-    accept: "form",
-    input: z.object({
-      eventUri: z.string(),
-      eventCid: z.string(),
-      eventName: z.string().optional(),
-      status: z.enum(["going", "notgoing"]),
-    }),
-    handler: async (input, ctx) => {
-      const loggedInUser = ctx.locals.loggedInUser;
-
-      if (!loggedInUser) {
-        throwActionError("UNAUTHORIZED", "You need to sign in to RSVP.");
-      }
-
-      if (!isValidEventUri(input.eventUri) || input.eventCid.length === 0) {
-        throwActionError("BAD_REQUEST", "That RSVP request is invalid.");
-      }
-
-      try {
-        await setRsvpStatus(
-          loggedInUser,
-          { uri: input.eventUri, cid: input.eventCid },
-          FORM_STATUS_TO_RSVP_STATUS[input.status],
-        );
-      } catch (error) {
-        throwActionError(
-          isPermissionError(error) ? "FORBIDDEN" : "INTERNAL_SERVER_ERROR",
-          isPermissionError(error)
-            ? "Your login is missing permission to RSVP to events."
-            : "We couldn't update your RSVP right now. Please try again.",
-        );
-      }
-
-      return { status: input.status, eventName: input.eventName ?? null };
-    },
-  }),
+  ...membershipActions,
+  ...sharingActions,
+  ...rsvpActions,
 };
diff --git a/src/actions/membership.ts b/src/actions/membership.ts
new file mode 100644
index 0000000..e41d800
--- /dev/null
+++ b/src/actions/membership.ts
@@ -0,0 +1,168 @@
+import { ActionError, defineAction } from "astro:actions";
+import { z } from "astro/zod";
+
+import { getAtmosphereCommunityDid } from "../lib/community/atmosphere";
+import { resolveHandleToDid } from "../lib/community/identity";
+import { type JoinOutcomeCode } from "../lib/community/join-status";
+import { runJoin, runLeave } from "../lib/community/membership-mutations";
+import { OpenSocialCommunityError } from "../lib/opensocial/client";
+
+interface AtmosphereJoinResult {
+  outcome: JoinOutcomeCode;
+}
+
+interface ListingJoinResult {
+  outcome: JoinOutcomeCode;
+  community: string;
+}
+
+export const membershipActions = {
+  joinAtmosphereCommunity: defineAction({
+    accept: "form",
+    handler: async (_input, ctx): Promise<AtmosphereJoinResult> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "Sign in first, then try again.",
+        });
+      }
+
+      try {
+        const outcome = await runJoin(
+          loggedInUser,
+          await getAtmosphereCommunityDid(),
+        );
+        return { outcome };
+      } catch (error) {
+        throw toMembershipActionError(error);
+      }
+    },
+  }),
+
+  // Listing-page join for any opensocial community, addressed by handle.
+  joinOpenSocialCommunity: defineAction({
+    accept: "form",
+    input: z.object({ handle: z.string().min(1) }),
+    handler: async (input, ctx): Promise<ListingJoinResult> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "Sign in first, then try again.",
+        });
+      }
+      let communityDid: string;
+      try {
+        communityDid = await resolveHandleToDid(input.handle);
+      } catch {
+        throw new ActionError({
+          code: "INTERNAL_SERVER_ERROR",
+          message: "We couldn't verify that community right now. Try again later.",
+        });
+      }
+      try {
+        const outcome = await runJoin(loggedInUser, communityDid);
+        return { outcome, community: input.handle };
+      } catch (error) {
+        throw toMembershipActionError(error);
+      }
+    },
+  }),
+
+  // Listing-page leave for any opensocial community, addressed by handle.
+  leaveOpenSocialCommunity: defineAction({
+    accept: "form",
+    input: z.object({ handle: z.string().min(1) }),
+    handler: async (input, ctx): Promise<ListingJoinResult> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "Sign in first, then try again.",
+        });
+      }
+      let communityDid: string;
+      try {
+        communityDid = await resolveHandleToDid(input.handle);
+      } catch {
+        throw new ActionError({
+          code: "INTERNAL_SERVER_ERROR",
+          message: "We couldn't verify that community right now. Try again later.",
+        });
+      }
+      try {
+        const outcome = await runLeave(loggedInUser, communityDid);
+        return { outcome, community: input.handle };
+      } catch (error) {
+        throw toMembershipActionError(error);
+      }
+    },
+  }),
+
+  leaveAtmosphereCommunity: defineAction({
+    accept: "form",
+    handler: async (_input, ctx): Promise<AtmosphereJoinResult> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "Sign in first, then try again.",
+        });
+      }
+
+      try {
+        const outcome = await runLeave(
+          loggedInUser,
+          await getAtmosphereCommunityDid(),
+        );
+        return { outcome };
+      } catch (error) {
+        throw toMembershipActionError(error);
+      }
+    },
+  }),
+};
+
+function toMembershipActionError(error: unknown): ActionError {
+  if (error instanceof ActionError) {
+    return error;
+  }
+
+  if (error instanceof OpenSocialCommunityError) {
+    if (error.code === "CommunityNotFound") {
+      return new ActionError({
+        code: "NOT_FOUND",
+        message: "Couldn't find that community right now. Try again later.",
+      });
+    }
+  }
+
+  if (isPermissionError(error)) {
+    return new ActionError({
+      code: "FORBIDDEN",
+      message:
+        "Your login needs community membership permission. Log out and back in, then try again.",
+    });
+  }
+
+  console.warn("[membershipActions] unexpected error", error);
+  return new ActionError({
+    code: "INTERNAL_SERVER_ERROR",
+    message: "Something went wrong. Try again later.",
+  });
+}
+
+function isPermissionError(error: unknown): boolean {
+  const maybeError = error as {
+    status?: number;
+    error?: string;
+    message?: string;
+  };
+  const text = `${maybeError.error ?? ""} ${maybeError.message ?? ""}`.toLowerCase();
+  return (
+    maybeError.status === 401 ||
+    maybeError.status === 403 ||
+    text.includes("scope")
+  );
+}
diff --git a/src/actions/rsvp.ts b/src/actions/rsvp.ts
new file mode 100644
index 0000000..270c5c7
--- /dev/null
+++ b/src/actions/rsvp.ts
@@ -0,0 +1,95 @@
+import { ActionError, defineAction } from "astro:actions";
+import { z } from "astro/zod";
+import { AtUri } from "@atproto/api";
+
+import { type RsvpOutcomeCode } from "../lib/community/rsvp-status";
+import {
+  RSVP_STATUS_GOING,
+  RSVP_STATUS_NOT_GOING,
+  setRsvpStatus,
+  type RsvpStatus,
+} from "../lib/rsvps";
+
+const EVENT_COLLECTION = "community.lexicon.calendar.event";
+
+function isValidEventUri(uri: string): boolean {
+  try {
+    const parsed = new AtUri(uri);
+    return (
+      parsed.host.startsWith("did:") &&
+      parsed.collection === EVENT_COLLECTION &&
+      parsed.rkey.length > 0
+    );
+  } catch {
+    return false;
+  }
+}
+
+const FORM_STATUS_TO_RSVP_STATUS: Record<"going" | "notgoing", RsvpStatus> = {
+  going: RSVP_STATUS_GOING,
+  notgoing: RSVP_STATUS_NOT_GOING,
+};
+
+function isPermissionError(error: unknown): boolean {
+  const maybeError = error as {
+    status?: number;
+    error?: string;
+    message?: string;
+  };
+  const text = `${maybeError.error ?? ""} ${
+    maybeError.message ?? ""
+  }`.toLowerCase();
+  return (
+    maybeError.status === 401 ||
+    maybeError.status === 403 ||
+    text.includes("scope")
+  );
+}
+
+export const rsvpActions = {
+  rsvpEvent: defineAction({
+    accept: "form",
+    input: z.object({
+      eventUri: z.string(),
+      eventCid: z.string(),
+      eventName: z.string().optional(),
+      status: z.enum(["going", "notgoing"]),
+    }),
+    handler: async (input, ctx): Promise<{ outcome: RsvpOutcomeCode; eventName: string | null }> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "You need to sign in to RSVP.",
+        });
+      }
+
+      if (!isValidEventUri(input.eventUri) || input.eventCid.length === 0) {
+        throw new ActionError({ code: "BAD_REQUEST", message: "That RSVP request is invalid." });
+      }
+
+      try {
+        await setRsvpStatus(
+          loggedInUser,
+          { uri: input.eventUri, cid: input.eventCid },
+          FORM_STATUS_TO_RSVP_STATUS[input.status],
+        );
+      } catch (error) {
+        if (isPermissionError(error)) {
+          throw new ActionError({
+            code: "FORBIDDEN",
+            message: "Your login is missing permission to RSVP to events.",
+          });
+        }
+        console.warn("[rsvpEvent] unexpected error", error);
+        throw new ActionError({
+          code: "INTERNAL_SERVER_ERROR",
+          message: "We couldn't update your RSVP right now. Please try again.",
+        });
+      }
+
+      return { outcome: input.status, eventName: input.eventName ?? null };
+    },
+  }),
+};
diff --git a/src/actions/sharing.ts b/src/actions/sharing.ts
new file mode 100644
index 0000000..cfbfebf
--- /dev/null
+++ b/src/actions/sharing.ts
@@ -0,0 +1,234 @@
+import { ActionError, defineAction } from "astro:actions";
+import { z } from "astro/zod";
+import { AtUri } from "@atproto/api";
+
+import { getAtmosphereCommunityDid } from "../lib/community/atmosphere";
+import {
+  type ShareOutcomeCode,
+  type UnshareOutcomeCode,
+} from "../lib/community/share-status";
+import { parseSharedDocumentRef } from "../lib/community/shared-content";
+import {
+  getRepoRecordByUri,
+  getShareCandidateByUri,
+} from "../lib/community/share-candidates";
+import { getMembership } from "../lib/opensocial/membership";
+import { OpenSocialCommunityError } from "../lib/opensocial/client";
+import {
+  SHARED_CONTENT_COLLECTION,
+  shareContentWithCommunity,
+  unshareContentWithCommunity,
+} from "../lib/opensocial/content-sharing";
+
+function parseSharedContentRecordUri(
+  uri: string,
+  communityDid: string,
+): AtUri | null {
+  try {
+    const parsed = new AtUri(uri);
+    return parsed.host === communityDid &&
+      parsed.collection === SHARED_CONTENT_COLLECTION &&
+      parsed.rkey.length > 0
+      ? parsed
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function isPermissionError(error: unknown): boolean {
+  const maybeError = error as {
+    status?: number;
+    error?: string;
+    message?: string;
+  };
+  const text = `${maybeError.error ?? ""} ${
+    maybeError.message ?? ""
+  }`.toLowerCase();
+  return (
+    maybeError.status === 401 ||
+    maybeError.status === 403 ||
+    text.includes("scope")
+  );
+}
+
+export const sharingActions = {
+  shareAtmosphereContent: defineAction({
+    accept: "form",
+    input: z.object({
+      candidateUri: z.string().min(1),
+      sourceRepo: z.string().min(1).optional(),
+    }),
+    handler: async (input, ctx): Promise<{ outcome: ShareOutcomeCode }> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "Sign in first, then try sharing again.",
+        });
+      }
+
+      try {
+        const communityDid = await getAtmosphereCommunityDid();
+        const membership = await getMembership({
+          communityDid,
+          userDid: loggedInUser.did,
+        });
+        if (!membership.isMember && !membership.isAdmin) {
+          return { outcome: "not-member" };
+        }
+
+        const sourceRepo = input.sourceRepo ?? loggedInUser.handle;
+        const candidate = await getShareCandidateByUri(
+          sourceRepo,
+          input.candidateUri,
+        );
+        if (!candidate) {
+          throw new ActionError({
+            code: "NOT_FOUND",
+            message: "That item couldn't be shared. Pick another one and try again.",
+          });
+        }
+
+        await shareContentWithCommunity({
+          communityDid,
+          userDid: loggedInUser.did,
+          candidate,
+        });
+        return { outcome: "ok" };
+      } catch (err) {
+        if (err instanceof ActionError) {
+          throw err;
+        }
+        if (err instanceof OpenSocialCommunityError) {
+          if (err.code === "PermissionDenied") {
+            throw new ActionError({
+              code: "FORBIDDEN",
+              message:
+                "Your login needs community content permission. Log out and back in, then try again.",
+            });
+          }
+        }
+        if (isPermissionError(err)) {
+          throw new ActionError({
+            code: "FORBIDDEN",
+            message:
+              "Your login needs community content permission. Log out and back in, then try again.",
+          });
+        }
+        console.warn("[shareAtmosphereContent] unexpected error", err);
+        throw new ActionError({
+          code: "INTERNAL_SERVER_ERROR",
+          message:
+            "Something went wrong while updating community content. Try again later.",
+        });
+      }
+    },
+  }),
+
+  unshareAtmosphereContent: defineAction({
+    accept: "form",
+    input: z.object({
+      shareRecordUri: z.string().min(1),
+    }),
+    handler: async (
+      input,
+      ctx,
+    ): Promise<{ outcome: UnshareOutcomeCode; shareRecordUri: string }> => {
+      const loggedInUser = ctx.locals.loggedInUser;
+      if (!loggedInUser) {
+        throw new ActionError({
+          code: "UNAUTHORIZED",
+          message: "Sign in first, then try unsharing again.",
+        });
+      }
+
+      try {
+        const communityDid = await getAtmosphereCommunityDid();
+        const parsedShareRecordUri = parseSharedContentRecordUri(
+          input.shareRecordUri,
+          communityDid,
+        );
+        if (!parsedShareRecordUri) {
+          throw new ActionError({
+            code: "BAD_REQUEST",
+            message: "That item couldn't be removed. Refresh the page and try again.",
+          });
+        }
+
+        const response = await getRepoRecordByUri(input.shareRecordUri);
+        if (!response || typeof response.value !== "object" || response.value === null) {
+          throw new ActionError({
+            code: "NOT_FOUND",
+            message: "That item couldn't be removed. Refresh the page and try again.",
+          });
+        }
+
+        const sharedRecord = parseSharedDocumentRef(
+          response.value as Record<string, unknown>,
+          {
+            source: communityDid,
+            shareRecordUri: response.uri,
+            shareRecordRkey: parsedShareRecordUri.rkey,
+          },
+        );
+        if (!sharedRecord) {
+          throw new ActionError({
+            code: "NOT_FOUND",
+            message: "That item couldn't be removed. Refresh the page and try again.",
+          });
+        }
+
+        const isOriginalSharer = sharedRecord.sharedBy === loggedInUser.did;
+        if (!isOriginalSharer) {
+          const membership = await getMembership({
+            communityDid,
+            userDid: loggedInUser.did,
+          });
+          if (!membership.isAdmin) {
+            throw new ActionError({
+              code: "FORBIDDEN",
+              message: "Only the original sharer can remove that item.",
+            });
+          }
+        }
+
+        await unshareContentWithCommunity({
+          communityDid,
+          userDid: loggedInUser.did,
+          shareRecordRkey: sharedRecord.shareRecordRkey,
+        });
+        return { outcome: "ok", shareRecordUri: input.shareRecordUri };
+      } catch (err) {
+        if (err instanceof ActionError) {
+          throw err;
+        }
+        if (err instanceof OpenSocialCommunityError) {
+          if (err.code === "RecordNotFound") {
+            return { outcome: "missing", shareRecordUri: input.shareRecordUri };
+          }
+          if (err.code === "PermissionDenied") {
+            throw new ActionError({
+              code: "FORBIDDEN",
+              message:
+                "Your login needs community content permission. Log out and back in, then try again.",
+            });
+          }
+        }
+        if (isPermissionError(err)) {
+          throw new ActionError({
+            code: "FORBIDDEN",
+            message:
+              "Your login needs community content permission. Log out and back in, then try again.",
+          });
+        }
+        console.warn("[unshareAtmosphereContent] unexpected error", err);
+        throw new ActionError({
+          code: "INTERNAL_SERVER_ERROR",
+          message:
+            "Something went wrong while updating community content. Try again later.",
+        });
+      }
+    },
+  }),
+};
diff --git a/src/components/communities/JoinStatusNotice.astro b/src/components/communities/JoinStatusNotice.astro
index d188d1b..7a3b9c7 100644
--- a/src/components/communities/JoinStatusNotice.astro
+++ b/src/components/communities/JoinStatusNotice.astro
@@ -1,16 +1,18 @@
 ---
 import {
-  getJoinStatusCopy,
-  type JoinStatusCode,
+  getJoinOutcomeCopy,
+  type JoinOutcomeCode,
 } from "../../lib/community/join-status";
+import type { CommunityActionNotice } from "../../lib/community/action-error-copy";
 
 interface Props {
-  status?: JoinStatusCode | string | null;
+  outcome?: JoinOutcomeCode | null;
+  error?: CommunityActionNotice | null;
   communityName?: string | null;
 }
 
-const { status, communityName } = Astro.props;
-const notice = getJoinStatusCopy(status);
+const { outcome, error, communityName } = Astro.props;
+const notice = error ?? getJoinOutcomeCopy(outcome);
 
 if (!notice) {
   return;
diff --git a/src/components/content/SharableContentIcon.astro b/src/components/content/ShareableContentIcon.astro
similarity index 99%
rename from src/components/content/SharableContentIcon.astro
rename to src/components/content/ShareableContentIcon.astro
index 3871f30..a7e2ff9 100644
--- a/src/components/content/SharableContentIcon.astro
+++ b/src/components/content/ShareableContentIcon.astro
@@ -1,10 +1,7 @@
-            
 ---
-
 interface Props {
     kind: 'event' | 'document';
 }
-
 ---
 <span class:list={['share-row__mark', `share-row__mark--${Astro.props.kind}`]}>
   {Astro.props.kind === 'event' ? (
diff --git a/src/components/content/ShareableContentList.astro b/src/components/content/ShareableContentList.astro
index e8faa5c..fa49690 100644
--- a/src/components/content/ShareableContentList.astro
+++ b/src/components/content/ShareableContentList.astro
@@ -1,7 +1,7 @@
 ---
 import type { ShareCandidateList } from '../../lib/community/share-candidates';
 import { actions } from 'astro:actions';
-import SharableContentIcon from './SharableContentIcon.astro';
+import ShareableContentIcon from './ShareableContentIcon.astro';
 
 interface Props {
   candidates: ShareCandidateList | null;
@@ -75,7 +75,7 @@ function formatDate(date: Date | undefined): string {
         const rowUrl = candidate.previewUrl ?? candidate.uri;
         return (
           <li class="share-row" data-share-row data-kind={candidate.kind} hidden={index >= initialVisible}>
-            <SharableContentIcon kind={candidate.kind} />
+            <ShareableContentIcon kind={candidate.kind} />
             <div class="share-row__main">
               <a class="share-row__title" href={rowUrl} rel="noopener noreferrer" target="_blank">
                 {candidate.title}
diff --git a/src/components/events/EventCard.astro b/src/components/events/EventCard.astro
index 85c3ae8..4d61774 100644
--- a/src/components/events/EventCard.astro
+++ b/src/components/events/EventCard.astro
@@ -530,8 +530,10 @@ const canRsvp = showRsvp && isLoggedIn && Boolean(cid);
   }
 </style>
 
-<script>
+  <script>
   import { actions } from "astro:actions";
+  import { getCommunityActionErrorCopy } from "../../lib/community/action-error-copy";
+  import { getRsvpOutcomeCopy } from "../../lib/community/rsvp-status";
 
   const RSVP_GOING = "community.lexicon.calendar.rsvp#going";
   const RSVP_NOT_GOING = "community.lexicon.calendar.rsvp#notgoing";
@@ -580,7 +582,6 @@ const canRsvp = showRsvp && isLoggedIn && Boolean(cid);
         if (!card || !button || !statusInput) return;
 
         const formData = new FormData(form);
-        const submittedStatus = formData.get("status");
         const eventName = button.dataset.eventName ?? "";
 
         button.disabled = true;
@@ -592,41 +593,48 @@ const canRsvp = showRsvp && isLoggedIn && Boolean(cid);
 
         if (error || !data) {
           if (message) {
+            const notice =
+              getCommunityActionErrorCopy(error, "rsvp") ?? {
+                tone: "error" as const,
+                message: "Couldn't save your RSVP. Try again.",
+              };
+            const toastTone =
+              notice.tone === "info" ? "neutral" : notice.tone;
             showToast(
               message,
-              error?.message ?? "Couldn't save your RSVP. Try again.",
-              "error",
+              notice.message,
+              toastTone,
             );
           }
           return;
         }
 
-        const nowGoing = data.status === "going";
         const noticeEventName = data.eventName ?? eventName;
-        card.dataset.rsvpStatus = nowGoing ? RSVP_GOING : RSVP_NOT_GOING;
-
-        if (goingBadge) goingBadge.hidden = !nowGoing;
-        if (savedBadge) savedBadge.hidden = true;
-
-        button.textContent = nowGoing ? "I'm not going" : "I'm going";
-        button.classList.toggle("event-card__rsvp--cancel", nowGoing);
-        button.setAttribute(
-          "aria-label",
-          nowGoing
-            ? `Mark yourself as not going to ${noticeEventName}`
-            : `Mark yourself as going to ${noticeEventName}`,
-        );
-        statusInput.value = nowGoing ? "notgoing" : "going";
+        const isSuccess = data.outcome === "going" || data.outcome === "notgoing";
+
+        if (isSuccess) {
+          const nowGoing = data.outcome === "going";
+          card.dataset.rsvpStatus = nowGoing ? RSVP_GOING : RSVP_NOT_GOING;
+
+          if (goingBadge) goingBadge.hidden = !nowGoing;
+          if (savedBadge) savedBadge.hidden = true;
+
+          button.textContent = nowGoing ? "I'm not going" : "I'm going";
+          button.classList.toggle("event-card__rsvp--cancel", nowGoing);
+          button.setAttribute(
+            "aria-label",
+            nowGoing
+              ? `Mark yourself as not going to ${noticeEventName}`
+              : `Mark yourself as going to ${noticeEventName}`,
+          );
+          statusInput.value = nowGoing ? "notgoing" : "going";
+        }
 
         if (message) {
-          const text = nowGoing
-            ? noticeEventName
-              ? `You're going to ${noticeEventName}.`
-              : "You're marked as going."
-            : noticeEventName
-              ? `You're no longer going to ${noticeEventName}.`
-              : "You're no longer marked as going.";
-          showToast(message, text, nowGoing ? "success" : "neutral");
+          const copy = getRsvpOutcomeCopy(data.outcome, noticeEventName || null);
+          if (copy) {
+            showToast(message, copy.message, copy.tone);
+          }
         }
       });
     });
diff --git a/src/components/events/RsvpNotice.astro b/src/components/events/RsvpNotice.astro
index ae82093..bee88fe 100644
--- a/src/components/events/RsvpNotice.astro
+++ b/src/components/events/RsvpNotice.astro
@@ -1,5 +1,7 @@
 ---
 import { actions, type ActionReturnType } from "astro:actions";
+import { getCommunityActionErrorCopy } from "../../lib/community/action-error-copy";
+import { getRsvpOutcomeCopy } from "../../lib/community/rsvp-status";
 
 type RsvpResult = ActionReturnType<typeof actions.rsvpEvent>;
 
@@ -8,23 +10,19 @@ interface Props {
 }
 
 const { result } = Astro.props;
-const status = result?.data?.status;
-const eventName = result?.data?.eventName;
-const errorMessage = result?.error?.message;
+const outcome = result?.data?.outcome;
+const eventName = result?.data?.eventName ?? null;
+const errorNotice = getCommunityActionErrorCopy(result?.error, "rsvp");
+const notice = getRsvpOutcomeCopy(outcome ?? null, eventName);
 ---
 
-{status === "going" && (
-  <p class="events-notice events-notice--success">
-    {eventName ? `You're going to ${eventName}.` : "You're marked as going."}
+{notice && (
+  <p class={`events-notice events-notice--${notice.tone}`}>
+    {notice.message}
   </p>
 )}
-{status === "notgoing" && (
-  <p class="events-notice events-notice--success">
-    {eventName ? `You're no longer going to ${eventName}.` : "You're no longer marked as going."}
-  </p>
-)}
-{errorMessage && (
-  <p class="events-notice events-notice--error">{errorMessage}</p>
+{errorNotice && (
+  <p class={`events-notice events-notice--${errorNotice.tone}`}>{errorNotice.message}</p>
 )}
 
 <style>
@@ -42,6 +40,11 @@ const errorMessage = result?.error?.message;
     color: var(--success-muted-foreground);
   }
 
+  .events-notice--neutral {
+    background: var(--muted);
+    color: var(--foreground-secondary);
+  }
+
   .events-notice--error {
     background: var(--error-muted);
     color: var(--error-muted-foreground);
diff --git a/src/lib/community/action-error-copy.ts b/src/lib/community/action-error-copy.ts
new file mode 100644
index 0000000..5ed221c
--- /dev/null
+++ b/src/lib/community/action-error-copy.ts
@@ -0,0 +1,119 @@
+export type CommunityActionNoticeTone =
+  | "success"
+  | "info"
+  | "neutral"
+  | "error";
+
+export interface CommunityActionNotice {
+  tone: CommunityActionNoticeTone;
+  message: string;
+}
+
+type CommunityActionSurface = "join" | "share" | "rsvp";
+type CommunityActionErrorCode =
+  | "UNAUTHORIZED"
+  | "FORBIDDEN"
+  | "BAD_REQUEST"
+  | "NOT_FOUND"
+  | "INTERNAL_SERVER_ERROR";
+
+type ActionErrorLike = {
+  code?: string;
+  message?: string;
+} | null | undefined;
+
+const ERROR_COPY: Record<
+  CommunityActionSurface,
+  Record<CommunityActionErrorCode, CommunityActionNotice>
+> = {
+  join: {
+    UNAUTHORIZED: {
+      tone: "error",
+      message: "Sign in first, then try again.",
+    },
+    FORBIDDEN: {
+      tone: "error",
+      message:
+        "Your login needs community membership permission. Log out and back in, then try again.",
+    },
+    BAD_REQUEST: {
+      tone: "error",
+      message: "That community request is invalid.",
+    },
+    NOT_FOUND: {
+      tone: "error",
+      message: "Couldn't find that community right now. Try again later.",
+    },
+    INTERNAL_SERVER_ERROR: {
+      tone: "error",
+      message: "Something went wrong. Try again later.",
+    },
+  },
+  share: {
+    UNAUTHORIZED: {
+      tone: "error",
+      message: "Sign in first, then try again.",
+    },
+    FORBIDDEN: {
+      tone: "error",
+      message: "You don't have permission to update community content.",
+    },
+    BAD_REQUEST: {
+      tone: "error",
+      message: "That share request is invalid.",
+    },
+    NOT_FOUND: {
+      tone: "error",
+      message: "That item couldn't be found. Refresh the page and try again.",
+    },
+    INTERNAL_SERVER_ERROR: {
+      tone: "error",
+      message:
+        "Something went wrong while updating community content. Try again later.",
+    },
+  },
+  rsvp: {
+    UNAUTHORIZED: {
+      tone: "error",
+      message: "You need to sign in to RSVP.",
+    },
+    FORBIDDEN: {
+      tone: "error",
+      message: "Your login is missing permission to RSVP to events.",
+    },
+    BAD_REQUEST: {
+      tone: "error",
+      message: "That RSVP request is invalid.",
+    },
+    NOT_FOUND: {
+      tone: "error",
+      message: "That event couldn't be found right now.",
+    },
+    INTERNAL_SERVER_ERROR: {
+      tone: "error",
+      message: "We couldn't update your RSVP right now. Please try again.",
+    },
+  },
+};
+
+export function getCommunityActionErrorCopy(
+  error: ActionErrorLike,
+  surface: CommunityActionSurface,
+): CommunityActionNotice | null {
+  if (!error?.code) {
+    return error?.message
+      ? { tone: "error", message: error.message }
+      : null;
+  }
+
+  const code = error.code as CommunityActionErrorCode;
+  const fallback = ERROR_COPY[surface][code];
+  if (!fallback) {
+    return error.message ? { tone: "error", message: error.message } : null;
+  }
+
+  return {
+    tone: fallback.tone,
+    message: error.message || fallback.message,
+  };
+}
diff --git a/src/lib/community/join-status.ts b/src/lib/community/join-status.ts
index be3dc6f..2bb4303 100644
--- a/src/lib/community/join-status.ts
+++ b/src/lib/community/join-status.ts
@@ -1,41 +1,23 @@
-export type JoinStatusCode =
+export type JoinOutcomeCode =
   | "ok"
   | "pending"
   | "already"
-  | "missing"
-  | "error"
-  | "signin"
-  | "permission"
   | "left"
   | "not-member"
   | "admin-block";
 
-type JoinStatusCopy = {
+type JoinOutcomeCopy = {
   tone: "success" | "info" | "error";
   message: string;
 };
 
-const JOIN_STATUS_COPY: Record<JoinStatusCode, JoinStatusCopy> = {
+const JOIN_OUTCOME_COPY: Record<JoinOutcomeCode, JoinOutcomeCopy> = {
   ok: { tone: "success", message: "You're in — welcome to the community." },
   pending: {
     tone: "info",
     message: "Request submitted — an admin will review it shortly.",
   },
   already: { tone: "info", message: "You're already a member." },
-  missing: {
-    tone: "error",
-    message: "Couldn't find that community right now. Try again later.",
-  },
-  error: {
-    tone: "error",
-    message: "Something went wrong. Try again later.",
-  },
-  signin: { tone: "error", message: "Sign in first, then try again." },
-  permission: {
-    tone: "error",
-    message:
-      "Your login needs community membership permission. Log out and back in, then try again.",
-  },
   left: {
     tone: "info",
     message: "You've left the community.",
@@ -50,12 +32,12 @@ const JOIN_STATUS_COPY: Record<JoinStatusCode, JoinStatusCopy> = {
   },
 };
 
-export const getJoinStatusCopy = (
-  status: string | null | undefined,
-): JoinStatusCopy | null => {
-  if (!status || !(status in JOIN_STATUS_COPY)) {
+export const getJoinOutcomeCopy = (
+  outcome: JoinOutcomeCode | null | undefined,
+): JoinOutcomeCopy | null => {
+  if (!outcome) {
     return null;
   }
 
-  return JOIN_STATUS_COPY[status as JoinStatusCode];
+  return JOIN_OUTCOME_COPY[outcome];
 };
diff --git a/src/lib/community/membership-mutations.ts b/src/lib/community/membership-mutations.ts
index fe3233d..4488602 100644
--- a/src/lib/community/membership-mutations.ts
+++ b/src/lib/community/membership-mutations.ts
@@ -1,18 +1,18 @@
-import { type JoinStatusCode } from "./join-status";
+import { type JoinOutcomeCode } from "./join-status";
 import {
-  OpenSocialCommunityError,
   ensureUserMembershipRecord,
   getMembership,
   joinCommunity,
   leaveCommunity,
 } from "../opensocial/membership";
+import { OpenSocialCommunityError } from "../opensocial/client";
 
 type LoggedInUser = NonNullable<App.Locals["loggedInUser"]>;
 
 export async function runJoin(
   loggedInUser: LoggedInUser,
   communityDid: string,
-): Promise<JoinStatusCode> {
+): Promise<JoinOutcomeCode> {
   try {
     const membership = await getMembership({
       communityDid,
@@ -30,64 +30,48 @@ export async function runJoin(
     });
     return result.status === "pending" ? "pending" : "ok";
   } catch (err) {
-    if (err instanceof OpenSocialCommunityError) return joinStatusFromError(err);
-    if (isPermissionError(err)) return "permission";
-    console.warn("[runJoin] unexpected error", err);
-    return "error";
+    if (err instanceof OpenSocialCommunityError) {
+      const outcome = joinOutcomeFromError(err);
+      if (outcome) return outcome;
+    }
+    throw err;
   }
 }
 
 export async function runLeave(
   loggedInUser: LoggedInUser,
   communityDid: string,
-): Promise<JoinStatusCode> {
+): Promise<JoinOutcomeCode> {
   try {
     await leaveCommunity({ communityDid, userDid: loggedInUser.did });
     return "left";
   } catch (err) {
-    if (err instanceof OpenSocialCommunityError) return leaveStatusFromError(err);
-    if (isPermissionError(err)) return "permission";
-    console.warn("[runLeave] unexpected error", err);
-    return "error";
+    if (err instanceof OpenSocialCommunityError) {
+      const outcome = leaveOutcomeFromError(err);
+      if (outcome) return outcome;
+    }
+    throw err;
   }
 }
 
-function joinStatusFromError(err: OpenSocialCommunityError): JoinStatusCode {
+function joinOutcomeFromError(err: OpenSocialCommunityError): JoinOutcomeCode | null {
   switch (err.code) {
     case "AlreadyMember":
       return "already";
     case "AlreadyPending":
       return "pending";
-    case "CommunityNotFound":
-      return "missing";
     default:
-      return "error";
+      return null;
   }
 }
 
-function leaveStatusFromError(err: OpenSocialCommunityError): JoinStatusCode {
+function leaveOutcomeFromError(err: OpenSocialCommunityError): JoinOutcomeCode | null {
   switch (err.code) {
     case "NotMember":
       return "not-member";
-    case "CommunityNotFound":
-      return "missing";
     case "CannotLeaveAsAdmin":
       return "admin-block";
     default:
-      return "error";
+      return null;
   }
 }
-
-function isPermissionError(error: unknown): boolean {
-  const maybeError = error as {
-    status?: number;
-    error?: string;
-    message?: string;
-  };
-  const text = `${maybeError.error ?? ""} ${maybeError.message ?? ""}`.toLowerCase();
-  return (
-    maybeError.status === 401 ||
-    maybeError.status === 403 ||
-    text.includes("scope")
-  );
-}
diff --git a/src/lib/community/rsvp-status.ts b/src/lib/community/rsvp-status.ts
new file mode 100644
index 0000000..7c030c9
--- /dev/null
+++ b/src/lib/community/rsvp-status.ts
@@ -0,0 +1,40 @@
+export type RsvpOutcomeCode =
+  | "going"
+  | "notgoing";
+
+type RsvpStatusEntry = {
+  tone: "success" | "neutral" | "error";
+  message: (eventName: string | null) => string;
+};
+
+export type RsvpStatusCopy = {
+  tone: "success" | "neutral" | "error";
+  message: string;
+};
+
+const RSVP_OUTCOME_COPY: Record<RsvpOutcomeCode, RsvpStatusEntry> = {
+  going: {
+    tone: "success",
+    message: (name) =>
+      name ? `You're going to ${name}.` : "You're marked as going.",
+  },
+  notgoing: {
+    tone: "neutral",
+    message: (name) =>
+      name ? `You're no longer going to ${name}.` : "You're no longer marked as going.",
+  },
+};
+
+export function getRsvpOutcomeCopy(
+  outcome: RsvpOutcomeCode | null | undefined,
+  eventName: string | null = null,
+): RsvpStatusCopy | null {
+  if (!outcome) {
+    return null;
+  }
+  const entry = RSVP_OUTCOME_COPY[outcome];
+  return {
+    tone: entry.tone,
+    message: entry.message(eventName),
+  };
+}
diff --git a/src/lib/community/share-status.ts b/src/lib/community/share-status.ts
index 86912de..ddad6f7 100644
--- a/src/lib/community/share-status.ts
+++ b/src/lib/community/share-status.ts
@@ -1,85 +1,39 @@
-export type ShareStatusCode =
+export type ShareOutcomeCode =
   | "ok"
-  | "signin"
-  | "not-member"
-  | "no-permission"
-  | "not-found"
-  | "failed";
+  | "not-member";
 
-export type UnshareStatusCode =
+export type UnshareOutcomeCode =
   | "ok"
-  | "missing"
-  | "signin"
-  | "not-author"
-  | "no-permission"
-  | "not-found"
-  | "failed";
+  | "missing";
 
-type ShareStatusCopy = {
+type ShareOutcomeCopy = {
   tone: "success" | "info" | "error";
   message: string;
 };
 
-const SHARE_STATUS_COPY: Record<ShareStatusCode, ShareStatusCopy> = {
+const SHARE_OUTCOME_COPY: Record<ShareOutcomeCode, ShareOutcomeCopy> = {
   ok: { tone: "success", message: "Shared with the community." },
-  signin: { tone: "error", message: "Sign in first, then try sharing again." },
   "not-member": {
     tone: "error",
     message: "Join the community before sharing content.",
   },
-  "no-permission": {
-    tone: "error",
-    message:
-      "Your login needs community content permission. Log out and back in, then try again.",
-  },
-  "not-found": {
-    tone: "error",
-    message: "That item couldn't be shared. Pick another one and try again.",
-  },
-  failed: {
-    tone: "error",
-    message: "Something went wrong while updating community content. Try again later.",
-  },
 };
 
-const UNSHARE_STATUS_COPY: Record<UnshareStatusCode, ShareStatusCopy> = {
+const UNSHARE_OUTCOME_COPY: Record<UnshareOutcomeCode, ShareOutcomeCopy> = {
   ok: { tone: "success", message: "Removed from community content." },
   missing: { tone: "info", message: "That shared item was already removed." },
-  signin: { tone: "error", message: "Sign in first, then try unsharing again." },
-  "not-author": {
-    tone: "error",
-    message: "Only the original sharer can remove that item.",
-  },
-  "no-permission": {
-    tone: "error",
-    message:
-      "Your login needs community content permission. Log out and back in, then try again.",
-  },
-  "not-found": {
-    tone: "error",
-    message: "That item couldn't be removed. Refresh the page and try again.",
-  },
-  failed: {
-    tone: "error",
-    message: "Something went wrong while updating community content. Try again later.",
-  },
 };
 
-export function getShareStatusCopy(
-  shareStatus: string | null | undefined,
-  unshareStatus: string | null | undefined,
-  hasUnexpectedError = false,
-): ShareStatusCopy | null {
-  if (shareStatus && shareStatus in SHARE_STATUS_COPY) {
-    return SHARE_STATUS_COPY[shareStatus as ShareStatusCode];
-  }
-
-  if (unshareStatus && unshareStatus in UNSHARE_STATUS_COPY) {
-    return UNSHARE_STATUS_COPY[unshareStatus as UnshareStatusCode];
+export function getShareOutcomeCopy(
+  shareOutcome: ShareOutcomeCode | null | undefined,
+  unshareOutcome: UnshareOutcomeCode | null | undefined,
+): ShareOutcomeCopy | null {
+  if (shareOutcome) {
+    return SHARE_OUTCOME_COPY[shareOutcome];
   }
 
-  if (hasUnexpectedError) {
-    return SHARE_STATUS_COPY.failed;
+  if (unshareOutcome) {
+    return UNSHARE_OUTCOME_COPY[unshareOutcome];
   }
 
   return null;
diff --git a/src/lib/opensocial/client.ts b/src/lib/opensocial/client.ts
new file mode 100644
index 0000000..3c3d039
--- /dev/null
+++ b/src/lib/opensocial/client.ts
@@ -0,0 +1,57 @@
+import { XrpcError, isDidString } from "@atproto/lex";
+
+import { createSignedLexClient } from "./xrpc.js";
+
+const DEFAULT_SERVICE = "https://api.opensocial.community";
+
+export class OpenSocialCommunityError extends Error {
+  constructor(
+    public readonly status: number,
+    /** XRPC error name (e.g. "AlreadyMember") when the response carried one. */
+    public readonly code: string | null,
+    message: string,
+  ) {
+    super(message);
+    this.name = "OpenSocialCommunityError";
+  }
+}
+
+export function createOpenSocialClient() {
+  const appId = import.meta.env.OPENSOCIAL_APP_ID;
+  if (!appId || appId.length === 0) {
+    throw new Error(
+      "OPENSOCIAL_APP_ID is not set; cannot sign opensocial requests",
+    );
+  }
+
+  return createSignedLexClient({
+    service: import.meta.env.OPENSOCIAL_SERVICE || DEFAULT_SERVICE,
+    appId,
+  });
+}
+
+export function did(value: string, label: string) {
+  if (isDidString(value)) return value;
+  throw new Error(`${label} must be a valid DID`);
+}
+
+export async function xrpc<T>(call: () => Promise<T>): Promise<T> {
+  try {
+    return await call();
+  } catch (err) {
+    throw toOpenSocialCommunityError(err);
+  }
+}
+
+function toOpenSocialCommunityError(err: unknown): OpenSocialCommunityError {
+  if (err instanceof OpenSocialCommunityError) return err;
+  if (err instanceof XrpcError) {
+    const downstream = err.toDownstreamError();
+    return new OpenSocialCommunityError(
+      downstream.status,
+      downstream.body.error,
+      downstream.body.message || downstream.body.error,
+    );
+  }
+  throw err;
+}
diff --git a/src/lib/opensocial/content-sharing.ts b/src/lib/opensocial/content-sharing.ts
index dc7b6b5..8eac8aa 100644
--- a/src/lib/opensocial/content-sharing.ts
+++ b/src/lib/opensocial/content-sharing.ts
@@ -1,4 +1,4 @@
-import { XrpcError, asDatetimeString, isDidString } from "@atproto/lex";
+import { asDatetimeString } from "@atproto/lex";
 
 import type { ShareCandidate } from "../community/share-candidates.js";
 import {
@@ -6,10 +6,8 @@ import {
   deleteRecord as deleteRecordMethod,
   sharedContent as sharedContentSchema,
 } from "./generated/community/opensocial.js";
-import { OpenSocialCommunityError } from "./membership.js";
-import { createSignedLexClient } from "./xrpc.js";
+import { createOpenSocialClient, did, xrpc } from "./client.js";
 
-const DEFAULT_SERVICE = "https://api.opensocial.community";
 export const SHARED_CONTENT_COLLECTION = "community.opensocial.sharedContent";
 
 type CreateRecordBody = createRecordMethod.$defs.$InputBody;
@@ -17,25 +15,6 @@ type CreateRecordOutput = createRecordMethod.$defs.$OutputBody;
 type DeleteRecordBody = deleteRecordMethod.$defs.$InputBody;
 type DeleteRecordOutput = deleteRecordMethod.$defs.$OutputBody;
 
-function createOpenSocialClient() {
-  const appId = import.meta.env.OPENSOCIAL_APP_ID;
-  if (!appId || appId.length === 0) {
-    throw new Error(
-      "OPENSOCIAL_APP_ID is not set; cannot sign opensocial requests",
-    );
-  }
-
-  return createSignedLexClient({
-    service: import.meta.env.OPENSOCIAL_SERVICE || DEFAULT_SERVICE,
-    appId,
-  });
-}
-
-function did(value: string, label: string) {
-  if (isDidString(value)) return value;
-  throw new Error(`${label} must be a valid DID`);
-}
-
 export async function shareContentWithCommunity(input: {
   communityDid: string;
   userDid: string;
@@ -93,24 +72,3 @@ export async function unshareContentWithCommunity(input: {
   );
   return res.body;
 }
-
-async function xrpc<T>(call: () => Promise<T>): Promise<T> {
-  try {
-    return await call();
-  } catch (err) {
-    throw toOpenSocialCommunityError(err);
-  }
-}
-
-function toOpenSocialCommunityError(err: unknown): OpenSocialCommunityError {
-  if (err instanceof OpenSocialCommunityError) return err;
-  if (err instanceof XrpcError) {
-    const downstream = err.toDownstreamError();
-    return new OpenSocialCommunityError(
-      downstream.status,
-      downstream.body.error,
-      downstream.body.message || downstream.body.error,
-    );
-  }
-  throw err;
-}
diff --git a/src/lib/opensocial/membership.ts b/src/lib/opensocial/membership.ts
index 45da278..14356a3 100644
--- a/src/lib/opensocial/membership.ts
+++ b/src/lib/opensocial/membership.ts
@@ -1,5 +1,5 @@
 import { TID } from "@atproto/common-web";
-import { XrpcError, asDatetimeString, isDidString } from "@atproto/lex";
+import { asDatetimeString } from "@atproto/lex";
 import { getLoggedInAgent } from "@fujocoded/authproto/helpers";
 
 import {
@@ -8,10 +8,13 @@ import {
   leaveCommunity as leaveCommunityMethod,
   membership as membershipSchema,
 } from "./generated/community/opensocial.js";
-import { createSignedLexClient } from "./xrpc.js";
+import {
+  createOpenSocialClient,
+  did,
+  xrpc,
+} from "./client.js";
 
 export const MEMBERSHIP_COLLECTION = "community.opensocial.membership";
-const DEFAULT_SERVICE = "https://api.opensocial.community";
 
 type LoggedInUser = NonNullable<App.Locals["loggedInUser"]>;
 type LoggedInAgent = NonNullable<Awaited<ReturnType<typeof getLoggedInAgent>>>;
@@ -46,37 +49,6 @@ interface MembershipRecordInput {
   communityDid: string;
 }
 
-export class OpenSocialCommunityError extends Error {
-  constructor(
-    public readonly status: number,
-    /** XRPC error name (e.g. "AlreadyMember") when the response carried one. */
-    public readonly code: string | null,
-    message: string,
-  ) {
-    super(message);
-    this.name = "OpenSocialCommunityError";
-  }
-}
-
-function createOpenSocialClient() {
-  const appId = import.meta.env.OPENSOCIAL_APP_ID;
-  if (!appId || appId.length === 0) {
-    throw new Error(
-      "OPENSOCIAL_APP_ID is not set; cannot sign opensocial requests",
-    );
-  }
-
-  return createSignedLexClient({
-    service: import.meta.env.OPENSOCIAL_SERVICE || DEFAULT_SERVICE,
-    appId,
-  });
-}
-
-function did(value: string, label: string) {
-  if (isDidString(value)) return value;
-  throw new Error(`${label} must be a valid DID`);
-}
-
 async function requireLoggedInAgent(
   loggedInUser: LoggedInUser,
 ): Promise<LoggedInAgent> {
@@ -198,24 +170,3 @@ export async function ensureUserMembershipRecord(
     cid: response.data.cid,
   };
 }
-
-async function xrpc<T>(call: () => Promise<T>): Promise<T> {
-  try {
-    return await call();
-  } catch (err) {
-    throw toOpenSocialCommunityError(err);
-  }
-}
-
-function toOpenSocialCommunityError(err: unknown): OpenSocialCommunityError {
-  if (err instanceof OpenSocialCommunityError) return err;
-  if (err instanceof XrpcError) {
-    const downstream = err.toDownstreamError();
-    return new OpenSocialCommunityError(
-      downstream.status,
-      downstream.body.error,
-      downstream.body.message || downstream.body.error,
-    );
-  }
-  throw err;
-}
diff --git a/src/pages/communities.astro b/src/pages/communities.astro
index be6c562..d24701a 100644
--- a/src/pages/communities.astro
+++ b/src/pages/communities.astro
@@ -8,6 +8,7 @@ import { getLiveCollection } from "astro:content";
 import { actions } from "astro:actions";
 import { getMembership } from "../lib/opensocial/membership";
 import { resolveHandleToDid } from "../lib/community/identity";
+import { getCommunityActionErrorCopy } from "../lib/community/action-error-copy";
 
 const communitiesResult = await getLiveCollection("communities");
 const communities = communitiesResult.entries?.map((entry) => entry.data) ?? [];
@@ -15,16 +16,12 @@ const communities = communitiesResult.entries?.map((entry) => entry.data) ?? [];
 const joinResult = Astro.getActionResult(actions.joinOpenSocialCommunity);
 const leaveResult = Astro.getActionResult(actions.leaveOpenSocialCommunity);
 
-const joinStatus =
-  joinResult?.data?.status ??
-  (joinResult?.error ? "error" : null) ??
-  leaveResult?.data?.status ??
-  (leaveResult?.error ? "error" : null);
-
-const statusResult = joinResult?.data?.status || joinResult?.error ? joinResult : leaveResult;
-
-const statusCommunity = statusResult?.data?.community?.trim()
-  ? communities.find((c) => c.handle === statusResult.data.community.trim())
+const outcomeResult = joinResult?.data?.outcome || joinResult?.error ? joinResult : leaveResult;
+const joinOutcome = outcomeResult?.data?.outcome ?? null;
+const joinError = getCommunityActionErrorCopy(outcomeResult?.error, "join");
+const statusHandle = outcomeResult?.data?.community?.trim();
+const statusCommunity = statusHandle
+  ? communities.find((c) => c.handle === statusHandle)
   : undefined;
 
 const loggedInUser = Astro.locals.loggedInUser;
@@ -86,7 +83,8 @@ const regions = [...grouped.keys()].sort(
       </p>
 
       <JoinStatusNotice
-        status={joinStatus}
+        outcome={joinOutcome}
+        error={joinError}
         communityName={statusCommunity?.name}
       />
 
diff --git a/src/pages/community-content.astro b/src/pages/community-content.astro
index 0fd4ddf..f39e316 100644
--- a/src/pages/community-content.astro
+++ b/src/pages/community-content.astro
@@ -12,7 +12,8 @@ import { getMembership } from '../lib/opensocial/membership';
 import { getAtmosphereCommunityDid } from '../lib/community/atmosphere';
 import { getShareCandidates } from '../lib/community/share-candidates';
 import { dedupeFeedEntries } from '../lib/community/dedup-feed';
-import { getShareStatusCopy } from '../lib/community/share-status';
+import { getCommunityActionErrorCopy } from '../lib/community/action-error-copy';
+import { getShareOutcomeCopy } from '../lib/community/share-status';
 
 const joinResult = Astro.getActionResult(actions.joinAtmosphereCommunity);
 const leaveResult = Astro.getActionResult(actions.leaveAtmosphereCommunity);
@@ -49,21 +50,17 @@ if (loggedInUser) {
 }
 
 const isKnownCommunityParticipant = isMember || isAdmin;
-const rawJoinStatus =
-  joinResult?.data?.status ??
-  (joinResult?.error ? 'error' : null) ??
-  leaveResult?.data?.status ??
-  (leaveResult?.error ? 'error' : null);
-const joinStatus = rawJoinStatus &&
-  !(isKnownCommunityParticipant && rawJoinStatus === 'error')
-  ? rawJoinStatus
-  : null;
+const joinOutcomeResult = joinResult?.data?.outcome || joinResult?.error ? joinResult : leaveResult;
+const joinOutcome = joinOutcomeResult?.data?.outcome ?? null;
+const joinError = getCommunityActionErrorCopy(joinOutcomeResult?.error, 'join');
 
-const shareStatus = getShareStatusCopy(
-  shareResult?.data?.status,
-  unshareResult?.data?.status,
-  !!shareResult?.error || !!unshareResult?.error,
+const shareOutcomeResult =
+  shareResult?.data?.outcome || shareResult?.error ? shareResult : unshareResult;
+const shareOutcome = getShareOutcomeCopy(
+  shareResult?.data?.outcome,
+  unshareResult?.data?.outcome,
 );
+const shareError = getCommunityActionErrorCopy(shareOutcomeResult?.error, 'share');
 
 const getUnshareableShareRecordUri = (
   post: (typeof mergedPosts)[number],
@@ -127,10 +124,10 @@ if (shareRepo && canShareContent) {
         >.
       </p>
 
-      <JoinStatusNotice status={joinStatus} />
-      {shareStatus && (
-        <p class={`share-status share-status--${shareStatus.tone}`} role="status">
-          {shareStatus.message}
+      <JoinStatusNotice outcome={joinOutcome} error={joinError} />
+      {(shareOutcome || shareError) && (
+        <p class={`share-status share-status--${(shareOutcome ?? shareError)!.tone}`} role="status">
+          {(shareOutcome ?? shareError)!.message}
         </p>
       )}