Skip to content

Commit c04f1d0

Browse files
authored
Merge pull request #34 from JonDevOps/claude/announce-box
Announce box for admins (#530)
2 parents 055f332 + 504e9e6 commit c04f1d0

6 files changed

Lines changed: 332 additions & 4 deletions

File tree

‎firestore.indexes.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,20 @@
209209
"order": "DESCENDING"
210210
}
211211
]
212+
},
213+
{
214+
"collectionGroup": "announcements",
215+
"queryScope": "COLLECTION",
216+
"fields": [
217+
{
218+
"fieldPath": "isActive",
219+
"order": "ASCENDING"
220+
},
221+
{
222+
"fieldPath": "endTime",
223+
"order": "ASCENDING"
224+
}
225+
]
212226
}
213227
],
214228
"fieldOverrides": []

‎firestore.rules‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ service cloud.firestore {
2828
return request.auth != null && request.auth.token.moderator == true;
2929
}
3030

31+
// Admins have the `admin` claim too (scripts/set-moderator.mjs); they
32+
// manage the moderation team and post site-wide announcements
33+
function isAdmin() {
34+
return request.auth != null && request.auth.token.admin == true;
35+
}
36+
3137
// ---- Moderators acting on members' groups, meetups and other items ----
3238
// Every such action is saved with a new moderationLog entry in the same
3339
// write (src/app/moderation/useItemModeration.ts), so it's on the record.
@@ -345,9 +351,31 @@ service cloud.firestore {
345351
allow delete: if request.auth != null && resource.data.uid == request.auth.uid;
346352
}
347353

354+
// Site-wide announcements, shown in the banner at the top of every page
355+
// and on /news. Admins (the `admin` claim) post them from the Announce tab
356+
// on /moderation, can end them early, and can delete them.
348357
match /announcements/{announcementId} {
349358
allow read: if true;
350-
allow write: if false;
359+
allow create: if isAdmin()
360+
&& isValidAnnouncement(request.resource.data)
361+
&& request.resource.data.createdBy == request.auth.uid
362+
&& request.resource.data.createdAt == request.time;
363+
allow update: if isAdmin()
364+
&& isValidAnnouncement(request.resource.data)
365+
&& request.resource.data.diff(resource.data).affectedKeys().hasOnly(['isActive', 'endTime']);
366+
allow delete: if isAdmin();
367+
}
368+
369+
function isValidAnnouncement(data) {
370+
return data.keys().hasOnly(['title', 'message', 'type', 'link', 'startTime', 'endTime', 'isActive', 'createdAt', 'createdBy'])
371+
&& data.keys().hasAll(['title', 'message', 'type', 'startTime', 'endTime', 'isActive', 'createdAt', 'createdBy'])
372+
&& data.title is string && data.title.size() >= 1 && data.title.size() <= 80
373+
&& data.message is string && data.message.size() >= 1 && data.message.size() <= 300
374+
&& data.type in ['info', 'warning', 'success', 'alert']
375+
&& (!('link' in data) || (data.link is string && data.link.size() <= 300
376+
&& data.link.matches('https://[^\\s]+|/([^/\\s][^\\s]*)?')))
377+
&& data.startTime is timestamp && data.endTime is timestamp && data.endTime > data.startTime
378+
&& data.isActive is bool && data.createdAt is timestamp && data.createdBy is string;
351379
}
352380

353381
// w3Develops' own posts (community insights and news roundups), written
Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
'use client';
2+
3+
import { useMemo, useState } from 'react';
4+
import { Timestamp, addDoc, collection, deleteDoc, doc, limit, orderBy, query, serverTimestamp, updateDoc } from 'firebase/firestore';
5+
import { useCollection, useFirestore, useUser } from '@/firebase';
6+
import { Badge } from '@/components/ui/badge';
7+
import { Button } from '@/components/ui/button';
8+
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
9+
import { Input } from '@/components/ui/input';
10+
import { Label } from '@/components/ui/label';
11+
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
12+
import { Textarea } from '@/components/ui/textarea';
13+
import { useToast } from '@/components/ui/use-toast';
14+
import ZonedText from '@/components/ZonedText';
15+
import { useNow } from '@/lib/hooks/useClientValues';
16+
import { formatTimestamp } from '@/lib/utils';
17+
import type { GlobalAnnouncement } from '@/lib/types';
18+
19+
const TYPES: { value: GlobalAnnouncement['type']; label: string }[] = [
20+
{ value: 'info', label: 'Info (blue)' },
21+
{ value: 'success', label: 'Good news (green)' },
22+
{ value: 'warning', label: 'Heads up (yellow)' },
23+
{ value: 'alert', label: 'Urgent (red)' },
24+
];
25+
26+
const DAY = 24 * 60 * 60 * 1000;
27+
const DURATIONS = [
28+
{ value: '1', label: '1 day' },
29+
{ value: '3', label: '3 days' },
30+
{ value: '7', label: '1 week' },
31+
{ value: '14', label: '2 weeks' },
32+
{ value: '30', label: '1 month' },
33+
];
34+
35+
const TITLE_MAX = 80;
36+
const MESSAGE_MAX = 300;
37+
38+
/** A link the rules accept: https://... or a page on this site like /events */
39+
function isValidLink(link: string): boolean {
40+
return /^https:\/\/\S+$/.test(link) || /^\/([^/\s]\S*)?$/.test(link);
41+
}
42+
43+
/**
44+
* Admins post site-wide announcements here. The newest live one shows in the
45+
* banner at the top of every page, and recent ones are listed on /news.
46+
* firestore.rules lets only the `admin` claim write them.
47+
*/
48+
export default function AnnouncementsAdmin() {
49+
const firestore = useFirestore();
50+
const { user } = useUser();
51+
const { toast } = useToast();
52+
const now = useNow();
53+
const [title, setTitle] = useState('');
54+
const [message, setMessage] = useState('');
55+
const [type, setType] = useState<GlobalAnnouncement['type']>('info');
56+
const [link, setLink] = useState('');
57+
const [days, setDays] = useState('7');
58+
const [busy, setBusy] = useState<string | null>(null);
59+
60+
const recentQuery = useMemo(() => query(collection(firestore, 'announcements'), orderBy('createdAt', 'desc'), limit(20)), [firestore]);
61+
const { data: recent } = useCollection<GlobalAnnouncement>(recentQuery);
62+
63+
const trimmedLink = link.trim();
64+
const linkError = trimmedLink && !isValidLink(trimmedLink) ? 'Use a full https:// link, or a page here like /events.' : '';
65+
const canPost = !!user && title.trim() && message.trim() && !linkError && busy === null;
66+
67+
const post = async () => {
68+
if (!user || !canPost) return;
69+
setBusy('new');
70+
try {
71+
const start = Timestamp.now();
72+
await addDoc(collection(firestore, 'announcements'), {
73+
title: title.trim(),
74+
message: message.trim(),
75+
type,
76+
...(trimmedLink ? { link: trimmedLink } : {}),
77+
startTime: start,
78+
endTime: Timestamp.fromMillis(start.toMillis() + Number(days) * DAY),
79+
isActive: true,
80+
createdAt: serverTimestamp(),
81+
createdBy: user.uid,
82+
});
83+
toast({ title: 'Announcement posted', description: 'It shows at the top of every page now.' });
84+
setTitle('');
85+
setMessage('');
86+
setLink('');
87+
} catch {
88+
toast({ variant: 'destructive', title: "Couldn't post it", description: 'Only admins can post announcements.' });
89+
} finally {
90+
setBusy(null);
91+
}
92+
};
93+
94+
const end = async (id: string) => {
95+
setBusy(id);
96+
try {
97+
await updateDoc(doc(firestore, 'announcements', id), { isActive: false });
98+
toast({ title: 'Announcement ended' });
99+
} catch {
100+
toast({ variant: 'destructive', title: "Couldn't end it" });
101+
} finally {
102+
setBusy(null);
103+
}
104+
};
105+
106+
const remove = async (id: string) => {
107+
if (!window.confirm('Delete this announcement? It will also disappear from /news.')) return;
108+
setBusy(id);
109+
try {
110+
await deleteDoc(doc(firestore, 'announcements', id));
111+
toast({ title: 'Announcement deleted' });
112+
} catch {
113+
toast({ variant: 'destructive', title: "Couldn't delete it" });
114+
} finally {
115+
setBusy(null);
116+
}
117+
};
118+
119+
return (
120+
<div className="space-y-4">
121+
<Card>
122+
<CardHeader className="pb-2">
123+
<CardTitle className="text-base">Post an announcement</CardTitle>
124+
<CardDescription>
125+
It shows in a banner at the top of every page until it ends, and on the news page. Members can close the banner.
126+
</CardDescription>
127+
</CardHeader>
128+
<CardContent className="space-y-3">
129+
<div className="space-y-1">
130+
<Label htmlFor="announce-title">Title</Label>
131+
<Input id="announce-title" value={title} maxLength={TITLE_MAX} onChange={e => setTitle(e.target.value)} placeholder="New study groups start Monday" />
132+
</div>
133+
<div className="space-y-1">
134+
<Label htmlFor="announce-message">Message</Label>
135+
<Textarea id="announce-message" value={message} maxLength={MESSAGE_MAX} rows={3} onChange={e => setMessage(e.target.value)} />
136+
<p className="text-xs text-muted-foreground text-right">{message.length}/{MESSAGE_MAX}</p>
137+
</div>
138+
<div className="space-y-1">
139+
<Label htmlFor="announce-link">Link (optional)</Label>
140+
<Input id="announce-link" value={link} maxLength={300} onChange={e => setLink(e.target.value)} placeholder="/studygroups or https://..." />
141+
{linkError && <p className="text-xs text-destructive">{linkError}</p>}
142+
</div>
143+
<div className="grid gap-3 sm:grid-cols-2">
144+
<div className="space-y-1">
145+
<Label>Style</Label>
146+
<Select value={type} onValueChange={value => setType(value as GlobalAnnouncement['type'])}>
147+
<SelectTrigger><SelectValue /></SelectTrigger>
148+
<SelectContent>{TYPES.map(t => <SelectItem key={t.value} value={t.value}>{t.label}</SelectItem>)}</SelectContent>
149+
</Select>
150+
</div>
151+
<div className="space-y-1">
152+
<Label>Show it for</Label>
153+
<Select value={days} onValueChange={setDays}>
154+
<SelectTrigger><SelectValue /></SelectTrigger>
155+
<SelectContent>{DURATIONS.map(d => <SelectItem key={d.value} value={d.value}>{d.label}</SelectItem>)}</SelectContent>
156+
</Select>
157+
</div>
158+
</div>
159+
<Button onClick={post} disabled={!canPost}>{busy === 'new' ? 'Posting...' : 'Post announcement'}</Button>
160+
</CardContent>
161+
</Card>
162+
163+
<Card>
164+
<CardHeader className="pb-2"><CardTitle className="text-base">Recent announcements</CardTitle></CardHeader>
165+
<CardContent className="space-y-3">
166+
{recent && recent.length === 0 && <p className="text-sm text-muted-foreground">None yet.</p>}
167+
{recent?.map(item => {
168+
const live = item.isActive && item.endTime && now !== null && item.endTime.toMillis() > now;
169+
return (
170+
<div key={item.id} className="border rounded-md p-3 space-y-1">
171+
<div className="flex items-center justify-between gap-2">
172+
<p className="font-medium">{item.title}</p>
173+
<Badge variant={live ? 'default' : 'secondary'}>{live ? 'Live' : 'Ended'}</Badge>
174+
</div>
175+
<p className="text-sm text-muted-foreground">{item.message}</p>
176+
{item.link && <p className="text-xs break-all">{item.link}</p>}
177+
{item.endTime && (
178+
<p className="text-xs text-muted-foreground">
179+
{live ? 'Ends ' : 'Ended '}<ZonedText render={tz => formatTimestamp(item.endTime, true, tz)} />
180+
</p>
181+
)}
182+
<div className="flex gap-2 pt-1">
183+
{live && <Button size="sm" variant="outline" disabled={busy !== null} onClick={() => end(item.id)}>End now</Button>}
184+
<Button size="sm" variant="ghost" disabled={busy !== null} onClick={() => remove(item.id)}>Delete</Button>
185+
</div>
186+
</div>
187+
);
188+
})}
189+
</CardContent>
190+
</Card>
191+
</div>
192+
);
193+
}

‎src/app/moderation/ModerationQueue.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { useDocsByIds } from '@/lib/hooks/useDocsByIds';
2323
import { MODERATION_ACTIONS, POST_REPORT_REASONS, SUSPENSION_DAYS } from '@/lib/member-posts';
2424
import { formatTimestamp } from '@/lib/utils';
2525
import type { Appeal, MemberPost, MemberStanding, ModerationLogEntry, PostReply, Report, UserProfile } from '@/lib/types';
26+
import AnnouncementsAdmin from './AnnouncementsAdmin';
2627
import ModerationTeam from './ModerationTeam';
2728
import WritingReview from './WritingReview';
2829
import { useModerationActions, type ActionRequest, type ModeratorAction } from './useModerationActions';
@@ -422,6 +423,7 @@ function Queue({ isAdmin }: { isAdmin: boolean }) {
422423
<TabsTrigger value="writing">Writing</TabsTrigger>
423424
<TabsTrigger value="log">Log</TabsTrigger>
424425
<TabsTrigger value="team">Team</TabsTrigger>
426+
{isAdmin && <TabsTrigger value="announce">Announce</TabsTrigger>}
425427
</TabsList>
426428

427429
<TabsContent value="posts" className="space-y-4">
@@ -470,6 +472,12 @@ function Queue({ isAdmin }: { isAdmin: boolean }) {
470472
<ModerationTeam isAdmin={isAdmin} />
471473
</TabsContent>
472474

475+
{isAdmin && (
476+
<TabsContent value="announce">
477+
<AnnouncementsAdmin />
478+
</TabsContent>
479+
)}
480+
473481
<TabsContent value="log">
474482
<Card>
475483
<CardHeader className="pb-2"><CardTitle className="text-base">Latest moderation actions</CardTitle></CardHeader>

‎src/components/AnnouncementBanner.tsx‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ const typeIcons = {
2323
alert: <Megaphone className="h-5 w-5" />,
2424
};
2525

26+
const DISMISSED_KEY = 'w3-dismissed-announcement';
27+
2628
export default function AnnouncementBanner() {
2729
const firestore = useFirestore();
28-
const [isVisible, setIsVisible] = useState(true);
30+
// Closed announcements stay closed on this browser (by id), so a new one still shows
31+
// (read on first render: the banner renders nothing until its query loads, so the server and browser still match)
32+
const [dismissedId, setDismissedId] = useState<string | null>(() => {
33+
try { return typeof window === 'undefined' ? null : localStorage.getItem(DISMISSED_KEY); } catch { return null; }
34+
});
2935
const [now, setNow] = useState<Timestamp>(Timestamp.now());
3036

3137
// Update 'now' every minute to handle time-based expiration
@@ -54,7 +60,12 @@ export default function AnnouncementBanner() {
5460
return item;
5561
}, [announcements, now]);
5662

57-
if (isLoading || !activeAnnouncement || !isVisible) {
63+
const dismiss = (id: string) => {
64+
setDismissedId(id);
65+
try { localStorage.setItem(DISMISSED_KEY, id); } catch { /* storage blocked */ }
66+
};
67+
68+
if (isLoading || !activeAnnouncement || activeAnnouncement.id === dismissedId) {
5869
return null;
5970
}
6071

@@ -76,7 +87,7 @@ export default function AnnouncementBanner() {
7687
</div>
7788
</div>
7889
<button
79-
onClick={() => setIsVisible(false)}
90+
onClick={() => dismiss(activeAnnouncement.id)}
8091
className="absolute right-2 p-1 hover:bg-black/10 rounded-full"
8192
aria-label="Dismiss announcement"
8293
>

0 commit comments

Comments
 (0)