@openpeepshq/react 0.7.0 → 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/configuration/ConfigurationCategory.js +3 -2
- package/dist/components/configuration/ConfigurationList.js +1 -1
- package/dist/components/form/LocationInput.js +1 -1
- package/dist/components/jams/JamCapacityGate.js +1 -1
- package/dist/components/jams/JamConference.js +2 -0
- package/dist/components/jams/JamParticipantConference.js +2 -0
- package/dist/components/jams/JamRoom.js +2 -3
- package/dist/components/jams/LiveJamsSection.js +8 -2
- package/dist/components/jams/LivekitUnavailableNotice.d.ts +9 -0
- package/dist/components/jams/LivekitUnavailableNotice.js +19 -0
- package/dist/components/jams/dropLateAudio.d.ts +22 -0
- package/dist/components/jams/dropLateAudio.js +115 -0
- package/dist/components/jams/index.d.ts +1 -0
- package/dist/components/jams/index.js +1 -0
- package/dist/components/notifications/TypedNotification.js +46 -4
- package/dist/components/post/Markdown.d.ts +2 -2
- package/dist/components/post/Markdown.js +1 -1
- package/dist/components/post/attachmentPreview.js +1 -1
- package/dist/components/post/pieces/Attachments.js +23 -17
- package/dist/components/post/pieces/EventRsvpButton.js +37 -7
- package/dist/components/post/pieces/EventRsvpList.js +23 -3
- package/dist/components/post/pieces/EventRsvpScopeDialog.d.ts +1 -1
- package/dist/components/post/pieces/EventRsvpScopeDialog.js +34 -22
- package/dist/components/post/pieces/EventWaitlistJoinDialog.d.ts +10 -0
- package/dist/components/post/pieces/EventWaitlistJoinDialog.js +26 -0
- package/dist/components/post/pieces/ParticipantsCard.d.ts +1 -1
- package/dist/components/post/pieces/ParticipantsCard.js +1 -1
- package/dist/components/post/pieces/PostActions.d.ts +1 -1
- package/dist/components/post/pieces/PostActions.js +20 -12
- package/dist/components/post/pieces/ShareMenu.d.ts +6 -1
- package/dist/components/post/pieces/ShareMenu.js +40 -7
- package/dist/components/post/post-form/EventForm.js +10 -2
- package/dist/components/post/types/Article.js +1 -1
- package/dist/components/post/types/article/FullArticle.js +1 -1
- package/dist/components/post/types/event/CardEvent.js +2 -1
- package/dist/components/post/types/event/FullEvent.js +22 -13
- package/dist/components/post/types/event/ProfileEventRelationship.js +8 -0
- package/dist/components/preview-link/LocalPreviewLink.js +4 -2
- package/dist/components/preview-link/PreviewLink.js +1 -1
- package/dist/components/preview-link/helpers.d.ts +5 -0
- package/dist/components/preview-link/helpers.js +27 -1
- package/dist/components/preview-link/local/WelcomePreview.d.ts +1 -0
- package/dist/components/preview-link/local/WelcomePreview.js +6 -0
- package/dist/components/profile/Avatar.js +2 -2
- package/dist/components/profile/ProfileFromId.js +1 -1
- package/dist/components/server-data/context.d.ts +1 -0
- package/dist/contexts/openpeeps/hooks/accounts.d.ts +5 -5
- package/dist/contexts/openpeeps/hooks/accounts.js +1 -3
- package/dist/contexts/openpeeps/hooks/admin.d.ts +165 -66
- package/dist/contexts/openpeeps/hooks/admin.js +11 -3
- package/dist/contexts/openpeeps/hooks/auth.d.ts +2 -2
- package/dist/contexts/openpeeps/hooks/groups.d.ts +8 -8
- package/dist/contexts/openpeeps/hooks/jams.d.ts +73 -24
- package/dist/contexts/openpeeps/hooks/other.d.ts +7 -6
- package/dist/contexts/openpeeps/hooks/payments.d.ts +2 -2
- package/dist/contexts/openpeeps/hooks/posts.d.ts +368 -170
- package/dist/contexts/openpeeps/hooks/streaming.d.ts +1 -1
- package/dist/hooks/admin/useCanAccessAdminSection.d.ts +13 -0
- package/dist/hooks/admin/useCanAccessAdminSection.js +21 -0
- package/dist/hooks/events/useEventComposer.d.ts +94 -41
- package/dist/hooks/events/useEventForm.d.ts +1 -0
- package/dist/hooks/events/useEventRsvp.d.ts +11 -2
- package/dist/hooks/events/useEventRsvp.js +46 -5
- package/dist/hooks/events/useEventsCalendar.d.ts +174 -76
- package/dist/hooks/groups/useNewGroup.js +22 -2
- package/dist/hooks/index.d.ts +5 -1
- package/dist/hooks/index.js +4 -1
- package/dist/hooks/jams/useCanDiagnoseLivekit.d.ts +2 -0
- package/dist/hooks/jams/useCanDiagnoseLivekit.js +3 -0
- package/dist/hooks/jams/useCreateNewJamForm.d.ts +3 -1
- package/dist/hooks/jams/useJamDetails.d.ts +87 -38
- package/dist/hooks/jams/useJamLobby.d.ts +1 -0
- package/dist/hooks/jams/useJamRoom.d.ts +175 -76
- package/dist/hooks/posts/useArticleComposer.d.ts +93 -41
- package/dist/hooks/posts/useFeedPostPresentation.d.ts +174 -76
- package/dist/hooks/posts/usePostDetailTitle.d.ts +87 -38
- package/dist/hooks/posts/useResourceComposer.d.ts +93 -41
- package/dist/hooks/posts/useResourceComposer.js +4 -2
- package/dist/hooks/posts/useShareMenu.d.ts +2 -0
- package/dist/hooks/posts/useShareMenu.js +7 -0
- package/dist/hooks/resources/useResourceLibrary.d.ts +176 -78
- package/dist/hooks/settings/useNotificationPreferences.d.ts +1 -1
- package/dist/hooks/useWelcomePreview.d.ts +13 -0
- package/dist/hooks/useWelcomePreview.js +39 -0
- package/dist/lib/groupFormErrors.d.ts +1 -0
- package/dist/lib/groupFormErrors.js +5 -2
- package/dist/lib/threadHelpers.js +1 -5
- package/dist/pages/admin/ConfigurationCommunity.js +1 -1
- package/dist/pages/admin/Diagnostics.js +1 -1
- package/dist/pages/admin/DiagnosticsLivekit.d.ts +1 -0
- package/dist/pages/admin/DiagnosticsLivekit.js +50 -0
- package/dist/pages/admin/Invites.js +5 -3
- package/dist/pages/admin/Media.d.ts +1 -0
- package/dist/pages/admin/Media.js +135 -0
- package/dist/pages/admin/community/CommunityForbiddenUsernames.d.ts +1 -0
- package/dist/pages/admin/community/CommunityForbiddenUsernames.js +106 -0
- package/dist/pages/admin/community/CommunityRoles.js +1 -1
- package/dist/pages/admin/community/useCommunityConfig.d.ts +2 -0
- package/dist/pages/admin/components/EditInviteLinkModal.d.ts +5 -0
- package/dist/pages/admin/components/EditInviteLinkModal.js +131 -0
- package/dist/pages/auth/Register.js +30 -8
- package/dist/pages/conversations/Show.js +11 -0
- package/dist/pages/index.d.ts +3 -0
- package/dist/pages/index.js +3 -0
- package/dist/pages/jams/Index.js +2 -4
- package/dist/pages/settings/PublicProfile.js +15 -3
- package/dist/pwa/sw.d.ts +0 -1
- package/dist/react-native.d.ts +1 -0
- package/dist/react-native.js +1 -0
- package/dist/stores/newPosts.d.ts +4 -2
- package/dist/stores/newPosts.js +6 -1
- package/package.json +12 -7
- package/src/components/configuration/ConfigurationCategory.tsx +23 -10
- package/src/components/configuration/ConfigurationList.tsx +6 -1
- package/src/components/form/LocationInput.tsx +7 -1
- package/src/components/jams/JamCapacityGate.tsx +1 -1
- package/src/components/jams/JamConference.tsx +2 -0
- package/src/components/jams/JamParticipantConference.tsx +2 -0
- package/src/components/jams/JamRoom.tsx +2 -6
- package/src/components/jams/LiveJamsSection.tsx +16 -2
- package/src/components/jams/LivekitUnavailableNotice.tsx +40 -0
- package/src/components/jams/dropLateAudio.ts +153 -0
- package/src/components/jams/index.ts +1 -0
- package/src/components/notifications/TypedNotification.tsx +81 -9
- package/src/components/post/Markdown.tsx +8 -2
- package/src/components/post/attachmentPreview.ts +1 -3
- package/src/components/post/pieces/Attachments.tsx +93 -78
- package/src/components/post/pieces/EventRsvpButton.tsx +107 -7
- package/src/components/post/pieces/EventRsvpList.tsx +64 -0
- package/src/components/post/pieces/EventRsvpScopeDialog.tsx +39 -27
- package/src/components/post/pieces/EventWaitlistJoinDialog.tsx +77 -0
- package/src/components/post/pieces/ParticipantsCard.tsx +4 -1
- package/src/components/post/pieces/PostActions.tsx +73 -42
- package/src/components/post/pieces/ShareMenu.tsx +67 -9
- package/src/components/post/post-form/EventForm.tsx +26 -0
- package/src/components/post/post-form/VisibilitySelector.tsx +1 -2
- package/src/components/post/types/Article.tsx +1 -1
- package/src/components/post/types/article/FullArticle.tsx +2 -2
- package/src/components/post/types/event/CardEvent.tsx +26 -14
- package/src/components/post/types/event/FullEvent.tsx +48 -35
- package/src/components/post/types/event/ProfileEventRelationship.tsx +8 -0
- package/src/components/post/types/note/FullNote.tsx +1 -4
- package/src/components/post/types/poll/FullPoll.tsx +1 -4
- package/src/components/preview-link/LocalPreviewLink.tsx +4 -1
- package/src/components/preview-link/PreviewLink.tsx +2 -7
- package/src/components/preview-link/helpers.ts +32 -1
- package/src/components/preview-link/local/GroupPreview.tsx +1 -1
- package/src/components/preview-link/local/JamPreview.tsx +1 -1
- package/src/components/preview-link/local/WelcomePreview.tsx +36 -0
- package/src/components/profile/Avatar.tsx +6 -2
- package/src/components/profile/ProfileFromId.tsx +1 -5
- package/src/components/resources/ResourceCard.tsx +0 -1
- package/src/contexts/openpeeps/hooks/accounts.ts +1 -3
- package/src/contexts/openpeeps/hooks/admin.ts +11 -3
- package/src/contexts/openpeeps/hooks/other.ts +9 -12
- package/src/contexts/openpeeps/hooks/streaming.ts +3 -3
- package/src/css.d.ts +4 -0
- package/src/hooks/admin/useCanAccessAdminSection.ts +27 -0
- package/src/hooks/events/useEventRsvp.ts +51 -7
- package/src/hooks/groups/useNewGroup.ts +28 -3
- package/src/hooks/index.ts +8 -1
- package/src/hooks/jams/useCanDiagnoseLivekit.ts +5 -0
- package/src/hooks/posts/useResourceComposer.ts +8 -6
- package/src/hooks/posts/useShareMenu.ts +9 -0
- package/src/hooks/useWelcomePreview.ts +57 -0
- package/src/i18n/I18nProvider.tsx +1 -4
- package/src/lib/groupFormErrors.ts +9 -2
- package/src/lib/threadHelpers.ts +1 -5
- package/src/pages/admin/ConfigurationCommunity.tsx +5 -0
- package/src/pages/admin/Diagnostics.tsx +4 -0
- package/src/pages/admin/DiagnosticsLivekit.tsx +147 -0
- package/src/pages/admin/Invites.tsx +23 -1
- package/src/pages/admin/Media.tsx +290 -0
- package/src/pages/admin/community/CommunityForbiddenUsernames.tsx +223 -0
- package/src/pages/admin/community/CommunityRoles.tsx +2 -2
- package/src/pages/admin/components/EditInviteLinkModal.tsx +263 -0
- package/src/pages/auth/Register.tsx +33 -4
- package/src/pages/conversations/Show.tsx +11 -0
- package/src/pages/index.ts +3 -0
- package/src/pages/jams/Index.tsx +2 -6
- package/src/pages/settings/PublicProfile.tsx +20 -2
- package/src/pwa/sw.ts +6 -3
- package/src/pwa/useNotificationBadgeSync.ts +3 -1
- package/src/react-native.ts +1 -0
- package/src/stores/newPosts.ts +6 -1
- package/src/streaming.ts +3 -3
- package/dist/setupTests.d.ts +0 -1
- package/dist/setupTests.js +0 -5
|
@@ -5,28 +5,51 @@ import {
|
|
|
5
5
|
PopupMenuButton,
|
|
6
6
|
PopupSection,
|
|
7
7
|
PopupSeparator,
|
|
8
|
+
type PopupMenuProps,
|
|
8
9
|
} from '@openpeepshq/react-ui';
|
|
9
10
|
import { useT } from '../../../i18n';
|
|
10
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
postPublicPath,
|
|
13
|
+
useShareMenu,
|
|
14
|
+
} from '../../../hooks/posts/useShareMenu';
|
|
11
15
|
import { useCreateNewConversation } from '../../conversations/CreateNewConversationContext';
|
|
16
|
+
import { useToast } from '../../layout/ToastProvider';
|
|
12
17
|
|
|
13
18
|
export interface ShareMenuProps {
|
|
14
19
|
post: PublicPost;
|
|
15
20
|
menuButton?: React.ReactNode;
|
|
21
|
+
/** `unstyled` matches neighboring text actions, such as the post footer. */
|
|
22
|
+
variant?: PopupMenuProps['variant'] | 'unstyled';
|
|
23
|
+
className?: string;
|
|
24
|
+
text?: string;
|
|
16
25
|
}
|
|
17
26
|
|
|
18
|
-
|
|
27
|
+
const absolutePostUrl = (post: PublicPost) => {
|
|
28
|
+
const path = postPublicPath(post);
|
|
29
|
+
return typeof window !== 'undefined'
|
|
30
|
+
? `${window.location.origin}${path}`
|
|
31
|
+
: path;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
export function ShareMenu({
|
|
35
|
+
post,
|
|
36
|
+
menuButton,
|
|
37
|
+
variant = 'outline',
|
|
38
|
+
className,
|
|
39
|
+
text,
|
|
40
|
+
}: ShareMenuProps) {
|
|
19
41
|
const t = useT();
|
|
42
|
+
const { success, error: toastError } = useToast();
|
|
20
43
|
const { openCreateConversation } = useCreateNewConversation();
|
|
21
|
-
|
|
22
|
-
const postUrl =
|
|
23
|
-
typeof window !== 'undefined'
|
|
24
|
-
? `${window.location.origin}/posts/${post.id}`
|
|
25
|
-
: `/posts/${post.id}`;
|
|
44
|
+
const postUrl = absolutePostUrl(post);
|
|
26
45
|
const { signedIn, isEvent, repost, eventIcsFile } = useShareMenu(
|
|
27
46
|
post,
|
|
28
47
|
postUrl,
|
|
29
48
|
);
|
|
49
|
+
// Feature-detect. Desktop browsers often have no Web Share API; copy stays
|
|
50
|
+
// in the menu either way.
|
|
51
|
+
const canSystemShare =
|
|
52
|
+
typeof navigator !== 'undefined' && typeof navigator.share === 'function';
|
|
30
53
|
|
|
31
54
|
const downloadEventIcs = () => {
|
|
32
55
|
const file = eventIcsFile();
|
|
@@ -42,11 +65,34 @@ export function ShareMenu({ post, menuButton }: ShareMenuProps) {
|
|
|
42
65
|
URL.revokeObjectURL(href);
|
|
43
66
|
};
|
|
44
67
|
|
|
68
|
+
const copyLink = async () => {
|
|
69
|
+
try {
|
|
70
|
+
await navigator.clipboard.writeText(postUrl);
|
|
71
|
+
success(t('posts.shareMenu.linkCopied', { defaultValue: 'Link copied' }));
|
|
72
|
+
} catch {
|
|
73
|
+
toastError(
|
|
74
|
+
t('posts.shareMenu.copyFailed', {
|
|
75
|
+
defaultValue: "Couldn't copy the link",
|
|
76
|
+
}),
|
|
77
|
+
);
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
const systemShare = async () => {
|
|
82
|
+
try {
|
|
83
|
+
await navigator.share({ url: postUrl });
|
|
84
|
+
} catch (err) {
|
|
85
|
+
if (err instanceof DOMException && err.name === 'AbortError') return;
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
|
|
45
89
|
return (
|
|
46
90
|
<PopupMenu
|
|
47
91
|
menuButton={menuButton ?? <Share className="size-4" />}
|
|
48
92
|
title={t('posts.shareMenu.title', { defaultValue: 'Share' })}
|
|
49
|
-
variant=
|
|
93
|
+
variant={variant === 'unstyled' ? undefined : variant}
|
|
94
|
+
className={className}
|
|
95
|
+
text={text}
|
|
50
96
|
>
|
|
51
97
|
{signedIn ? (
|
|
52
98
|
<>
|
|
@@ -93,11 +139,23 @@ export function ShareMenu({ post, menuButton }: ShareMenuProps) {
|
|
|
93
139
|
action={downloadEventIcs}
|
|
94
140
|
/>
|
|
95
141
|
) : null}
|
|
142
|
+
{canSystemShare ? (
|
|
143
|
+
<PopupMenuButton
|
|
144
|
+
title={t('posts.shareMenu.systemShare', {
|
|
145
|
+
defaultValue: 'Share via…',
|
|
146
|
+
})}
|
|
147
|
+
text={t('posts.shareMenu.systemShare', {
|
|
148
|
+
defaultValue: 'Share via…',
|
|
149
|
+
})}
|
|
150
|
+
icon={Share}
|
|
151
|
+
action={() => void systemShare()}
|
|
152
|
+
/>
|
|
153
|
+
) : null}
|
|
96
154
|
<PopupMenuButton
|
|
97
155
|
title={t('posts.shareMenu.copyLink', { defaultValue: 'Copy link' })}
|
|
98
156
|
text={t('posts.shareMenu.copyLink', { defaultValue: 'Copy link' })}
|
|
99
157
|
icon={Copy}
|
|
100
|
-
action={() => void
|
|
158
|
+
action={() => void copyLink()}
|
|
101
159
|
/>
|
|
102
160
|
</PopupMenu>
|
|
103
161
|
);
|
|
@@ -7,6 +7,7 @@ import type {
|
|
|
7
7
|
import {
|
|
8
8
|
EVENT_HEADER_ASPECT_RATIO,
|
|
9
9
|
parseEventMaxAttendeesInput,
|
|
10
|
+
parseEventWaitlistOfferMinutesInput,
|
|
10
11
|
utcIsoToZonedDateTime,
|
|
11
12
|
zonedDateTimeToUtcIso,
|
|
12
13
|
} from '@openpeepshq/common/lib';
|
|
@@ -422,6 +423,31 @@ export const EventForm = ({
|
|
|
422
423
|
) : null}
|
|
423
424
|
</div>
|
|
424
425
|
</Label>
|
|
426
|
+
{event.maxAttendees != null ? (
|
|
427
|
+
<Label
|
|
428
|
+
title={t('events.form.waitlistOfferMinutes', {
|
|
429
|
+
defaultValue: 'Waitlist response window (minutes)',
|
|
430
|
+
})}
|
|
431
|
+
description={t('events.form.waitlistOfferMinutesDescription', {
|
|
432
|
+
defaultValue:
|
|
433
|
+
'How long the next person on the waitlist has to claim a freed spot. Leave empty for 60 minutes.',
|
|
434
|
+
})}
|
|
435
|
+
>
|
|
436
|
+
<Input
|
|
437
|
+
type="number"
|
|
438
|
+
min={1}
|
|
439
|
+
max={10080}
|
|
440
|
+
value={event.waitlistOfferMinutes ?? ''}
|
|
441
|
+
onChange={(e) => {
|
|
442
|
+
patchEvent({
|
|
443
|
+
waitlistOfferMinutes: parseEventWaitlistOfferMinutesInput(
|
|
444
|
+
e.target.value,
|
|
445
|
+
),
|
|
446
|
+
});
|
|
447
|
+
}}
|
|
448
|
+
/>
|
|
449
|
+
</Label>
|
|
450
|
+
) : null}
|
|
425
451
|
</div>
|
|
426
452
|
|
|
427
453
|
{!isEdit ? (
|
|
@@ -37,8 +37,7 @@ export const VisibilitySelector = ({
|
|
|
37
37
|
);
|
|
38
38
|
|
|
39
39
|
const selectedGroup = useMemo(
|
|
40
|
-
() =>
|
|
41
|
-
me?.memberships?.find((m) => m.group.id === postData.groupId)?.group,
|
|
40
|
+
() => me?.memberships?.find((m) => m.group.id === postData.groupId)?.group,
|
|
42
41
|
[me?.memberships, postData.groupId],
|
|
43
42
|
);
|
|
44
43
|
|
|
@@ -34,7 +34,7 @@ export function FeedArticle({ post }: FeedArticleProps) {
|
|
|
34
34
|
/>
|
|
35
35
|
)}
|
|
36
36
|
<div className="prose-sm">
|
|
37
|
-
<h3>{article.title}</h3>
|
|
37
|
+
<h3 className="text-foreground">{article.title}</h3>
|
|
38
38
|
{minutes > 0 && (
|
|
39
39
|
<p className="text-muted-foreground text-xs">
|
|
40
40
|
{t('posts.article.minutesToRead', { count: minutes })}
|
|
@@ -29,8 +29,8 @@ export function FullArticle({ post }: FullArticleProps) {
|
|
|
29
29
|
alt={article.title ? `image for ${article.title}` : 'Article'}
|
|
30
30
|
/>
|
|
31
31
|
) : null}
|
|
32
|
-
<div className="prose mb-6">
|
|
33
|
-
<h1>{article.title}</h1>
|
|
32
|
+
<div className="prose dark:prose-invert mb-6">
|
|
33
|
+
<h1 className="text-foreground">{article.title}</h1>
|
|
34
34
|
{minutes > 0 && (
|
|
35
35
|
<p className="text-muted-foreground text-sm">
|
|
36
36
|
{t('posts.article.minutesToRead', { count: minutes })}
|
|
@@ -12,6 +12,7 @@ import { useServerInfo } from '../../../server-data';
|
|
|
12
12
|
import { usePostViewRef } from '../../../../lib/postViewCounter';
|
|
13
13
|
import { EventLocation } from '../../pieces/EventLocation';
|
|
14
14
|
import { ParticipantsCard } from '../../pieces/ParticipantsCard';
|
|
15
|
+
import { ShareMenu } from '../../pieces/ShareMenu';
|
|
15
16
|
import { ProfileEventRelationship } from './ProfileEventRelationship';
|
|
16
17
|
|
|
17
18
|
export interface CardEventProps {
|
|
@@ -78,20 +79,31 @@ export function CardEvent({ post, showEventDate = true }: CardEventProps) {
|
|
|
78
79
|
</div>
|
|
79
80
|
</a>
|
|
80
81
|
<div className="grid gap-y-4 p-4">
|
|
81
|
-
<
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
82
|
+
<div className="flex items-start gap-2">
|
|
83
|
+
<a
|
|
84
|
+
href={postLink}
|
|
85
|
+
className="block min-w-0 flex-1 text-inherit no-underline"
|
|
86
|
+
>
|
|
87
|
+
{showEventDate ? (
|
|
88
|
+
<p className="text-muted-foreground text-sm">
|
|
89
|
+
{formatEventTimespan(
|
|
90
|
+
event,
|
|
91
|
+
post.occurrenceStart,
|
|
92
|
+
post.occurrenceEnd,
|
|
93
|
+
)}
|
|
94
|
+
</p>
|
|
95
|
+
) : null}
|
|
96
|
+
<h3 className="text-xl font-semibold">
|
|
97
|
+
{truncateText(event.name, 100) || '-'}
|
|
98
|
+
</h3>
|
|
99
|
+
</a>
|
|
100
|
+
<ShareMenu
|
|
101
|
+
post={post}
|
|
102
|
+
variant="ghost"
|
|
103
|
+
className="shrink-0"
|
|
104
|
+
text={t('posts.footer.share', { defaultValue: 'Share' })}
|
|
105
|
+
/>
|
|
106
|
+
</div>
|
|
95
107
|
{event.recurrence ? (
|
|
96
108
|
<p className="text-muted-foreground text-sm">
|
|
97
109
|
{formatEventRecurrence(event.recurrence, t, event.start)}
|
|
@@ -12,18 +12,17 @@ import {
|
|
|
12
12
|
canManageEventRsvps,
|
|
13
13
|
canModerateJam,
|
|
14
14
|
canViewJamAttendees,
|
|
15
|
-
|
|
16
|
-
defaultRsvpRecurrenceId,
|
|
15
|
+
availableSpots,
|
|
17
16
|
effectiveEventTimes,
|
|
18
17
|
eventTimeZoneOptions,
|
|
19
18
|
formatEventClockTime,
|
|
20
19
|
formatEventRecurrence,
|
|
21
20
|
getJamUrl,
|
|
22
21
|
groupName,
|
|
23
|
-
isCapacityEvent,
|
|
24
22
|
parseOccurrenceQuery,
|
|
25
23
|
listRsvpOccurrences,
|
|
26
24
|
profileName,
|
|
25
|
+
rsvpExportFilename,
|
|
27
26
|
} from '@openpeepshq/common/lib';
|
|
28
27
|
import {
|
|
29
28
|
Button,
|
|
@@ -99,17 +98,8 @@ export function FullEvent({ post, occurrence }: FullEventProps) {
|
|
|
99
98
|
const myEvent = post.profile?.id === profile?.id;
|
|
100
99
|
const iAmModerator = canModerateJam(profile, post);
|
|
101
100
|
const canManageRsvps = canManageEventRsvps(profile, post);
|
|
102
|
-
const slotsLeft =
|
|
103
|
-
|
|
104
|
-
event.maxAttendees !== undefined &&
|
|
105
|
-
(!event.recurrence || occurrenceId)
|
|
106
|
-
? event.maxAttendees - countYesRsvps(post, occurrenceId)
|
|
107
|
-
: null;
|
|
108
|
-
const times = effectiveEventTimes(
|
|
109
|
-
event,
|
|
110
|
-
occurrenceId ??
|
|
111
|
-
(event.recurrence ? defaultRsvpRecurrenceId(event) : undefined),
|
|
112
|
-
);
|
|
101
|
+
const slotsLeft = availableSpots(post, occurrenceId) ?? null;
|
|
102
|
+
const times = effectiveEventTimes(event, occurrenceId);
|
|
113
103
|
const recurrenceLabel = event.recurrence
|
|
114
104
|
? formatEventRecurrence(event.recurrence, t, event.start)
|
|
115
105
|
: '';
|
|
@@ -133,6 +123,22 @@ export function FullEvent({ post, occurrence }: FullEventProps) {
|
|
|
133
123
|
}
|
|
134
124
|
}, [client, post.id, t, toastError]);
|
|
135
125
|
|
|
126
|
+
const exportRsvps = useCallback(async () => {
|
|
127
|
+
try {
|
|
128
|
+
const csv = await client.posts.exportRsvps({
|
|
129
|
+
id: post.id,
|
|
130
|
+
occurrence: occurrenceId,
|
|
131
|
+
});
|
|
132
|
+
downloadCsv(csv, rsvpExportFilename(event.name, new Date()));
|
|
133
|
+
} catch {
|
|
134
|
+
toastError(
|
|
135
|
+
t('events.exportRsvpsError', {
|
|
136
|
+
defaultValue: 'Failed to export RSVPs',
|
|
137
|
+
}),
|
|
138
|
+
);
|
|
139
|
+
}
|
|
140
|
+
}, [client, event.name, occurrenceId, post.id, t, toastError]);
|
|
141
|
+
|
|
136
142
|
const descendentThreads = useMemo(
|
|
137
143
|
() =>
|
|
138
144
|
(contextQuery.data && buildThreads(contextQuery.data.descendants)) || [],
|
|
@@ -193,11 +199,8 @@ export function FullEvent({ post, occurrence }: FullEventProps) {
|
|
|
193
199
|
<div className="flex items-center gap-2">
|
|
194
200
|
<ShareMenu
|
|
195
201
|
post={post}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
<Share className="size-4" />
|
|
199
|
-
</span>
|
|
200
|
-
}
|
|
202
|
+
text={t('posts.footer.share', { defaultValue: 'Share' })}
|
|
203
|
+
menuButton={<Share className="size-4" />}
|
|
201
204
|
/>
|
|
202
205
|
{myEvent ? (
|
|
203
206
|
<EventMenu
|
|
@@ -333,22 +336,32 @@ export function FullEvent({ post, occurrence }: FullEventProps) {
|
|
|
333
336
|
) : null}
|
|
334
337
|
|
|
335
338
|
{tab === 'rsvps' ? (
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
339
|
+
<>
|
|
340
|
+
{canManageRsvps ? (
|
|
341
|
+
<div className="flex justify-end py-2">
|
|
342
|
+
<Button variant="outline" compact action={exportRsvps}>
|
|
343
|
+
<Download className="mr-1 h-4 w-4" />
|
|
344
|
+
{t('events.exportRsvps', { defaultValue: 'Export RSVPs' })}
|
|
345
|
+
</Button>
|
|
346
|
+
</div>
|
|
347
|
+
) : null}
|
|
348
|
+
<EventRsvpList
|
|
349
|
+
post={post}
|
|
350
|
+
occurrenceId={occurrenceId}
|
|
351
|
+
occurrences={upcomingOccurrences}
|
|
352
|
+
currentProfile={profile}
|
|
353
|
+
canManageRsvps={canManageRsvps}
|
|
354
|
+
onMessage={(target) =>
|
|
355
|
+
openCreateConversation({
|
|
356
|
+
profiles: [target],
|
|
357
|
+
skipProfileSelection: true,
|
|
358
|
+
})
|
|
359
|
+
}
|
|
360
|
+
onManage={(response, profileId, recurrenceId) =>
|
|
361
|
+
rsvpManage({ response, recurrenceId }, { id: post.id, profileId })
|
|
362
|
+
}
|
|
363
|
+
/>
|
|
364
|
+
</>
|
|
352
365
|
) : null}
|
|
353
366
|
|
|
354
367
|
{tab === 'attendees' && showJamAttendeesTab ? (
|
|
@@ -58,6 +58,14 @@ export const ProfileEventRelationship = ({
|
|
|
58
58
|
variant: 'outline',
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
+
if (myRsvp?.response === 'waitlist') {
|
|
62
|
+
return {
|
|
63
|
+
status: t('events.profileRelationship.waitlisted', {
|
|
64
|
+
defaultValue: 'Waitlisted',
|
|
65
|
+
}),
|
|
66
|
+
variant: 'outline',
|
|
67
|
+
};
|
|
68
|
+
}
|
|
61
69
|
return null;
|
|
62
70
|
})();
|
|
63
71
|
|
|
@@ -7,9 +7,6 @@ export interface FullNoteProps {
|
|
|
7
7
|
|
|
8
8
|
export function FullNote({ post }: FullNoteProps) {
|
|
9
9
|
return (
|
|
10
|
-
<FullPostLayout
|
|
11
|
-
post={post}
|
|
12
|
-
deleteCallback={() => window.history.back()}
|
|
13
|
-
/>
|
|
10
|
+
<FullPostLayout post={post} deleteCallback={() => window.history.back()} />
|
|
14
11
|
);
|
|
15
12
|
}
|
|
@@ -9,10 +9,7 @@ export interface FullPollProps {
|
|
|
9
9
|
|
|
10
10
|
export function FullPoll({ post }: FullPollProps) {
|
|
11
11
|
return (
|
|
12
|
-
<FullPostLayout
|
|
13
|
-
post={post}
|
|
14
|
-
deleteCallback={() => window.history.back()}
|
|
15
|
-
>
|
|
12
|
+
<FullPostLayout post={post} deleteCallback={() => window.history.back()}>
|
|
16
13
|
<FeedPost
|
|
17
14
|
post={post}
|
|
18
15
|
noReactionHeader
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { isGroupPath, isJamPath, isPostPath } from './helpers';
|
|
1
|
+
import { isGroupPath, isJamPath, isPostPath, isWelcomePath } from './helpers';
|
|
2
2
|
import { GroupPreview } from './local/GroupPreview';
|
|
3
3
|
import { PostPreview } from './local/PostPreview';
|
|
4
4
|
import { JamPreview } from './local/JamPreview';
|
|
5
|
+
import { WelcomePreview } from './local/WelcomePreview';
|
|
5
6
|
|
|
6
7
|
export interface LocalPreviewLinkProps {
|
|
7
8
|
url: string;
|
|
@@ -12,6 +13,7 @@ export function LocalPreviewLink({ url }: LocalPreviewLinkProps) {
|
|
|
12
13
|
const isPost = isPostPath(path);
|
|
13
14
|
const isJam = isJamPath(path);
|
|
14
15
|
const isGroup = isGroupPath(path);
|
|
16
|
+
const isWelcome = isWelcomePath(path);
|
|
15
17
|
|
|
16
18
|
return (
|
|
17
19
|
<a
|
|
@@ -22,6 +24,7 @@ export function LocalPreviewLink({ url }: LocalPreviewLinkProps) {
|
|
|
22
24
|
{isPost ? <PostPreview path={path} /> : null}
|
|
23
25
|
{isGroup ? <GroupPreview path={path} /> : null}
|
|
24
26
|
{isJam ? <JamPreview path={path} /> : null}
|
|
27
|
+
{isWelcome ? <WelcomePreview /> : null}
|
|
25
28
|
</a>
|
|
26
29
|
);
|
|
27
30
|
}
|
|
@@ -9,17 +9,12 @@ export interface PreviewLinkProps {
|
|
|
9
9
|
export function PreviewLink({ url = '' }: PreviewLinkProps) {
|
|
10
10
|
if (!isValidUrl(url)) return null;
|
|
11
11
|
|
|
12
|
-
const origin =
|
|
13
|
-
typeof window !== 'undefined' ? window.location.origin : '';
|
|
12
|
+
const origin = typeof window !== 'undefined' ? window.location.origin : '';
|
|
14
13
|
const local = isLocalLink(url, origin);
|
|
15
14
|
|
|
16
15
|
return (
|
|
17
16
|
<div className="min-w-0 max-w-full overflow-hidden">
|
|
18
|
-
{local ?
|
|
19
|
-
<LocalPreviewLink url={url} />
|
|
20
|
-
) : (
|
|
21
|
-
<RemotePreviewLink url={url} />
|
|
22
|
-
)}
|
|
17
|
+
{local ? <LocalPreviewLink url={url} /> : <RemotePreviewLink url={url} />}
|
|
23
18
|
</div>
|
|
24
19
|
);
|
|
25
20
|
}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
+
import { markdownPlainText } from '@openpeepshq/common';
|
|
2
|
+
|
|
1
3
|
const UUID_RE =
|
|
2
4
|
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
3
5
|
|
|
6
|
+
const EXCERPT_MAX = 180;
|
|
7
|
+
|
|
4
8
|
export const isPostPath = (path: string) =>
|
|
5
9
|
path.startsWith('/posts/') && UUID_RE.test(path.substring(7));
|
|
6
10
|
|
|
@@ -11,6 +15,9 @@ export const isJamPath = (path: string) =>
|
|
|
11
15
|
|
|
12
16
|
export const isGroupPath = (path: string) => path.startsWith('/groups/@');
|
|
13
17
|
|
|
18
|
+
export const isWelcomePath = (path: string) =>
|
|
19
|
+
path === '/welcome' || path === '/welcome/';
|
|
20
|
+
|
|
14
21
|
export const isLocalLink = (url: string, origin: string) => {
|
|
15
22
|
try {
|
|
16
23
|
const urlObj = new URL(url);
|
|
@@ -18,13 +25,37 @@ export const isLocalLink = (url: string, origin: string) => {
|
|
|
18
25
|
urlObj.origin === origin &&
|
|
19
26
|
(isPostPath(urlObj.pathname) ||
|
|
20
27
|
isJamPath(urlObj.pathname) ||
|
|
21
|
-
isGroupPath(urlObj.pathname)
|
|
28
|
+
isGroupPath(urlObj.pathname) ||
|
|
29
|
+
isWelcomePath(urlObj.pathname))
|
|
22
30
|
);
|
|
23
31
|
} catch {
|
|
24
32
|
return false;
|
|
25
33
|
}
|
|
26
34
|
};
|
|
27
35
|
|
|
36
|
+
/** Plain-text clip of the welcome page, without image markup. */
|
|
37
|
+
export const welcomePreviewExcerpt = (markdown?: string) => {
|
|
38
|
+
const plain = markdownPlainText(
|
|
39
|
+
(markdown ?? '').replace(/!\[[^\]]*]\([^)]*\)/g, ' '),
|
|
40
|
+
);
|
|
41
|
+
if (plain.length <= EXCERPT_MAX) return plain;
|
|
42
|
+
const cut = plain.slice(0, EXCERPT_MAX);
|
|
43
|
+
const lastSpace = cut.lastIndexOf(' ');
|
|
44
|
+
const clipped = lastSpace > 80 ? cut.slice(0, lastSpace) : cut;
|
|
45
|
+
return `${clipped.trimEnd()}…`;
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
/** First content image on the welcome page, ignoring inline data URLs. */
|
|
49
|
+
export const firstMarkdownImage = (markdown?: string) => {
|
|
50
|
+
if (!markdown) return undefined;
|
|
51
|
+
const pattern = /!\[[^\]]*]\(\s*(<([^>]+)>|([^\s)]+))/g;
|
|
52
|
+
for (const match of markdown.matchAll(pattern)) {
|
|
53
|
+
const src = (match[2] ?? match[3])?.trim();
|
|
54
|
+
if (src && !src.startsWith('data:')) return src;
|
|
55
|
+
}
|
|
56
|
+
return undefined;
|
|
57
|
+
};
|
|
58
|
+
|
|
28
59
|
export const isValidUrl = (url?: string) => {
|
|
29
60
|
if (!url) return false;
|
|
30
61
|
try {
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { useWelcomePreview } from '../../../hooks/useWelcomePreview';
|
|
2
|
+
|
|
3
|
+
export const WelcomePreview = () => {
|
|
4
|
+
const { eyebrow, title, description, imageUrl, imageFit } =
|
|
5
|
+
useWelcomePreview();
|
|
6
|
+
|
|
7
|
+
return (
|
|
8
|
+
<div
|
|
9
|
+
data-testid="welcome-preview-card"
|
|
10
|
+
className="flex w-full min-w-0 flex-row items-center gap-4"
|
|
11
|
+
>
|
|
12
|
+
{imageUrl ? (
|
|
13
|
+
<div className="flex h-24 w-24 shrink-0 items-center justify-center overflow-hidden rounded-md">
|
|
14
|
+
<img
|
|
15
|
+
src={imageUrl}
|
|
16
|
+
alt=""
|
|
17
|
+
className={`h-full w-full ${
|
|
18
|
+
imageFit === 'cover' ? 'object-cover' : 'object-contain'
|
|
19
|
+
}`}
|
|
20
|
+
/>
|
|
21
|
+
</div>
|
|
22
|
+
) : null}
|
|
23
|
+
<div className="flex min-w-0 flex-1 flex-col gap-1">
|
|
24
|
+
{eyebrow ? (
|
|
25
|
+
<p className="text-muted-foreground truncate text-xs">{eyebrow}</p>
|
|
26
|
+
) : null}
|
|
27
|
+
<p className="line-clamp-2 font-semibold">{title}</p>
|
|
28
|
+
{description ? (
|
|
29
|
+
<p className="text-muted-foreground line-clamp-3 break-words text-sm">
|
|
30
|
+
{description}
|
|
31
|
+
</p>
|
|
32
|
+
) : null}
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
);
|
|
36
|
+
};
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import type { PublicProfile } from '@openpeepshq/common/types';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
DELETED_AUTHOR_DISPLAY_NAME,
|
|
4
|
+
getTheme,
|
|
5
|
+
isDeletedProfile,
|
|
6
|
+
} from '@openpeepshq/common';
|
|
3
7
|
import { UserX } from 'lucide-react';
|
|
4
8
|
|
|
5
9
|
import { useServerInfo } from '../server-data';
|
|
@@ -62,7 +66,7 @@ export function Avatar({
|
|
|
62
66
|
>
|
|
63
67
|
{deleted ? (
|
|
64
68
|
<UserX
|
|
65
|
-
aria-label={profile?.displayName ||
|
|
69
|
+
aria-label={profile?.displayName || DELETED_AUTHOR_DISPLAY_NAME}
|
|
66
70
|
className="text-muted-foreground"
|
|
67
71
|
size={iconSize}
|
|
68
72
|
/>
|
|
@@ -18,11 +18,7 @@ export function ProfileFromId({
|
|
|
18
18
|
const profile = profileQuery.data;
|
|
19
19
|
|
|
20
20
|
if (profileQuery.isLoading) {
|
|
21
|
-
return
|
|
22
|
-
<div className="text-muted-foreground py-2 text-sm">
|
|
23
|
-
Loading…
|
|
24
|
-
</div>
|
|
25
|
-
);
|
|
21
|
+
return <div className="text-muted-foreground py-2 text-sm">Loading…</div>;
|
|
26
22
|
}
|
|
27
23
|
|
|
28
24
|
if (!profile) return null;
|
|
@@ -19,9 +19,7 @@ const useHasAccountJwt = (): boolean => {
|
|
|
19
19
|
const refresh = async () => {
|
|
20
20
|
const token = (await credentialsStore.get())?.token;
|
|
21
21
|
const next =
|
|
22
|
-
!!token &&
|
|
23
|
-
!isAccountlessJwt(token) &&
|
|
24
|
-
!isServiceOnlyJwt(token);
|
|
22
|
+
!!token && !isAccountlessJwt(token) && !isServiceOnlyJwt(token);
|
|
25
23
|
if (!cancelled) setHasAccount(next);
|
|
26
24
|
};
|
|
27
25
|
|