Skip to content

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

TypeScript fluxerfluxerapp

fix(app): show the home list when DMs or friends are off

Hampus7c8f5a8fd9c8
diff --git a/fluxer_app/src/features/channel/components/direct_message/DirectMessageLayout.tsx b/fluxer_app/src/features/channel/components/direct_message/DirectMessageLayout.tsx
index de1399609..30aaa7c4f 100644
--- a/fluxer_app/src/features/channel/components/direct_message/DirectMessageLayout.tsx
+++ b/fluxer_app/src/features/channel/components/direct_message/DirectMessageLayout.tsx
@@ -6,21 +6,36 @@ import {DMChannelView} from '@app/features/channel/components/channel_view/DMCha
import styles from '@app/features/channel/components/direct_message/DirectMessageLayout.module.css';
import {DMList} from '@app/features/channel/components/direct_message/DirectMessageList';
import {DMFriendsView} from '@app/features/channel/components/direct_message/DMFriendsView';
+import {EmptyStateView} from '@app/features/channel/components/friends/EmptyStateView';
import {RecentMentionsPage} from '@app/features/messaging/components/pages/RecentMentionsPage';
import {SavedMessagesPage} from '@app/features/messaging/components/pages/SavedMessagesPage';
import {useLocation, useParams} from '@app/features/platform/components/router/RouterReact';
import MobileLayout from '@app/features/ui/state/MobileLayout';
import Users from '@app/features/user/state/Users';
import VoiceCallFullscreen from '@app/features/voice/state/VoiceCallFullscreen';
+import {msg} from '@lingui/core/macro';
+import {useLingui} from '@lingui/react/macro';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import type {ReactNode} from 'react';
+const NO_COMMUNITIES_TITLE_DESCRIPTOR = msg({
+ message: 'No communities yet',
+ comment:
+ 'Heading on the home page when the instance turns off direct messages and friends and the user is in no community.',
+});
+const NO_COMMUNITIES_SUBTITLE_DESCRIPTOR = msg({
+ message: 'Open an invite link to join a community.',
+ comment:
+ 'Text under the heading on the home page when the instance turns off direct messages and friends and the user is in no community.',
+});
+
interface DMLayoutProps {
children?: ReactNode;
}
export const DMLayout = observer(({children}: DMLayoutProps) => {
+ const {i18n} = useLingui();
const {channelId} = useParams() as {channelId?: string};
const location = useLocation();
const mobileLayout = MobileLayout;
@@ -45,8 +60,14 @@ export const DMLayout = observer(({children}: DMLayoutProps) => {
if (children) {
return children;
}
- if (directMessagesDisabled) {
- return null;
+ if (RuntimeConfig.friendsDisabled) {
+ return directMessagesDisabled ? (
+ <EmptyStateView
+ title={i18n._(NO_COMMUNITIES_TITLE_DESCRIPTOR)}
+ subtitle={i18n._(NO_COMMUNITIES_SUBTITLE_DESCRIPTOR)}
+ data-flx="channel.direct-message.dm-layout.render-content.no-communities"
+ />
+ ) : null;
}
return (
<DMFriendsView key={viewAccountKey} data-flx="channel.direct-message.dm-layout.render-content.dm-friends-view" />
@@ -74,7 +95,7 @@ export const DMLayout = observer(({children}: DMLayoutProps) => {
);
}
if (mobileLayout.enabled) {
- if (!channelId && !children && !directMessagesDisabled) {
+ if (!channelId && !children) {
return (
<div className={styles.dmListColumn} data-flx="channel.direct-message.dm-layout.dm-list-column">
<DMList data-flx="channel.direct-message.dm-layout.dm-list" />
@@ -91,11 +112,9 @@ export const DMLayout = observer(({children}: DMLayoutProps) => {
}
return (
<div className={styles.dmLayoutContainer} data-flx="channel.direct-message.dm-layout.dm-layout-container">
- {!directMessagesDisabled && (
- <div className={styles.dmListColumn} data-flx="channel.direct-message.dm-layout.dm-list-column--2">
- <DMList data-flx="channel.direct-message.dm-layout.dm-list--2" />
- </div>
- )}
+ <div className={styles.dmListColumn} data-flx="channel.direct-message.dm-layout.dm-list-column--2">
+ <DMList data-flx="channel.direct-message.dm-layout.dm-list--2" />
+ </div>
<div className={styles.contentColumn} data-flx="channel.direct-message.dm-layout.content-column--2">
<div className={styles.contentInner} data-flx="channel.direct-message.dm-layout.content-inner--2">
{renderContent()}
diff --git a/fluxer_app/src/features/channel/components/direct_message/DirectMessageList.tsx b/fluxer_app/src/features/channel/components/direct_message/DirectMessageList.tsx
index dde6ccae9..8d26a05bb 100644
--- a/fluxer_app/src/features/channel/components/direct_message/DirectMessageList.tsx
+++ b/fluxer_app/src/features/channel/components/direct_message/DirectMessageList.tsx
@@ -7,6 +7,7 @@ import {reportSkeletonDMSidebarLayout} from '@app/features/app/components/skelet
import {useMergeRefs} from '@app/features/app/hooks/useMergeRefs';
import {useRovingFocusList} from '@app/features/app/hooks/useRovingFocusList';
import {useSkeletonLayoutReport} from '@app/features/app/hooks/useSkeletonLayoutMemoryCapture';
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
import {PersonalNotesPurgeFailedModal} from '@app/features/channel/components/alerts/PersonalNotesPurgeFailedModal';
import {CreateDMBottomSheet} from '@app/features/channel/components/bottomsheets/CreateDMBottomSheet';
import styles from '@app/features/channel/components/direct_message/DirectMessageList.module.css';
@@ -51,7 +52,7 @@ import {RelationshipTypes} from '@fluxer/constants/src/UserConstants';
import {msg} from '@lingui/core/macro';
import {Trans, useLingui} from '@lingui/react/macro';
import {
- CrownIcon,
+ AtomIcon,
MagnifyingGlassIcon,
NotePencilIcon,
PaperPlaneIcon,
@@ -139,6 +140,8 @@ export const DMList = observer(() => {
const dmChannels = Channels.dmChannels;
const location = useLocation();
const isFriendsTab = location.pathname === Routes.ME;
+ const friendsDisabled = RuntimeConfig.friendsDisabled;
+ const dmPickerAvailable = RuntimeConfig.dmPickerAvailable;
const currentUser = Users.currentUser;
const createDmRestriction = getCreateDmRestriction(currentUser);
const createDmTooltipText = createDmRestriction ? getCreateDMRestrictionMessage(i18n, createDmRestriction) : null;
@@ -236,7 +239,8 @@ export const DMList = observer(() => {
},
[requestPurgePersonalNotes],
);
- const filteredDmChannels = getSortedDmChannels(dmChannels, currentUserId);
+ const directMessagesDisabled = RuntimeConfig.directMessagesDisabled;
+ const filteredDmChannels = directMessagesDisabled ? [] : getSortedDmChannels(dmChannels, currentUserId);
const dmListNavigationRef = useRovingFocusList<HTMLDivElement>({
focusableSelector: '[data-dm-list-focus-item="true"]',
@@ -266,6 +270,7 @@ export const DMList = observer(() => {
const dmSidebarSkeletonSubtextFlags = readDMRowSubtextFlags(dmRowsContainerRef.current, displayedDmChannelCount);
const dmSidebarSkeletonChangeKey = [
isMobile,
+ friendsDisabled,
personalNotesVisible,
showMobilePlutoniumButton,
filteredDmChannels.map((channel) => channel.id).join(','),
@@ -274,7 +279,7 @@ export const DMList = observer(() => {
useSkeletonLayoutReport(() => {
reportSkeletonDMSidebarLayout({
isMobile,
- friendsVisible: !isMobile,
+ friendsVisible: !isMobile && !friendsDisabled,
personalNotesVisible,
premiumVisible: showMobilePlutoniumButton,
sectionVisible: !isMobile,
@@ -324,31 +329,33 @@ export const DMList = observer(() => {
/>
</button>
</FocusRing>
- <FocusRing offset={-2} data-flx="channel.direct-message.dm-list.focus-ring--2">
- <button
- type="button"
- onClick={() => setAddFriendSheetOpen(true)}
- className={styles.mobileAddFriendButton}
- data-flx="channel.direct-message.dm-list.mobile-add-friend-button.set-add-friend-sheet-open"
- >
- <UserPlusIcon
- weight="fill"
- className={styles.iconSize4}
- data-flx="channel.direct-message.dm-list.icon-size4"
- />
- <span data-flx="channel.direct-message.dm-list.span">
- <Trans>Add friends</Trans>
- </span>
- {pendingCount > 0 && (
- <div
- className={styles.mobileAddFriendBadge}
- data-flx="channel.direct-message.dm-list.mobile-add-friend-badge"
- >
- {pendingCount}
- </div>
- )}
- </button>
- </FocusRing>
+ {!friendsDisabled && (
+ <FocusRing offset={-2} data-flx="channel.direct-message.dm-list.focus-ring--2">
+ <button
+ type="button"
+ onClick={() => setAddFriendSheetOpen(true)}
+ className={styles.mobileAddFriendButton}
+ data-flx="channel.direct-message.dm-list.mobile-add-friend-button.set-add-friend-sheet-open"
+ >
+ <UserPlusIcon
+ weight="fill"
+ className={styles.iconSize4}
+ data-flx="channel.direct-message.dm-list.icon-size4"
+ />
+ <span data-flx="channel.direct-message.dm-list.span">
+ <Trans>Add friends</Trans>
+ </span>
+ {pendingCount > 0 && (
+ <div
+ className={styles.mobileAddFriendBadge}
+ data-flx="channel.direct-message.dm-list.mobile-add-friend-badge"
+ >
+ {pendingCount}
+ </div>
+ )}
+ </button>
+ </FocusRing>
+ )}
</div>
</div>
<Scroller
@@ -430,7 +437,7 @@ export const DMList = observer(() => {
className={styles.mobileSpecialButtonIcon}
data-flx="channel.direct-message.dm-list.mobile-special-button-icon--2"
>
- <CrownIcon
+ <AtomIcon
weight="fill"
className={styles.iconSize5}
data-flx="channel.direct-message.dm-list.icon-size5--3"
@@ -465,31 +472,35 @@ export const DMList = observer(() => {
<div style={{height: 'var(--spacing-2)'}} data-flx="channel.direct-message.dm-list.div" />
</div>
</Scroller>
- <FocusRing offset={-2} data-flx="channel.direct-message.dm-list.focus-ring--5">
- <button
- type="button"
- onClick={() => setNewMessageSheetOpen(true)}
- className={styles.mobileFab}
- aria-label={i18n._(NEW_MESSAGE_DESCRIPTOR)}
- data-flx="channel.direct-message.dm-list.mobile-fab.set-new-message-sheet-open.button"
- >
- <PaperPlaneIcon
- weight="fill"
- className={styles.sendIcon}
- data-flx="channel.direct-message.dm-list.send-icon"
- />
- </button>
- </FocusRing>
+ {dmPickerAvailable && (
+ <FocusRing offset={-2} data-flx="channel.direct-message.dm-list.focus-ring--5">
+ <button
+ type="button"
+ onClick={() => setNewMessageSheetOpen(true)}
+ className={styles.mobileFab}
+ aria-label={i18n._(NEW_MESSAGE_DESCRIPTOR)}
+ data-flx="channel.direct-message.dm-list.mobile-fab.set-new-message-sheet-open.button"
+ >
+ <PaperPlaneIcon
+ weight="fill"
+ className={styles.sendIcon}
+ data-flx="channel.direct-message.dm-list.send-icon"
+ />
+ </button>
+ </FocusRing>
+ )}
<AddFriendSheet
isOpen={addFriendSheetOpen}
onClose={() => setAddFriendSheetOpen(false)}
data-flx="channel.direct-message.dm-list.add-friend-sheet"
/>
- <CreateDMBottomSheet
- isOpen={newMessageSheetOpen}
- onClose={() => setNewMessageSheetOpen(false)}
- data-flx="channel.direct-message.dm-list.create-dm-bottom-sheet"
- />
+ {dmPickerAvailable && (
+ <CreateDMBottomSheet
+ isOpen={newMessageSheetOpen}
+ onClose={() => setNewMessageSheetOpen(false)}
+ data-flx="channel.direct-message.dm-list.create-dm-bottom-sheet"
+ />
+ )}
<MenuBottomSheet
isOpen={personalNotesSheetOpen}
onClose={() => setPersonalNotesSheetOpen(false)}
@@ -528,33 +539,38 @@ export const DMList = observer(() => {
>
<div className={styles.scrollerContent} data-flx="channel.direct-message.dm-list.scroller-content">
<div style={{height: 'var(--spacing-2)'}} data-flx="channel.direct-message.dm-list.div--2" />
- <ClickableItem
- isSelected={isFriendsTab}
- onClick={navigateTo(Routes.ME)}
- data-flx="channel.direct-message.dm-list.clickable-item.navigate-to"
- >
- <div className={styles.clickableItemInner} data-flx="channel.direct-message.dm-list.clickable-item-inner">
- <div
- className={styles.clickableItemContent}
- data-flx="channel.direct-message.dm-list.clickable-item-content"
- >
- <div className={styles.clickableItemIcon} data-flx="channel.direct-message.dm-list.clickable-item-icon">
- <UsersThreeIcon
- weight="fill"
- className={styles.iconSize5}
- data-flx="channel.direct-message.dm-list.icon-size5--4"
- />
- </div>
- <span
- className={styles.clickableItemText}
- data-flx="channel.direct-message.dm-list.clickable-item-text"
+ {!friendsDisabled && (
+ <ClickableItem
+ isSelected={isFriendsTab}
+ onClick={navigateTo(Routes.ME)}
+ data-flx="channel.direct-message.dm-list.clickable-item.navigate-to"
+ >
+ <div className={styles.clickableItemInner} data-flx="channel.direct-message.dm-list.clickable-item-inner">
+ <div
+ className={styles.clickableItemContent}
+ data-flx="channel.direct-message.dm-list.clickable-item-content"
>
- <Trans>Friends</Trans>
- </span>
+ <div
+ className={styles.clickableItemIcon}
+ data-flx="channel.direct-message.dm-list.clickable-item-icon"
+ >
+ <UsersThreeIcon
+ weight="fill"
+ className={styles.iconSize5}
+ data-flx="channel.direct-message.dm-list.icon-size5--4"
+ />
+ </div>
+ <span
+ className={styles.clickableItemText}
+ data-flx="channel.direct-message.dm-list.clickable-item-text"
+ >
+ <Trans>Friends</Trans>
+ </span>
+ </div>
+ <MentionBadge mentionCount={pendingCount} data-flx="channel.direct-message.dm-list.mention-badge" />
</div>
- <MentionBadge mentionCount={pendingCount} data-flx="channel.direct-message.dm-list.mention-badge" />
- </div>
- </ClickableItem>
+ </ClickableItem>
+ )}
{currentUserId && (
<ClickableItem
isSelected={shouldHighlightPersonalNotes}
@@ -599,7 +615,7 @@ export const DMList = observer(() => {
className={styles.clickableItemIcon}
data-flx="channel.direct-message.dm-list.clickable-item-icon--3"
>
- <CrownIcon
+ <AtomIcon
weight="fill"
className={styles.iconSize5}
data-flx="channel.direct-message.dm-list.icon-size5--6"
@@ -614,74 +630,82 @@ export const DMList = observer(() => {
</div>
</ClickableItem>
)}
- <div className={styles.dmSectionSeparator} data-flx="channel.direct-message.dm-list.dm-section-separator" />
- <div className={styles.dmSectionHeader} data-flx="channel.direct-message.dm-list.dm-section-header">
- <div
- className={styles.dmSectionHeaderText}
- data-flx="channel.direct-message.dm-list.dm-section-header-text"
- >
- <span
- className={styles.dmSectionHeaderLabel}
- data-flx="channel.direct-message.dm-list.dm-section-header-label"
- >
- <Trans>Direct messages</Trans>
- </span>
- </div>
- <Tooltip
- text={
- createDmTooltipText ??
- (() => (
- <TooltipWithKeybind
- label={i18n._(CREATE_DM_DESCRIPTOR)}
- action="chat_new_dm"
- data-flx="channel.direct-message.dm-list.tooltip-with-keybind"
- />
- ))
- }
- position="top"
- data-flx="channel.direct-message.dm-list.tooltip"
- >
- <span
- className={styles.dmCreateButtonTooltipTarget}
- data-flx="channel.direct-message.direct-message-list.dm-list.dm-create-button-tooltip-target"
- >
- <FocusRing offset={-2} data-flx="channel.direct-message.dm-list.focus-ring--7">
- <button
- type="button"
- className={styles.dmCreateButton}
- onClick={handleOpenCreateDMModal}
- disabled={Boolean(createDmRestriction)}
- aria-label={i18n._(CREATE_DM_DESCRIPTOR)}
- data-flx="channel.direct-message.dm-list.dm-create-button.open-create-dm-modal"
+ {!directMessagesDisabled && (
+ <>
+ <div
+ className={styles.dmSectionSeparator}
+ data-flx="channel.direct-message.dm-list.dm-section-separator"
+ />
+ <div className={styles.dmSectionHeader} data-flx="channel.direct-message.dm-list.dm-section-header">
+ <div
+ className={styles.dmSectionHeaderText}
+ data-flx="channel.direct-message.dm-list.dm-section-header-text"
+ >
+ <span
+ className={styles.dmSectionHeaderLabel}
+ data-flx="channel.direct-message.dm-list.dm-section-header-label"
>
- <PlusIcon
- weight="bold"
- className={styles.iconSize4}
- data-flx="channel.direct-message.dm-list.icon-size4--2"
+ <Trans>Direct messages</Trans>
+ </span>
+ </div>
+ {dmPickerAvailable && (
+ <Tooltip
+ text={
+ createDmTooltipText ??
+ (() => (
+ <TooltipWithKeybind
+ label={i18n._(CREATE_DM_DESCRIPTOR)}
+ action="chat_new_dm"
+ data-flx="channel.direct-message.dm-list.tooltip-with-keybind"
+ />
+ ))
+ }
+ position="top"
+ data-flx="channel.direct-message.dm-list.tooltip"
+ >
+ <span
+ className={styles.dmCreateButtonTooltipTarget}
+ data-flx="channel.direct-message.direct-message-list.dm-list.dm-create-button-tooltip-target"
+ >
+ <FocusRing offset={-2} data-flx="channel.direct-message.dm-list.focus-ring--7">
+ <button
+ type="button"
+ className={styles.dmCreateButton}
+ onClick={handleOpenCreateDMModal}
+ disabled={Boolean(createDmRestriction)}
+ aria-label={i18n._(CREATE_DM_DESCRIPTOR)}
+ data-flx="channel.direct-message.dm-list.dm-create-button.open-create-dm-modal"
+ >
+ <PlusIcon
+ weight="bold"
+ className={styles.iconSize4}
+ data-flx="channel.direct-message.dm-list.icon-size4--2"
+ />
+ </button>
+ </FocusRing>
+ </span>
+ </Tooltip>
+ )}
+ </div>
+ <div
+ className={styles.dmChannelList}
+ ref={dmChannelListRef}
+ data-flx="channel.direct-message.dm-list.dm-channel-list"
+ >
+ {filteredDmChannels.map((channel) => {
+ const isSelected = highlightedChannelId === channel.id;
+ return (
+ <DMListItem
+ key={channel.id}
+ channel={channel}
+ isSelected={isSelected}
+ data-flx="channel.direct-message.dm-list.dm-list-item--2"
/>
- </button>
- </FocusRing>
- </span>
- </Tooltip>
- </div>
- <div
- className={styles.dmChannelList}
- ref={dmChannelListRef}
- role="list"
- data-flx="channel.direct-message.dm-list.dm-channel-list"
- >
- {filteredDmChannels.map((channel) => {
- const isSelected = highlightedChannelId === channel.id;
- return (
- <DMListItem
- key={channel.id}
- channel={channel}
- isSelected={isSelected}
- data-flx="channel.direct-message.dm-list.dm-list-item--2"
- />
- );
- })}
- </div>
+ );
+ })}
+ </div>
+ </>
+ )}
<div className={styles.desktopBottomSpacer} data-flx="channel.direct-message.dm-list.bottom-spacer" />
</div>
</Scroller>