From 4d2b27107a6e8d575b2d2b16a5d3b71c3d234557 Mon Sep 17 00:00:00 2001
From: "shakespeare.diy" <assistant@shakespeare.diy>
Date: Thu, 23 Jul 2026 20:35:59 +0700
Subject: [PATCH] =?UTF-8?q?newsletter:=20fix=20Edit=20first=20button=20?=
 =?UTF-8?q?=E2=80=94=20opens=20inline=20textarea,=20Preview=20toggle,=20pu?=
 =?UTF-8?q?blish=20with=20edited=20text?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: shakespeare.diy <assistant@shakespeare.diy>
---
 src/pages/NewsletterPage.tsx | 147 +++++++++++++++++++++--------------
 1 file changed, 88 insertions(+), 59 deletions(-)

diff --git a/src/pages/NewsletterPage.tsx b/src/pages/NewsletterPage.tsx
index 205cf3d..3987341 100644
--- a/src/pages/NewsletterPage.tsx
+++ b/src/pages/NewsletterPage.tsx
@@ -3,6 +3,7 @@ import { useSeoMeta } from '@unhead/react';
 import { Layout } from '@/components/Layout';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
+import { Textarea } from '@/components/ui/textarea';
 import { Link } from 'react-router-dom';
 import { Skeleton } from '@/components/ui/skeleton';
 import {
@@ -249,7 +250,7 @@ function NostrPreviewModal({
   issue: NewsletterIssue;
   open: boolean;
   onClose: () => void;
-  onConfirm: () => void;
+  onConfirm: (text: string) => void;
   isPending: boolean;
 }) {
   const { user } = useCurrentUser();
@@ -260,16 +261,16 @@ function NostrPreviewModal({
   const now = new Date();
   const timeStr = now.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' });
 
-  // Render the nostrText with hashtags highlighted and URL as a link-style span
+  const [editing, setEditing] = useState(false);
+  const [editedText, setEditedText] = useState(issue.nostrText);
+
+  const currentText = editing ? editedText : issue.nostrText;
+
   const renderPreviewText = (text: string) => {
     return text.split('\n').map((line, i) => {
       const parts = line.split(/(\s+)/).map((word, j) => {
-        if (word.startsWith('#')) {
-          return <span key={j} className="text-[#1d9bf0]">{word}</span>;
-        }
-        if (word.startsWith('https://')) {
-          return <span key={j} className="text-[#1d9bf0] underline underline-offset-2">{word}</span>;
-        }
+        if (word.startsWith('#')) return <span key={j} className="text-[#1d9bf0]">{word}</span>;
+        if (word.startsWith('https://')) return <span key={j} className="text-[#1d9bf0] underline underline-offset-2">{word}</span>;
         return <span key={j}>{word}</span>;
       });
       return <p key={i} className={line === '' ? 'h-3' : ''}>{parts}</p>;
@@ -282,64 +283,92 @@ function NostrPreviewModal({
         <DialogHeader>
           <DialogTitle className="text-white flex items-center gap-2">
             <Eye className="h-4 w-4 text-[#ccff00]" />
-            Preview — Drop #{String(issue.number).padStart(3, '0')}
+            {editing ? 'Edit' : 'Preview'} — Drop #{String(issue.number).padStart(3, '0')}
           </DialogTitle>
           <DialogDescription className="text-gray-500 text-xs">
-            This is how the note will appear on most Nostr clients. Formatting varies by client.
+            {editing
+              ? 'Edit the note text below. Changes only affect this publish — the source file stays unchanged.'
+              : 'This is how the note will appear on most Nostr clients. Formatting varies by client.'}
           </DialogDescription>
         </DialogHeader>
 
-        {/* Mock Nostr post card */}
-        <div className="mt-2 rounded-2xl border border-white/10 bg-[#0f0f0f] overflow-hidden">
-          {/* Post header */}
-          <div className="flex items-center gap-3 px-4 pt-4 pb-2">
-            <Avatar className="h-10 w-10 border-2 border-[#ccff00]/30 flex-shrink-0">
-              <AvatarImage src={avatar} alt={displayName} />
-              <AvatarFallback className="bg-[#ccff00]/10 text-[#ccff00] text-xs font-bold">
-                {displayName.slice(0, 2).toUpperCase()}
-              </AvatarFallback>
-            </Avatar>
-            <div className="flex-1 min-w-0">
-              <p className="text-white font-bold text-sm truncate">{displayName}</p>
-              <p className="text-gray-500 text-xs">{timeStr} · via skate-spots.org</p>
+        {editing ? (
+          /* ── Edit mode ── */
+          <div className="space-y-2 mt-2">
+            <Textarea
+              value={editedText}
+              onChange={e => setEditedText(e.target.value)}
+              className="bg-[#0f0f0f] border-white/10 text-gray-200 text-sm font-mono leading-relaxed min-h-[200px] resize-none focus:border-[#ccff00]/40"
+              autoFocus
+            />
+            <p className="text-[10px] text-gray-600 text-right">{editedText.length} characters</p>
+          </div>
+        ) : (
+          /* ── Preview mode ── */
+          <>
+            <div className="mt-2 rounded-2xl border border-white/10 bg-[#0f0f0f] overflow-hidden">
+              <div className="flex items-center gap-3 px-4 pt-4 pb-2">
+                <Avatar className="h-10 w-10 border-2 border-[#ccff00]/30 flex-shrink-0">
+                  <AvatarImage src={avatar} alt={displayName} />
+                  <AvatarFallback className="bg-[#ccff00]/10 text-[#ccff00] text-xs font-bold">
+                    {displayName.slice(0, 2).toUpperCase()}
+                  </AvatarFallback>
+                </Avatar>
+                <div className="flex-1 min-w-0">
+                  <p className="text-white font-bold text-sm truncate">{displayName}</p>
+                  <p className="text-gray-500 text-xs">{timeStr} · via skate-spots.org</p>
+                </div>
+              </div>
+              <div className="px-4 pb-4 text-sm text-gray-200 leading-relaxed space-y-0">
+                {renderPreviewText(currentText)}
+              </div>
+              <div className="flex items-center gap-5 px-4 py-3 border-t border-white/5 text-gray-600 text-xs">
+                <span>💬 0</span><span>🔁 0</span><span>⚡ 0</span>
+              </div>
             </div>
-          </div>
-
-          {/* Post body */}
-          <div className="px-4 pb-4 text-sm text-gray-200 leading-relaxed space-y-0">
-            {renderPreviewText(issue.nostrText)}
-          </div>
-
-          {/* Fake engagement bar */}
-          <div className="flex items-center gap-5 px-4 py-3 border-t border-white/5 text-gray-600 text-xs">
-            <span>💬 0</span>
-            <span>🔁 0</span>
-            <span>⚡ 0</span>
-          </div>
-        </div>
-
-        {/* Character count */}
-        <p className="text-[10px] text-gray-600 text-right -mt-1">
-          {issue.nostrText.length} characters
-        </p>
+            <p className="text-[10px] text-gray-600 text-right -mt-1">{currentText.length} characters</p>
+          </>
+        )}
 
         {/* Actions */}
         <div className="flex gap-3 mt-1">
-          <Button
-            variant="outline"
-            onClick={onClose}
-            className="flex-1 border-gray-700 text-gray-300 hover:text-white h-11"
-          >
-            Edit first
-          </Button>
-          <Button
-            onClick={onConfirm}
-            disabled={isPending}
-            className="flex-1 gap-2 bg-[#ccff00] text-black hover:bg-[#ccff00]/90 font-black uppercase text-xs h-11"
-          >
-            <Send className="h-3.5 w-3.5" />
-            {isPending ? 'Publishing...' : 'Publish'}
-          </Button>
+          {editing ? (
+            <>
+              <Button
+                variant="outline"
+                onClick={() => setEditing(false)}
+                className="flex-1 border-gray-700 text-gray-300 hover:text-white h-11"
+              >
+                Preview
+              </Button>
+              <Button
+                onClick={() => onConfirm(editedText)}
+                disabled={isPending || editedText.trim().length === 0}
+                className="flex-1 gap-2 bg-[#ccff00] text-black hover:bg-[#ccff00]/90 font-black uppercase text-xs h-11"
+              >
+                <Send className="h-3.5 w-3.5" />
+                {isPending ? 'Publishing...' : 'Publish'}
+              </Button>
+            </>
+          ) : (
+            <>
+              <Button
+                variant="outline"
+                onClick={() => { setEditedText(issue.nostrText); setEditing(true); }}
+                className="flex-1 border-gray-700 text-gray-300 hover:text-white h-11"
+              >
+                Edit first
+              </Button>
+              <Button
+                onClick={() => onConfirm(currentText)}
+                disabled={isPending}
+                className="flex-1 gap-2 bg-[#ccff00] text-black hover:bg-[#ccff00]/90 font-black uppercase text-xs h-11"
+              >
+                <Send className="h-3.5 w-3.5" />
+                {isPending ? 'Publishing...' : 'Publish'}
+              </Button>
+            </>
+          )}
         </div>
       </DialogContent>
     </Dialog>
@@ -365,11 +394,11 @@ function PublishToNostrButton({ issue }: { issue: NewsletterIssue }) {
     );
   }
 
-  const handleConfirmPublish = async () => {
+  const handleConfirmPublish = async (text: string) => {
     try {
       await publishEvent({
         kind: 1,
-        content: issue.nostrText,
+        content: text,
         tags: [
           ['t', 'skateboarding'],
           ['t', 'nostr'],