Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

refactor(app): flatten thread and theme gallery ternaries

Hampus6f44acd41ee7
diff --git a/fluxer_app/src/features/theme/components/modals/BackgroundImageGalleryModal.tsx b/fluxer_app/src/features/theme/components/modals/BackgroundImageGalleryModal.tsx
index 465d6f42e..5f9551dc6 100644
--- a/fluxer_app/src/features/theme/components/modals/BackgroundImageGalleryModal.tsx
+++ b/fluxer_app/src/features/theme/components/modals/BackgroundImageGalleryModal.tsx
@@ -42,8 +42,8 @@ import {Trans, useLingui} from '@lingui/react/macro';
import type {IconProps} from '@phosphor-icons/react';
import {
ArrowsClockwiseIcon,
+ AtomIcon,
CheckIcon,
- CrownIcon,
EyeSlashIcon,
GifIcon,
PlusIcon,
@@ -286,6 +286,70 @@ const BackgroundItem: React.FC<BackgroundItemProps> = React.memo(
const handleRetry = useCallback(() => {
loadImage();
}, [loadImage]);
+ let customPreview: React.ReactNode = null;
+ if (isLoading) {
+ customPreview = (
+ <div
+ className={styles.loadingContainer}
+ data-flx="theme.background-image-gallery-modal.background-item.loading-container"
+ >
+ <div className={styles.spinner} data-flx="theme.background-image-gallery-modal.background-item.spinner" />
+ </div>
+ );
+ } else if (hasError) {
+ customPreview = (
+ <div
+ className={styles.errorContainer}
+ data-flx="theme.background-image-gallery-modal.background-item.error-container"
+ >
+ <WarningCircleIcon
+ size={remFromPx(24)}
+ weight="fill"
+ className={styles.errorIcon}
+ data-flx="theme.background-image-gallery-modal.background-item.error-icon"
+ />
+ <div className={styles.errorText} data-flx="theme.background-image-gallery-modal.background-item.error-text">
+ <Trans>Failed to load</Trans>
+ </div>
+ <FocusRing offset={-2} data-flx="theme.background-image-gallery-modal.background-item.focus-ring">
+ <button
+ type="button"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleRetry();
+ }}
+ className={styles.errorButton}
+ data-flx="theme.background-image-gallery-modal.background-item.error-button.stop-propagation"
+ >
+ {i18n._(TRY_AGAIN_DESCRIPTOR)}
+ </button>
+ </FocusRing>
+ </div>
+ );
+ } else if (isNearViewport && imageUrl && isVideo) {
+ customPreview = (
+ <video
+ ref={videoRef}
+ className={styles.backgroundImage}
+ muted
+ loop
+ playsInline
+ preload={shouldAnimate ? 'auto' : 'metadata'}
+ autoPlay={shouldAnimate}
+ src={imageUrl}
+ data-flx="theme.background-image-gallery-modal.background-item.background-video"
+ />
+ );
+ } else if (isNearViewport && imageUrl) {
+ customPreview = (
+ <img
+ src={imageUrl}
+ alt={i18n._(BACKGROUND_DESCRIPTOR)}
+ className={styles.backgroundImage}
+ data-flx="theme.background-image-gallery-modal.background-item.background-image"
+ />
+ );
+ }
return (
<div
ref={visibilityRef}
@@ -333,67 +397,7 @@ const BackgroundItem: React.FC<BackgroundItemProps> = React.memo(
</div>
) : (
<>
- {isLoading ? (
- <div
- className={styles.loadingContainer}
- data-flx="theme.background-image-gallery-modal.background-item.loading-container"
- >
- <div
- className={styles.spinner}
- data-flx="theme.background-image-gallery-modal.background-item.spinner"
- />
- </div>
- ) : hasError ? (
- <div
- className={styles.errorContainer}
- data-flx="theme.background-image-gallery-modal.background-item.error-container"
- >
- <WarningCircleIcon
- size={remFromPx(24)}
- weight="fill"
- className={styles.errorIcon}
- data-flx="theme.background-image-gallery-modal.background-item.error-icon"
- />
- <div
- className={styles.errorText}
- data-flx="theme.background-image-gallery-modal.background-item.error-text"
- >
- <Trans>Failed to load</Trans>
- </div>
- <FocusRing offset={-2} data-flx="theme.background-image-gallery-modal.background-item.focus-ring">
- <button
- type="button"
- onClick={(e) => {
- e.stopPropagation();
- handleRetry();
- }}
- className={styles.errorButton}
- data-flx="theme.background-image-gallery-modal.background-item.error-button.stop-propagation"
- >
- {i18n._(TRY_AGAIN_DESCRIPTOR)}
- </button>
- </FocusRing>
- </div>
- ) : isNearViewport && imageUrl && isVideo ? (
- <video
- ref={videoRef}
- className={styles.backgroundImage}
- muted
- loop
- playsInline
- preload={shouldAnimate ? 'auto' : 'metadata'}
- autoPlay={shouldAnimate}
- src={imageUrl}
- data-flx="theme.background-image-gallery-modal.background-item.background-video"
- />
- ) : isNearViewport && imageUrl ? (
- <img
- src={imageUrl}
- alt={i18n._(BACKGROUND_DESCRIPTOR)}
- className={styles.backgroundImage}
- data-flx="theme.background-image-gallery-modal.background-item.background-image"
- />
- ) : null}
+ {customPreview}
<div
className={styles.imageOverlay}
data-flx="theme.background-image-gallery-modal.background-item.image-overlay"
@@ -989,7 +993,7 @@ const BackgroundImageGalleryModal: React.FC = observer(() => {
{maxBackgroundImages === 1 && shouldShowPremiumFeatures() && (
<div className={styles.premiumUpsell} data-flx="theme.background-image-gallery-modal.premium-upsell">
<div className={styles.premiumHeader} data-flx="theme.background-image-gallery-modal.premium-header">
- <CrownIcon
+ <AtomIcon
weight="fill"
size={remFromPx(18)}
className={styles.premiumIcon}
diff --git a/fluxer_app/src/features/threads/commands/ThreadCommands.ts b/fluxer_app/src/features/threads/commands/ThreadCommands.ts
index 8dd14c7a5..4ce22a2b7 100644
--- a/fluxer_app/src/features/threads/commands/ThreadCommands.ts
+++ b/fluxer_app/src/features/threads/commands/ThreadCommands.ts
@@ -82,7 +82,7 @@ export async function createThread(
return ingestThread(response.body, parent.guildId);
}
-export async function fetchThread(guildId: string, threadId: string): Promise<Channel | undefined> {
+async function fetchThread(guildId: string, threadId: string): Promise<Channel | undefined> {
assertActive(guildId);
const response = await http.get<ChannelWire>(Endpoints.CHANNEL(threadId));
const wire = response.body;
@@ -136,12 +136,14 @@ export async function fetchArchivedThreads(
before?: string,
): Promise<ArchivedThreadPage> {
assertActive(parent.guildId);
- const endpoint =
- kind === 'public'
- ? Endpoints.CHANNEL_THREADS_ARCHIVED_PUBLIC(parent.id)
- : kind === 'private'
- ? Endpoints.CHANNEL_THREADS_ARCHIVED_PRIVATE(parent.id)
- : Endpoints.CHANNEL_THREADS_JOINED_ARCHIVED_PRIVATE(parent.id);
+ let endpoint: string;
+ if (kind === 'public') {
+ endpoint = Endpoints.CHANNEL_THREADS_ARCHIVED_PUBLIC(parent.id);
+ } else if (kind === 'private') {
+ endpoint = Endpoints.CHANNEL_THREADS_ARCHIVED_PRIVATE(parent.id);
+ } else {
+ endpoint = Endpoints.CHANNEL_THREADS_JOINED_ARCHIVED_PRIVATE(parent.id);
+ }
const response = await http.get<ThreadListResponse>(endpoint, {query: before ? {before} : {}});
const body = response.body;
const membersByThread = new Map<string, ThreadMemberResponse>();
diff --git a/fluxer_app/src/features/threads/components/MessageThreadChip.tsx b/fluxer_app/src/features/threads/components/MessageThreadChip.tsx
index 39dbb0e75..1b0a4f33b 100644
--- a/fluxer_app/src/features/threads/components/MessageThreadChip.tsx
+++ b/fluxer_app/src/features/threads/components/MessageThreadChip.tsx
@@ -12,9 +12,9 @@ import ThreadGuilds from '@app/features/threads/state/ThreadGuilds';
import * as D from '@app/features/threads/utils/ThreadMessageDescriptors';
import * as ContextMenuCommands from '@app/features/ui/commands/ContextMenuCommands';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
+import {CaretRightIcon} from '@app/features/ui/icons/DirectionalIcons';
import * as NicknameUtils from '@app/features/user/utils/NicknameUtils';
import {useLingui} from '@lingui/react/macro';
-import {CaretRightIcon} from '@phosphor-icons/react';
import {observer} from 'mobx-react-lite';
export const MessageThreadChip = observer(({message}: {message: Message}) => {
@@ -23,11 +23,12 @@ export const MessageThreadChip = observer(({message}: {message: Message}) => {
const thread = ChannelThreads.getThread(message.id);
if (!thread || thread.parentId !== message.channelId || !ThreadGuilds.isActive(thread.guildId)) return null;
const lastMessage = thread.lastMessageId ? Messages.getMessage(thread.id, thread.lastMessageId) : undefined;
- const preview = lastMessage
- ? `${NicknameUtils.getNickname(lastMessage.author, thread.guildId, thread.id)}: ${buildMessageNotificationBody(lastMessage, i18n)}`
- : thread.messageCount === 0
- ? i18n._(D.NO_RECENT_MESSAGES_DESCRIPTOR)
- : null;
+ let preview: string | null = null;
+ if (lastMessage) {
+ preview = `${NicknameUtils.getNickname(lastMessage.author, thread.guildId, thread.id)}: ${buildMessageNotificationBody(lastMessage, i18n)}`;
+ } else if (thread.messageCount === 0) {
+ preview = i18n._(D.NO_RECENT_MESSAGES_DESCRIPTOR);
+ }
return (
<FocusRing offset={-2} data-flx="threads.message-thread-chip.focus-ring">
<button
diff --git a/fluxer_app/src/features/threads/components/ThreadBrowser.tsx b/fluxer_app/src/features/threads/components/ThreadBrowser.tsx
index 3f21bd97d..6970c1a52 100644
--- a/fluxer_app/src/features/threads/components/ThreadBrowser.tsx
+++ b/fluxer_app/src/features/threads/components/ThreadBrowser.tsx
@@ -38,7 +38,7 @@ import {useLingui} from '@lingui/react/macro';
import {ChatsIcon, LockSimpleIcon, MagnifyingGlassIcon, PlusIcon, XIcon} from '@phosphor-icons/react';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
-import {useCallback, useEffect, useState} from 'react';
+import {type ReactNode, useCallback, useEffect, useState} from 'react';
type BrowserTab = 'active' | 'archived' | 'archivedPrivate';
type ThreadOpenHandler = (thread: Channel, event: ThreadOpenEvent) => void;
@@ -250,7 +250,10 @@ const ArchivedThreads = observer(
const [threadIds, setThreadIds] = useState<ReadonlyArray<string>>([]);
const [hasMore, setHasMore] = useState(false);
const [loading, setLoading] = useState(false);
- const kind: ThreadCommands.ArchivedThreadListKind = !privateOnly ? 'public' : moderator ? 'private' : 'joined';
+ let kind: ThreadCommands.ArchivedThreadListKind = 'public';
+ if (privateOnly) {
+ kind = moderator ? 'private' : 'joined';
+ }
const parentId = parent.id;
const load = useCallback(
(before?: string) => {
@@ -366,6 +369,34 @@ export const ThreadBrowser = observer(
if (current.type === ChannelTypes.GUILD_TEXT) {
tabs.push({id: 'archivedPrivate', label: i18n._(D.ARCHIVED_PRIVATE_THREADS_DESCRIPTOR)});
}
+ let threadList: ReactNode;
+ if (searching) {
+ threadList = (
+ <SearchResults
+ parent={current}
+ query={query}
+ tab={tab}
+ onOpen={handleOpen}
+ data-flx="threads.thread-browser.search-results"
+ />
+ );
+ } else if (tab === 'active') {
+ threadList = (
+ <div className={styles.list} data-flx="threads.thread-browser.list.active">
+ <ActiveThreads parent={current} onOpen={handleOpen} data-flx="threads.thread-browser.active-threads" />
+ </div>
+ );
+ } else {
+ threadList = (
+ <ArchivedThreads
+ key={tab}
+ parent={current}
+ privateOnly={tab === 'archivedPrivate'}
+ onOpen={handleOpen}
+ data-flx="threads.thread-browser.archived-threads"
+ />
+ );
+ }
return (
<div
className={clsx(styles.container, sheet && styles.containerSheet)}
@@ -393,27 +424,7 @@ export const ThreadBrowser = observer(
className={styles.tabs}
data-flx="threads.thread-browser.segmented-tabs"
/>
- {searching ? (
- <SearchResults
- parent={current}
- query={query}
- tab={tab}
- onOpen={handleOpen}
- data-flx="threads.thread-browser.search-results"
- />
- ) : tab === 'active' ? (
- <div className={styles.list} data-flx="threads.thread-browser.list.active">
- <ActiveThreads parent={current} onOpen={handleOpen} data-flx="threads.thread-browser.active-threads" />
- </div>
- ) : (
- <ArchivedThreads
- key={tab}
- parent={current}
- privateOnly={tab === 'archivedPrivate'}
- onOpen={handleOpen}
- data-flx="threads.thread-browser.archived-threads"
- />
- )}
+ {threadList}
</div>
);
},
diff --git a/fluxer_app/src/features/threads/components/ThreadSystemMessages.tsx b/fluxer_app/src/features/threads/components/ThreadSystemMessages.tsx
index aabbd4fd5..0d3d3edc4 100644
--- a/fluxer_app/src/features/threads/components/ThreadSystemMessages.tsx
+++ b/fluxer_app/src/features/threads/components/ThreadSystemMessages.tsx
@@ -81,12 +81,12 @@ export const ThreadStarterMessage = observer(({message}: {message: Message}) =>
const reference = message.messageReference;
const resolution = MessageReferences.getMessageReference(reference?.channel_id ?? '', reference?.message_id ?? '');
const parent = reference?.channel_id ? Channels.getChannel(reference.channel_id) : undefined;
- const starter =
- resolution.state === MessageReferenceState.LOADED
- ? resolution.message
- : resolution.state === MessageReferenceState.DELETED
- ? null
- : message.referencedMessage;
+ let starter = message.referencedMessage;
+ if (resolution.state === MessageReferenceState.LOADED) {
+ starter = resolution.message;
+ } else if (resolution.state === MessageReferenceState.DELETED) {
+ starter = null;
+ }
if (starter && parent) {
return (
<div className={styles.starter} data-flx="threads.thread-starter-message.starter">