From 01143d3ec9df977c0174161194e84631c8c730ba Mon Sep 17 00:00:00 2001
From: nmemmert <nmemmert@users.noreply.github.com>
Date: Thu, 21 May 2026 14:39:30 -0400
Subject: [PATCH] Add community question message type with pre-fill from study
 community

---
 src/colossiansStudy.tsx        |  4 ++--
 src/components/ContactForm.tsx | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/colossiansStudy.tsx b/src/colossiansStudy.tsx
index 217665e..58a4b2f 100644
--- a/src/colossiansStudy.tsx
+++ b/src/colossiansStudy.tsx
@@ -1151,7 +1151,7 @@ export function ColossiansStudySectionPage({ content }: Props) {
               </ol>
               <div style={{ marginTop: '1.25rem', display: 'flex', gap: '0.75rem', flexWrap: 'wrap' }}>
                 <Link to={`/study/${study.slug}/community`} className="btn-primary">Go to Community</Link>
-                <Link to="/contact" className="btn-secondary">Ask Nate</Link>
+                <Link to={`/contact?source=community&study=${encodeURIComponent(study.title)}`} className="btn-secondary">Ask Nate</Link>
               </div>
             </article>
           </div>
@@ -1879,7 +1879,7 @@ export function StudyCommunityPage({ content }: Props) {
           <p className="study-course-hero-copy">Talk with other enrolled students. Keep it gracious and on topic.</p>
           <div className="study-course-hero-actions">
             <Link to={`/study/${study.slug}`} className="btn-secondary">Back to Study</Link>
-            <Link to="/contact" className="btn-primary">Ask Nate</Link>
+            <Link to={`/contact?source=community&study=${encodeURIComponent(study.title)}`} className="btn-primary">Ask Nate</Link>
           </div>
         </div>
       </section>
diff --git a/src/components/ContactForm.tsx b/src/components/ContactForm.tsx
index eedc9d7..09ae72f 100644
--- a/src/components/ContactForm.tsx
+++ b/src/components/ContactForm.tsx
@@ -1,6 +1,6 @@
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import type { ChangeEvent } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 
 interface ContactFields {
   firstName: string
@@ -12,13 +12,27 @@ interface ContactFields {
 
 export default function ContactForm() {
   const navigate = useNavigate()
+  const [searchParams] = useSearchParams()
+  const source = searchParams.get('source')
+  const studyName = searchParams.get('study')
+  
   const [fields, setFields] = useState<ContactFields>({
     firstName: '',
     lastName: '',
     email: '',
     message: '',
-    messageType: 'question',
+    messageType: source === 'community' ? 'community' : 'question',
   })
+
+  useEffect(() => {
+    if (source === 'community' && studyName) {
+      setFields(f => ({
+        ...f,
+        messageType: 'community',
+        message: f.message.startsWith('[From ') ? f.message : `[From ${decodeURIComponent(studyName)} community]\n\n${f.message}`,
+      }))
+    }
+  }, [source, studyName])
   const [subscribe, setSubscribe] = useState(true)
   const [honey, setHoney] = useState('')
   const [status, setStatus] = useState<'idle' | 'submitting' | 'error'>('idle')
@@ -85,6 +99,7 @@ export default function ContactForm() {
         Message Type
         <select name="messageType" value={fields.messageType} onChange={handleSelectChange}>
           <option value="question">Bible Question</option>
+          <option value="community">Community Question</option>
           <option value="testimony">Testimony</option>
           <option value="topic">Topic Request</option>
           <option value="general">General Message</option>