Skip to content

Fix comment submission turnstile handling #13240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dillchen wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −13
Open

Fix comment submission turnstile handling #13240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions ...ges/commonwealth/client/scripts/views/components/Comments/CommentEditor/CommentEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { useAiCompletion } from 'state/api/ai';
import { generateCommentPrompt } from 'state/api/ai/prompts';
import useGetCommunityByIdQuery from 'state/api/communities/getCommuityById';
import { useAIFeatureEnabled, useUserAiSettingsStore } from 'state/ui/user';
import { useTurnstile } from 'views/components/useTurnstile';
import { User } from 'views/components/user/user';
import { jumpHighlightComment } from 'views/pages/discussions/CommentTree/helpers';
import { ImageActionModal } from '../../ImageActionModal/ImageActionModal';
Expand Down Expand Up @@ -53,6 +52,10 @@ export type CommentEditorProps = {
webSearchEnabled?: boolean;
setWebSearchEnabled?: (enabled: boolean) => void;
communityId?: string;
isTurnstileEnabled?: boolean;
turnstileToken?: string | null;
resetTurnstile?: () => void;
TurnstileWidget?: React.FC;
};

// eslint-disable-next-line react/display-name
Expand Down Expand Up @@ -81,6 +84,10 @@ const CommentEditor = forwardRef<unknown, CommentEditorProps>(
webSearchEnabled,
setWebSearchEnabled,
communityId,
isTurnstileEnabled = false,
turnstileToken,
resetTurnstile,
TurnstileWidget,
},
_ref,
) => {
Expand All @@ -102,15 +109,6 @@ const CommentEditor = forwardRef<unknown, CommentEditorProps>(

const { generateCompletion } = useAiCompletion();

const {
resetTurnstile,
turnstileToken,
isTurnstileEnabled,
TurnstileWidget,
} = useTurnstile({
action: 'create-comment',
});

// Fetch community details
const { data: community } = useGetCommunityByIdQuery({
id: thread?.communityId || '',
Expand Down Expand Up @@ -162,6 +160,7 @@ ${parentCommentText ? `Parent Comment: ${parentCommentText}` : ''}`;
});
};

const TurnstileWidgetComponent = TurnstileWidget ?? (() => <></>);
const handleEnhancedSubmit = async () => {
// Immediately close the editor before any operations
onCancel?.(
Expand All @@ -182,7 +181,7 @@ ${parentCommentText ? `Parent Comment: ${parentCommentText}` : ''}`;
} catch (error) {
console.error('Failed to submit comment:', error);
if (isTurnstileEnabled) {
resetTurnstile();
resetTurnstile?.();
}
return;
}
Expand Down Expand Up @@ -236,7 +235,7 @@ ${parentCommentText ? `Parent Comment: ${parentCommentText}` : ''}`;
} catch (error) {
console.error('Error during submission:', error);
if (isTurnstileEnabled) {
resetTurnstile();
resetTurnstile?.();
}
}
};
Expand Down Expand Up @@ -316,7 +315,7 @@ ${parentCommentText ? `Parent Comment: ${parentCommentText}` : ''}`;
placeholder={placeholder}
/>

{isTurnstileEnabled && <TurnstileWidget />}
{isTurnstileEnabled && <TurnstileWidgetComponent />}

<div className="form-bottom">
<div className="form-buttons">
Expand Down
4 changes: 4 additions & 0 deletions ...onwealth/client/scripts/views/components/StickEditorContainer/StickyInput/StickyInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@ const StickyInput = (props: StickyInputProps) => {
webSearchEnabled={webSearchEnabled}
setWebSearchEnabled={setWebSearchEnabled}
communityId={props.communityId}
isTurnstileEnabled={isTurnstileEnabled}
turnstileToken={turnstileToken}
resetTurnstile={resetTurnstile}
TurnstileWidget={TurnstileWidget}
/>
)}
</div>
Expand Down
Loading