Merge branch 'master' into fix/duplicate-content

Author: sandren

apps/web/core/hooks/use-request-to-be-editor.ts

@@ -7,9 +7,11 @@ import { useCallback } from 'react';
 
 import { Effect, Either } from 'effect';
 
+import { normalizeSpaceId } from '~/core/access/space-access';
 import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
 import { useSmartAccount } from '~/core/hooks/use-smart-account';
 import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
+import { getIsEditorOfSpace } from '~/core/io/queries';
 import { useStatusBar } from '~/core/state/status-bar-store';
 import { runEffectEither } from '~/core/telemetry/effect-runtime';
 import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
@@ -47,6 +49,17 @@ export function useRequestToBeEditor({ spaceId }: UseRequestToBeEditorArgs) {
       throw new Error('Invalid target space ID');
     }
 
+    // Existing editors already belong to the space; a duplicate editor request errors on vote.
+    // Check at submit time rather than via reactive access-control state, which reads false
+    // while still hydrating and would let a fast click through. Fail open if the check errors.
+    const access = await runEffectEither(
+      getIsEditorOfSpace(normalizeSpaceId(spaceId), normalizeSpaceId(personalSpaceId))
+    );
+    if (Either.isRight(access) && access.right) {
+      dispatch({ type: 'ERROR', payload: 'You are already an editor of this space' });
+      throw new Error('User is already an editor of the space');
+    }
+
     console.log('Requesting to be editor', {
       authorSpaceId: personalSpaceId,
       spaceId,

apps/web/core/hooks/use-request-to-be-member.ts

@@ -7,9 +7,11 @@ import { useCallback } from 'react';
 
 import { Effect, Either } from 'effect';
 
+import { normalizeSpaceId } from '~/core/access/space-access';
 import { usePersonalSpaceId } from '~/core/hooks/use-personal-space-id';
 import { useSmartAccount } from '~/core/hooks/use-smart-account';
 import { useSmartAccountTransaction } from '~/core/hooks/use-smart-account-transaction';
+import { getIsEditorOfSpace, getIsMemberOfSpace } from '~/core/io/queries';
 import { useStatusBar } from '~/core/state/status-bar-store';
 import { runEffectEither } from '~/core/telemetry/effect-runtime';
 import { SPACE_REGISTRY_ADDRESS } from '~/core/utils/contracts/space-registry';
@@ -47,6 +49,22 @@ export function useRequestToBeMember({ spaceId }: UseRequestToBeMemberArgs) {
       throw new Error('Invalid target space ID');
     }
 
+    // Members/editors already belong to the space; a duplicate join request errors on vote.
+    // Check at submit time rather than via reactive access-control state, which reads false
+    // while still hydrating and would let a fast click through. Fail open if the check errors.
+    const normalizedSpaceId = normalizeSpaceId(spaceId);
+    const normalizedPersonalSpaceId = normalizeSpaceId(personalSpaceId);
+    const access = await runEffectEither(
+      Effect.all([
+        getIsMemberOfSpace(normalizedSpaceId, normalizedPersonalSpaceId),
+        getIsEditorOfSpace(normalizedSpaceId, normalizedPersonalSpaceId),
+      ])
+    );
+    if (Either.isRight(access) && (access.right[0] || access.right[1])) {
+      dispatch({ type: 'ERROR', payload: 'You are already a member of this space' });
+      throw new Error('User is already a member or editor of the space');
+    }
+
     console.log('Requesting to be member', {
       authorSpaceId: personalSpaceId,
       spaceId,

apps/web/partials/space-page/space-members-popover-content.tsx

@@ -18,6 +18,7 @@ interface Props {
   spaceId: string;
   isPublicSpace: boolean;
   isMember: boolean;
+  isEditor: boolean;
   hasRequestedSpaceMembership: boolean;
   connectedAddress: string | null;
 }
@@ -26,6 +27,7 @@ export function SpaceMembersContent({
   spaceId,
   isPublicSpace,
   isMember,
+  isEditor,
   hasRequestedSpaceMembership,
   connectedAddress,
 }: Props) {
@@ -59,7 +61,7 @@ export function SpaceMembersContent({
               <button className="text-smallButton text-grey-04 transition-colors duration-75 hover:text-text">
                 {connectedAddress ? 'Leave space' : 'Sign in to join'}
               </button>
-            ) : connectedAddress ? (
+            ) : isEditor ? null : connectedAddress ? (
               <SpaceMembersPopoverMemberRequestButton
                 spaceId={spaceId}
                 hasRequestedSpaceMembership={hasRequestedSpaceMembership}

apps/web/partials/space-page/space-members.tsx

@@ -46,12 +46,15 @@ export async function SpaceMembers({ spaceId }: Props) {
       spaceId={spaceId}
       isPublicSpace={isPublicSpace}
       isMember={isMember}
+      isEditor={isEditor}
       hasRequestedSpaceMembership={hasRequestedSpaceMembership}
       connectedAddress={connectedAddress ?? null}
     />
   );
 
-  if (isMember) {
+  // Editors aren't always in the members list, but they already belong to the space — treat
+  // them as joined so they don't see (and can't fire) a duplicate membership request.
+  if (isMember || isEditor) {
     return (
       <div className="flex h-6 items-center gap-1.5 rounded border border-grey-02 pr-2 pl-1.5 text-metadata shadow-button transition-colors duration-150 focus-within:border-text">
         <SpaceMembersPopover trigger={<SpaceMembersChip spaceId={spaceId} />} content={popoverContent} />