-
+
diff --git a/src/components/sidebar-menu.tsx b/src/components/sidebar-menu.tsx
index f8d091b20..17ca4fc81 100644
--- a/src/components/sidebar-menu.tsx
+++ b/src/components/sidebar-menu.tsx
@@ -11,7 +11,7 @@ import { useAccount } from 'soapbox/api/hooks';
import Account from 'soapbox/components/account';
import { Stack, Divider, HStack, Icon, IconButton, Text } from 'soapbox/components/ui';
import ProfileStats from 'soapbox/features/ui/components/profile-stats';
-import { useAppDispatch, useAppSelector, useGroupsPath, useFeatures } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
import { makeGetOtherAccounts } from 'soapbox/selectors';
import type { List as ImmutableList } from 'immutable';
@@ -88,7 +88,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
const sidebarOpen = useAppSelector((state) => state.sidebar.sidebarOpen);
const settings = useAppSelector((state) => getSettings(state));
const followRequestsCount = useAppSelector((state) => state.user_lists.follow_requests.items.count());
- const groupsPath = useGroupsPath();
const closeButtonRef = React.useRef(null);
@@ -209,7 +208,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
{features.groups && (
{
const features = useFeatures();
const { isDeveloper } = useSettings();
const { account } = useOwnAccount();
- const groupsPath = useGroupsPath();
const notificationCount = useAppSelector((state) => state.notifications.unread);
const followRequestsCount = useAppSelector((state) => state.user_lists.follow_requests.items.count());
@@ -142,7 +141,7 @@ const SidebarNavigation = () => {
{features.groups && (
}
diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx
index 61242fee0..f4cad0d0b 100644
--- a/src/components/status-action-bar.tsx
+++ b/src/components/status-action-bar.tsx
@@ -13,7 +13,7 @@ import { initMuteModal } from 'soapbox/actions/mutes';
import { initReport, ReportableEntities } from 'soapbox/actions/reports';
import { deleteStatus, editStatus, toggleMuteStatus } from 'soapbox/actions/statuses';
import { deleteFromTimelines } from 'soapbox/actions/timelines';
-import { useBlockGroupMember, useGroup, useGroupRelationship, useMuteGroup, useUnmuteGroup } from 'soapbox/api/hooks';
+import { useBlockGroupMember, useGroup, useGroupRelationship } from 'soapbox/api/hooks';
import { useDeleteGroupStatus } from 'soapbox/api/hooks/groups/useDeleteGroupStatus';
import DropdownMenu from 'soapbox/components/dropdown-menu';
import StatusActionButton from 'soapbox/components/status-action-button';
@@ -69,12 +69,7 @@ const messages = defineMessages({
mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
more: { id: 'status.more', defaultMessage: 'More' },
mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
- muteConfirm: { id: 'confirmations.mute_group.confirm', defaultMessage: 'Mute' },
muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute Conversation' },
- muteGroup: { id: 'group.mute.long_label', defaultMessage: 'Mute Group' },
- muteHeading: { id: 'confirmations.mute_group.heading', defaultMessage: 'Mute Group' },
- muteMessage: { id: 'confirmations.mute_group.message', defaultMessage: 'You are about to mute the group. Do you want to continue?' },
- muteSuccess: { id: 'group.mute.success', defaultMessage: 'Muted the group' },
open: { id: 'status.open', defaultMessage: 'Show Post Details' },
pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
pinToGroup: { id: 'status.pin_to_group', defaultMessage: 'Pin to Group' },
@@ -101,8 +96,6 @@ const messages = defineMessages({
share: { id: 'status.share', defaultMessage: 'Share' },
unbookmark: { id: 'status.unbookmark', defaultMessage: 'Remove bookmark' },
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute Conversation' },
- unmuteGroup: { id: 'group.unmute.long_label', defaultMessage: 'Unmute Group' },
- unmuteSuccess: { id: 'group.unmute.success', defaultMessage: 'Unmuted the group' },
unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
unpinFromGroup: { id: 'status.unpin_to_group', defaultMessage: 'Unpin from Group' },
zap: { id: 'status.zap', defaultMessage: 'Zap' },
@@ -128,12 +121,9 @@ const StatusActionBar: React.FC = ({
const intl = useIntl();
const history = useHistory();
const dispatch = useAppDispatch();
- const match = useRouteMatch<{ groupSlug: string }>('/group/:groupSlug');
+ const match = useRouteMatch<{ groupId: string }>('/group/:groupId');
const { group } = useGroup((status.group as Group)?.id as string);
- const muteGroup = useMuteGroup(group as Group);
- const unmuteGroup = useUnmuteGroup(group as Group);
- const isMutingGroup = !!group?.relationship?.muting;
const deleteGroupStatus = useDeleteGroupStatus(group as Group, status.id);
const blockGroupMember = useBlockGroupMember(group as Group, status.account);
@@ -294,27 +284,6 @@ const StatusActionBar: React.FC = ({
dispatch(initMuteModal(status.account));
};
- const handleMuteGroupClick: React.EventHandler = () =>
- dispatch(openModal('CONFIRM', {
- heading: intl.formatMessage(messages.muteHeading),
- message: intl.formatMessage(messages.muteMessage),
- confirm: intl.formatMessage(messages.muteConfirm),
- confirmationTheme: 'primary',
- onConfirm: () => muteGroup.mutate(undefined, {
- onSuccess() {
- toast.success(intl.formatMessage(messages.muteSuccess));
- },
- }),
- }));
-
- const handleUnmuteGroupClick: React.EventHandler = () => {
- unmuteGroup.mutate(undefined, {
- onSuccess() {
- toast.success(intl.formatMessage(messages.unmuteSuccess));
- },
- });
- };
-
const handleBlockClick: React.EventHandler = (e) => {
const account = status.account;
@@ -542,14 +511,6 @@ const StatusActionBar: React.FC = ({
}
menu.push(null);
- if (features.groupsMuting && status.group) {
- menu.push({
- text: isMutingGroup ? intl.formatMessage(messages.unmuteGroup) : intl.formatMessage(messages.muteGroup),
- icon: require('@tabler/icons/outline/volume-3.svg'),
- action: isMutingGroup ? handleUnmuteGroupClick : handleMuteGroupClick,
- });
- menu.push(null);
- }
menu.push({
text: intl.formatMessage(messages.mute, { name: username }),
diff --git a/src/components/status-media.tsx b/src/components/status-media.tsx
index 2c96c0078..77be4b031 100644
--- a/src/components/status-media.tsx
+++ b/src/components/status-media.tsx
@@ -3,7 +3,6 @@ import React, { Suspense } from 'react';
import { openModal } from 'soapbox/actions/modals';
import AttachmentThumbs from 'soapbox/components/attachment-thumbs';
import PreviewCard from 'soapbox/components/preview-card';
-import { GroupLinkPreview } from 'soapbox/features/groups/components/group-link-preview';
import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card';
import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components';
import { useAppDispatch } from 'soapbox/hooks';
@@ -112,10 +111,6 @@ const StatusMedia: React.FC = ({
);
}
- } else if (status.spoiler_text.length === 0 && !status.quote && status.card?.group) {
- media = (
-
- );
} else if (status.spoiler_text.length === 0 && !status.quote && status.card) {
media = (
= (props) => {
),
group: (
-
+
= (props) => {
defaultMessage='Posted in {group}'
values={{
group: (
-
+
diff --git a/src/components/thumb-navigation.tsx b/src/components/thumb-navigation.tsx
index 1aee06594..275bb5a6a 100644
--- a/src/components/thumb-navigation.tsx
+++ b/src/components/thumb-navigation.tsx
@@ -3,12 +3,11 @@ import { FormattedMessage } from 'react-intl';
import ThumbNavigationLink from 'soapbox/components/thumb-navigation-link';
import { useStatContext } from 'soapbox/contexts/stat-context';
-import { useAppSelector, useFeatures, useGroupsPath, useOwnAccount } from 'soapbox/hooks';
+import { useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks';
const ThumbNavigation: React.FC = (): JSX.Element => {
const { account } = useOwnAccount();
const features = useFeatures();
- const groupsPath = useGroupsPath();
const { unreadChatsCount } = useStatContext();
@@ -60,7 +59,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
src={require('@tabler/icons/outline/circles.svg')}
activeSrc={require('@tabler/icons/filled/circles.svg')}
text={}
- to={groupsPath}
+ to='/groups'
exact
/>
)}
diff --git a/src/contexts/chat-context.tsx b/src/contexts/chat-context.tsx
index 14354549e..f1afe4b8b 100644
--- a/src/contexts/chat-context.tsx
+++ b/src/contexts/chat-context.tsx
@@ -2,12 +2,11 @@ import React, { createContext, useContext, useEffect, useMemo, useState } from '
import { useHistory, useParams } from 'react-router-dom';
import { toggleMainWindow } from 'soapbox/actions/chats';
-import { useAppDispatch, useOwnAccount, useSettings } from 'soapbox/hooks';
+import { useAppDispatch, useSettings } from 'soapbox/hooks';
import { IChat, useChat } from 'soapbox/queries/chats';
const ChatContext = createContext({
isOpen: false,
- needsAcceptance: false,
});
enum ChatWidgetScreens {
@@ -25,7 +24,6 @@ const ChatProvider: React.FC = ({ children }) => {
const history = useHistory();
const dispatch = useAppDispatch();
const { chats } = useSettings();
- const { account } = useOwnAccount();
const path = history.location.pathname;
const isUsingMainChatPage = Boolean(path.match(/^\/chats/));
@@ -36,7 +34,6 @@ const ChatProvider: React.FC = ({ children }) => {
const { data: chat } = useChat(currentChatId as string);
- const needsAcceptance = !chat?.accepted && chat?.created_by_account !== account?.id;
const isOpen = chats.mainWindow === 'open';
const changeScreen = (screen: ChatWidgetScreens, currentChatId?: string | null) => {
@@ -48,14 +45,13 @@ const ChatProvider: React.FC = ({ children }) => {
const value = useMemo(() => ({
chat,
- needsAcceptance,
isOpen,
isUsingMainChatPage,
toggleChatPane,
screen,
changeScreen,
currentChatId,
- }), [chat, currentChatId, needsAcceptance, isUsingMainChatPage, isOpen, screen, changeScreen]);
+ }), [chat, currentChatId, isUsingMainChatPage, isOpen, screen, changeScreen]);
useEffect(() => {
if (chatId) {
@@ -76,7 +72,6 @@ interface IChatContext {
chat: IChat | null;
isOpen: boolean;
isUsingMainChatPage?: boolean;
- needsAcceptance: boolean;
toggleChatPane(): void;
screen: ChatWidgetScreens;
currentChatId: string | null;
diff --git a/src/entity-store/entities.ts b/src/entity-store/entities.ts
index 13cdf4eaa..2b6f00c8f 100644
--- a/src/entity-store/entities.ts
+++ b/src/entity-store/entities.ts
@@ -8,7 +8,6 @@ enum Entities {
GROUP_MEMBERSHIPS = 'GroupMemberships',
GROUP_MUTES = 'GroupMutes',
GROUP_RELATIONSHIPS = 'GroupRelationships',
- GROUP_TAGS = 'GroupTags',
PATRON_USERS = 'PatronUsers',
RELATIONSHIPS = 'Relationships',
RELAYS = 'Relays',
@@ -23,7 +22,6 @@ interface EntityTypes {
[Entities.GROUPS]: Schemas.Group;
[Entities.GROUP_MEMBERSHIPS]: Schemas.GroupMember;
[Entities.GROUP_RELATIONSHIPS]: Schemas.GroupRelationship;
- [Entities.GROUP_TAGS]: Schemas.GroupTag;
[Entities.PATRON_USERS]: Schemas.PatronUser;
[Entities.RELATIONSHIPS]: Schemas.Relationship;
[Entities.RELAYS]: Schemas.Relay;
diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx
index 392ecd834..4489c133c 100644
--- a/src/features/account/components/header.tsx
+++ b/src/features/account/components/header.tsx
@@ -24,7 +24,7 @@ import ActionButton from 'soapbox/features/ui/components/action-button';
import SubscriptionButton from 'soapbox/features/ui/components/subscription-button';
import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks';
import { normalizeAttachment } from 'soapbox/normalizers';
-import { ChatKeys, useChats } from 'soapbox/queries/chats';
+import { useChats } from 'soapbox/queries/chats';
import { queryClient } from 'soapbox/queries/client';
import { Account } from 'soapbox/schemas';
import toast from 'soapbox/toast';
@@ -101,7 +101,7 @@ const Header: React.FC = ({ account }) => {
onSuccess: (response) => {
history.push(`/chats/${response.data.id}`);
queryClient.invalidateQueries({
- queryKey: ChatKeys.chatSearch(),
+ queryKey: ['chats', 'search'],
});
},
});
@@ -555,24 +555,7 @@ const Header: React.FC = ({ account }) => {
return null;
}
- if (features.chatsWithFollowers) { // Truth Social
- const canChat = account.relationship?.followed_by;
- if (!canChat) {
- return null;
- }
-
- return (
- createAndNavigateToChat.mutate(account.id)}
- title={intl.formatMessage(messages.chat, { name: account.username })}
- theme='outlined'
- className='px-2'
- iconClassName='h-4 w-4'
- disabled={createAndNavigateToChat.isPending}
- />
- );
- } else if (account.pleroma?.accepts_chat_messages) {
+ if (account.pleroma?.accepts_chat_messages) {
return (
(
-
-
- Homepage
-
-);
-
-describe('', () => {
- it('handles successful responses from the API', async() => {
- __stub(mock => {
- mock.onPost('/api/v1/truth/password_reset/confirm')
- .reply(200, {});
- });
-
- render(
- ,
- {},
- null,
- { initialEntries: ['/edit'] },
- );
-
- fireEvent.submit(
- screen.getByTestId('form'), {
- preventDefault: () => {},
- },
- );
-
- await waitFor(() => {
- expect(screen.getByTestId('home')).toHaveTextContent('Homepage');
- expect(screen.queryByTestId('form-group-error')).not.toBeInTheDocument();
- });
- });
-
- it('handles failed responses from the API', async() => {
- __stub(mock => {
- mock.onPost('/api/v1/truth/password_reset/confirm')
- .reply(403, {});
- });
-
- render(
- ,
- {},
- null,
- { initialEntries: ['/edit'] },
- );
-
- await fireEvent.submit(
- screen.getByTestId('form'), {
- preventDefault: () => {},
- },
- );
-
- await waitFor(() => {
- expect(screen.queryByTestId('home')).not.toBeInTheDocument();
- expect(screen.queryByTestId('form-group-error')).toBeInTheDocument();
- });
- });
-});
diff --git a/src/features/auth-login/components/password-reset-confirm.tsx b/src/features/auth-login/components/password-reset-confirm.tsx
deleted file mode 100644
index c079b418d..000000000
--- a/src/features/auth-login/components/password-reset-confirm.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-import { Redirect } from 'react-router-dom';
-
-import { resetPasswordConfirm } from 'soapbox/actions/security';
-import { BigCard } from 'soapbox/components/big-card';
-import { Button, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui';
-import { useAppDispatch } from 'soapbox/hooks';
-
-const token = new URLSearchParams(window.location.search).get('reset_password_token');
-
-const messages = defineMessages({
- resetPasswordFail: { id: 'reset_password.fail', defaultMessage: 'Expired token, please try again.' },
- passwordPlaceholder: { id: 'reset_password.password.placeholder', defaultMessage: 'Placeholder' },
-});
-
-const Statuses = {
- IDLE: 'IDLE',
- LOADING: 'LOADING',
- SUCCESS: 'SUCCESS',
- FAIL: 'FAIL',
-};
-
-const PasswordResetConfirm = () => {
- const intl = useIntl();
- const dispatch = useAppDispatch();
-
- const [password, setPassword] = React.useState('');
- const [status, setStatus] = React.useState(Statuses.IDLE);
-
- const isLoading = status === Statuses.LOADING;
-
- const handleSubmit: React.FormEventHandler = React.useCallback((event) => {
- event.preventDefault();
-
- setStatus(Statuses.LOADING);
- dispatch(resetPasswordConfirm(password, token as string))
- .then(() => setStatus(Statuses.SUCCESS))
- .catch(() => setStatus(Statuses.FAIL));
- }, [password]);
-
- const onChange: React.ChangeEventHandler = React.useCallback((event) => {
- setPassword(event.target.value);
- }, []);
-
- const renderErrors = () => {
- if (status === Statuses.FAIL) {
- return [intl.formatMessage(messages.resetPasswordFail)];
- }
-
- return [];
- };
-
- if (status === Statuses.SUCCESS) {
- return ;
- }
-
- return (
- }>
-
-
- );
-};
-
-export default PasswordResetConfirm;
diff --git a/src/features/chats/components/chat-list-item.test.tsx b/src/features/chats/components/chat-list-item.test.tsx
index cd6ad0421..294456dc3 100644
--- a/src/features/chats/components/chat-list-item.test.tsx
+++ b/src/features/chats/components/chat-list-item.test.tsx
@@ -8,20 +8,17 @@ import ChatListItem from './chat-list-item';
const chat: any = {
id: '1',
unread: 5,
- created_by_account: '2',
last_message: {
account_id: '2',
chat_id: '1',
content: 'hello world',
created_at: '2022-09-09T16:02:26.186Z',
- discarded_at: null,
id: '12332423234',
unread: true,
},
created_at: '2022-09-09T16:02:26.186Z',
updated_at: '2022-09-09T16:02:26.186Z',
accepted: true,
- discarded_at: null,
account: {
acct: 'username',
display_name: 'johnnie',
diff --git a/src/features/chats/components/chat-list.tsx b/src/features/chats/components/chat-list.tsx
index 0c353e940..f896f027b 100644
--- a/src/features/chats/components/chat-list.tsx
+++ b/src/features/chats/components/chat-list.tsx
@@ -14,15 +14,14 @@ import ChatListItem from './chat-list-item';
interface IChatList {
onClickChat: (chat: any) => void;
useWindowScroll?: boolean;
- searchValue?: string;
}
-const ChatList: React.FC = ({ onClickChat, useWindowScroll = false, searchValue }) => {
+const ChatList: React.FC = ({ onClickChat, useWindowScroll = false }) => {
const dispatch = useAppDispatch();
const chatListRef = useRef(null);
- const { chatsQuery: { data: chats, isFetching, hasNextPage, fetchNextPage } } = useChats(searchValue);
+ const { chatsQuery: { data: chats, isFetching, hasNextPage, fetchNextPage } } = useChats();
const [isNearBottom, setNearBottom] = useState(false);
const [isNearTop, setNearTop] = useState(true);
diff --git a/src/features/chats/components/chat-message-list-intro.tsx b/src/features/chats/components/chat-message-list-intro.tsx
deleted file mode 100644
index d41c55240..000000000
--- a/src/features/chats/components/chat-message-list-intro.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import clsx from 'clsx';
-import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
-import { useHistory } from 'react-router-dom';
-
-import { openModal } from 'soapbox/actions/modals';
-import Link from 'soapbox/components/link';
-import { Avatar, Button, HStack, Icon, Stack, Text } from 'soapbox/components/ui';
-import { useChatContext } from 'soapbox/contexts/chat-context';
-import { useAppDispatch, useFeatures } from 'soapbox/hooks';
-import { useChatActions } from 'soapbox/queries/chats';
-import { secondsToDays } from 'soapbox/utils/numbers';
-
-const messages = defineMessages({
- leaveChatHeading: { id: 'chat_message_list_intro.leave_chat.heading', defaultMessage: 'Leave Chat' },
- leaveChatMessage: { id: 'chat_message_list_intro.leave_chat.message', defaultMessage: 'Are you sure you want to leave this chat? Messages will be deleted for you and this chat will be removed from your inbox.' },
- leaveChatConfirm: { id: 'chat_message_list_intro.leave_chat.confirm', defaultMessage: 'Leave Chat' },
- intro: { id: 'chat_message_list_intro.intro', defaultMessage: 'wants to start a chat with you' },
- accept: { id: 'chat_message_list_intro.actions.accept', defaultMessage: 'Accept' },
- leaveChat: { id: 'chat_message_list_intro.actions.leave_chat', defaultMessage: 'Leave chat' },
- report: { id: 'chat_message_list_intro.actions.report', defaultMessage: 'Report' },
- messageLifespan: { id: 'chat_message_list_intro.actions.message_lifespan', defaultMessage: 'Messages older than {day, plural, one {# day} other {# days}} are deleted.' },
-});
-
-const ChatMessageListIntro = () => {
- const dispatch = useAppDispatch();
- const intl = useIntl();
- const features = useFeatures();
- const history = useHistory();
-
- const { chat, isUsingMainChatPage, needsAcceptance } = useChatContext();
- const { acceptChat, deleteChat } = useChatActions(chat?.id as string);
-
- const handleLeaveChat = () => {
- dispatch(openModal('CONFIRM', {
- heading: intl.formatMessage(messages.leaveChatHeading),
- message: intl.formatMessage(messages.leaveChatMessage),
- confirm: intl.formatMessage(messages.leaveChatConfirm),
- confirmationTheme: 'primary',
- onConfirm: () => {
- deleteChat.mutate(undefined, {
- onSuccess() {
- if (isUsingMainChatPage) {
- history.push('/chats');
- }
- },
- });
- },
- }));
- };
-
- if (!chat || !features.chatAcceptance) {
- return null;
- }
-
- return (
-
-
-
-
-
-
-
- {needsAcceptance ? (
- <>
- @{chat.account.acct}
- {' '}
- {intl.formatMessage(messages.intro)}
-
- ) : (
-
- @{chat.account.acct}
-
- )}
-
-
-
- {needsAcceptance ? (
-
-
-
-
-
- ) : (
-
-
- {chat.message_expiration && (
-
- {intl.formatMessage(messages.messageLifespan, { day: secondsToDays(chat.message_expiration) })}
-
- )}
-
- )}
-
- );
-};
-
-export default ChatMessageListIntro;
diff --git a/src/features/chats/components/chat-message-list.test.tsx b/src/features/chats/components/chat-message-list.test.tsx
index 23c522e81..c62805799 100644
--- a/src/features/chats/components/chat-message-list.test.tsx
+++ b/src/features/chats/components/chat-message-list.test.tsx
@@ -13,7 +13,6 @@ import { ChatMessage } from 'soapbox/types/entities';
import ChatMessageList from './chat-message-list';
const chat: IChat = {
- accepted: true,
account: buildAccount({
username: 'username',
verified: true,
@@ -23,15 +22,9 @@ const chat: IChat = {
avatar_static: 'avatar',
display_name: 'my name',
}),
- chat_type: 'direct',
created_at: '2020-06-10T02:05:06.000Z',
- created_by_account: '2',
- discarded_at: null,
id: '14',
last_message: null,
- latest_read_message_by_account: [],
- latest_read_message_created_at: null,
- message_expiration: 1209600,
unread: 5,
};
@@ -41,8 +34,6 @@ const chatMessages: ChatMessage[] = [
chat_id: '14',
content: 'this is the first chat',
created_at: '2022-09-09T16:02:26.186Z',
- emoji_reactions: null,
- expiration: 1209600,
id: '1',
unread: false,
pending: false,
@@ -52,8 +43,6 @@ const chatMessages: ChatMessage[] = [
chat_id: '14',
content: 'this is the second chat',
created_at: '2022-09-09T16:04:26.186Z',
- emoji_reactions: null,
- expiration: 1209600,
id: '2',
unread: true,
pending: false,
diff --git a/src/features/chats/components/chat-message-list.tsx b/src/features/chats/components/chat-message-list.tsx
index 0d8272cd0..84c9de270 100644
--- a/src/features/chats/components/chat-message-list.tsx
+++ b/src/features/chats/components/chat-message-list.tsx
@@ -4,11 +4,10 @@ import { Components, Virtuoso, VirtuosoHandle } from 'react-virtuoso';
import { Avatar, Button, Divider, Spinner, Stack, Text } from 'soapbox/components/ui';
import PlaceholderChatMessage from 'soapbox/features/placeholder/components/placeholder-chat-message';
-import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
+import { useAppSelector } from 'soapbox/hooks';
import { IChat, useChatActions, useChatMessages } from 'soapbox/queries/chats';
import ChatMessage from './chat-message';
-import ChatMessageListIntro from './chat-message-list-intro';
import type { ChatMessage as ChatMessageEntity } from 'soapbox/types/entities';
@@ -69,10 +68,6 @@ interface IChatMessageList {
/** Scrollable list of chat messages. */
const ChatMessageList: React.FC = ({ chat }) => {
const intl = useIntl();
- const { account } = useOwnAccount();
-
- const myLastReadMessageDateString = chat.latest_read_message_by_account?.find((latest) => latest.id === account?.id)?.date;
- const myLastReadMessageTimestamp = myLastReadMessageDateString ? new Date(myLastReadMessageDateString) : null;
const node = useRef(null);
const [firstItemIndex, setFirstItemIndex] = useState(START_INDEX - 20);
@@ -174,14 +169,13 @@ const ChatMessageList: React.FC = ({ chat }) => {
const lastMessageId = lastMessage.id;
const isMessagePending = lastMessage.pending;
- const isAlreadyRead = myLastReadMessageTimestamp ? myLastReadMessageTimestamp >= new Date(lastMessage.created_at) : false;
/**
* Only "mark the message as read" if..
* 1) it is not pending and
* 2) it has not already been read
*/
- if (!isMessagePending && !isAlreadyRead) {
+ if (!isMessagePending) {
markChatAsRead(lastMessageId);
}
}, [formattedChatMessages.length]);
@@ -265,10 +259,6 @@ const ChatMessageList: React.FC = ({ chat }) => {
return ;
}
- if (!hasNextPage && !isLoading) {
- return ;
- }
-
return null;
},
}}
diff --git a/src/features/chats/components/chat-message-reaction-wrapper/chat-message-reaction-wrapper.tsx b/src/features/chats/components/chat-message-reaction-wrapper/chat-message-reaction-wrapper.tsx
deleted file mode 100644
index 6e604ff09..000000000
--- a/src/features/chats/components/chat-message-reaction-wrapper/chat-message-reaction-wrapper.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { useState, useEffect } from 'react';
-
-import { Portal } from 'soapbox/components/ui';
-import EmojiSelector from 'soapbox/components/ui/emoji-selector/emoji-selector';
-
-interface IChatMessageReactionWrapper {
- onOpen(isOpen: boolean): void;
- onSelect(emoji: string): void;
- children: JSX.Element;
-}
-
-/**
- * Emoji Reaction Selector
- */
-function ChatMessageReactionWrapper(props: IChatMessageReactionWrapper) {
- const { onOpen, onSelect, children } = props;
-
- const [isOpen, setIsOpen] = useState(false);
-
- const [referenceElement, setReferenceElement] = useState(null);
-
- const handleSelect = (emoji: string) => {
- onSelect(emoji);
- setIsOpen(false);
- };
-
- const onToggleVisibility = () => setIsOpen((prevValue) => !prevValue);
-
- useEffect(() => {
- onOpen(isOpen);
- }, [isOpen]);
-
- return (
-
- {React.cloneElement(children, {
- ref: setReferenceElement,
- onClick: onToggleVisibility,
- })}
-
- {isOpen && (
-
- setIsOpen(false)}
- offsetOptions={{ mainAxis: 12, crossAxis: -10 }}
- all={false}
- />
-
- )}
-
- );
-}
-
-export default ChatMessageReactionWrapper;
\ No newline at end of file
diff --git a/src/features/chats/components/chat-message-reaction.test.tsx b/src/features/chats/components/chat-message-reaction.test.tsx
deleted file mode 100644
index 88f102711..000000000
--- a/src/features/chats/components/chat-message-reaction.test.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import userEvent from '@testing-library/user-event';
-import React from 'react';
-
-import { render, screen } from 'soapbox/jest/test-helpers';
-
-import ChatMessageReaction from './chat-message-reaction';
-
-const emojiReaction = ({
- name: '👍',
- count: 1,
- me: false,
-});
-
-describe('', () => {
- it('renders properly', () => {
- render(
- ,
- );
-
- expect(screen.getByRole('img').getAttribute('alt')).toEqual(emojiReaction.name);
- expect(screen.getByRole('button')).toHaveTextContent(String(emojiReaction.count));
- });
-
- it('triggers the "onAddReaction" function', async () => {
- const onAddFn = vi.fn();
- const onRemoveFn = vi.fn();
- const user = userEvent.setup();
-
- render(
- ,
- );
-
- expect(onAddFn).not.toBeCalled();
- expect(onRemoveFn).not.toBeCalled();
-
- await user.click(screen.getByRole('button'));
-
- // add function triggered
- expect(onAddFn).toBeCalled();
- expect(onRemoveFn).not.toBeCalled();
- });
-
- it('triggers the "onRemoveReaction" function', async () => {
- const onAddFn = vi.fn();
- const onRemoveFn = vi.fn();
- const user = userEvent.setup();
-
- render(
- ,
- );
-
- expect(onAddFn).not.toBeCalled();
- expect(onRemoveFn).not.toBeCalled();
-
- await user.click(screen.getByRole('button'));
-
- // remove function triggered
- expect(onAddFn).not.toBeCalled();
- expect(onRemoveFn).toBeCalled();
- });
-});
\ No newline at end of file
diff --git a/src/features/chats/components/chat-message-reaction.tsx b/src/features/chats/components/chat-message-reaction.tsx
deleted file mode 100644
index 3b054bd50..000000000
--- a/src/features/chats/components/chat-message-reaction.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import clsx from 'clsx';
-import React from 'react';
-
-import { Text } from 'soapbox/components/ui';
-import emojify from 'soapbox/features/emoji';
-import { EmojiReaction } from 'soapbox/types/entities';
-
-interface IChatMessageReaction {
- emojiReaction: EmojiReaction;
- onRemoveReaction(emoji: string): void;
- onAddReaction(emoji: string): void;
-}
-
-const ChatMessageReaction = (props: IChatMessageReaction) => {
- const { emojiReaction, onAddReaction, onRemoveReaction } = props;
-
- const isAlreadyReacted = emojiReaction.me;
-
- const handleClick = () => {
- if (isAlreadyReacted) {
- onRemoveReaction(emojiReaction.name);
- } else {
- onAddReaction(emojiReaction.name);
- }
- };
-
- return (
-
- );
-};
-
-export default ChatMessageReaction;
diff --git a/src/features/chats/components/chat-message.tsx b/src/features/chats/components/chat-message.tsx
index 3498ecddf..5921149ca 100644
--- a/src/features/chats/components/chat-message.tsx
+++ b/src/features/chats/components/chat-message.tsx
@@ -6,20 +6,16 @@ import React, { useMemo, useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { openModal } from 'soapbox/actions/modals';
-import { initReport, ReportableEntities } from 'soapbox/actions/reports';
import DropdownMenu from 'soapbox/components/dropdown-menu';
import { HStack, Icon, Stack, Text } from 'soapbox/components/ui';
import emojify from 'soapbox/features/emoji';
import { MediaGallery } from 'soapbox/features/ui/util/async-components';
-import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import { ChatKeys, IChat, useChatActions } from 'soapbox/queries/chats';
import { queryClient } from 'soapbox/queries/client';
import { stripHTML } from 'soapbox/utils/html';
import { onlyEmoji } from 'soapbox/utils/rich-content';
-import ChatMessageReaction from './chat-message-reaction';
-import ChatMessageReactionWrapper from './chat-message-reaction-wrapper/chat-message-reaction-wrapper';
-
import type { Menu as IMenu } from 'soapbox/components/dropdown-menu';
import type { ChatMessage as ChatMessageEntity } from 'soapbox/types/entities';
@@ -59,13 +55,11 @@ const ChatMessage = (props: IChatMessage) => {
const { chat, chatMessage } = props;
const dispatch = useAppDispatch();
- const features = useFeatures();
const intl = useIntl();
const me = useAppSelector((state) => state.me);
- const { createReaction, deleteChatMessage, deleteReaction } = useChatActions(chat.id);
+ const { deleteChatMessage } = useChatActions(chat.id);
- const [isReactionSelectorOpen, setIsReactionSelectorOpen] = useState(false);
const [isMenuOpen, setIsMenuOpen] = useState(false);
const handleDeleteMessage = useMutation({
@@ -78,32 +72,14 @@ const ChatMessage = (props: IChatMessage) => {
});
const content = parseContent(chatMessage);
- const lastReadMessageDateString = chat.latest_read_message_by_account?.find((latest) => latest.id === chat.account.id)?.date;
- const lastReadMessageTimestamp = lastReadMessageDateString ? new Date(lastReadMessageDateString) : null;
const isMyMessage = chatMessage.account_id === me;
- // did this occur before this time?
- const isRead = isMyMessage
- && lastReadMessageTimestamp
- && lastReadMessageTimestamp >= new Date(chatMessage.created_at);
-
const isOnlyEmoji = useMemo(() => {
const hiddenEl = document.createElement('div');
hiddenEl.innerHTML = content;
return onlyEmoji(hiddenEl, BIG_EMOJI_LIMIT, false);
}, []);
- const emojiReactionRows = useMemo(() => {
- if (!chatMessage.emoji_reactions) {
- return [];
- }
-
- return chatMessage.emoji_reactions.reduce((rows: any, key: any, index) => {
- return (index % 4 === 0 ? rows.push([key])
- : rows[rows.length - 1].push(key)) && rows;
- }, []);
- }, [chatMessage.emoji_reactions]);
-
const onOpenMedia = (media: any, index: number) => {
dispatch(openModal('MEDIA', { media, index }));
};
@@ -171,13 +147,6 @@ const ChatMessage = (props: IChatMessage) => {
destructive: true,
});
} else {
- if (features.reportChats) {
- menu.push({
- text: intl.formatMessage(messages.report),
- action: () => dispatch(initReport(ReportableEntities.CHAT_MESSAGE, chat.account, { chatMessage })),
- icon: require('@tabler/icons/outline/flag.svg'),
- });
- }
menu.push({
text: intl.formatMessage(messages.deleteForMe),
action: () => handleDeleteMessage.mutate(chatMessage.id),
@@ -194,7 +163,7 @@ const ChatMessage = (props: IChatMessage) => {
className={
clsx({
'group relative px-4 py-2 hover:bg-gray-200/40 dark:hover:bg-gray-800/40': true,
- 'bg-gray-200/40 dark:bg-gray-800/40': isMenuOpen || isReactionSelectorOpen,
+ 'bg-gray-200/40 dark:bg-gray-800/40': isMenuOpen,
})
}
data-testid='chat-message'
@@ -205,29 +174,10 @@ const ChatMessage = (props: IChatMessage) => {
'p-1 flex items-center space-x-0.5 z-10 absolute opacity-0 transition-opacity group-hover:opacity-100 focus:opacity-100 rounded-md shadow-lg bg-white dark:bg-gray-900 dark:ring-2 dark:ring-primary-700': true,
'top-2 right-2': !isMyMessage,
'top-2 left-2': isMyMessage,
- '!opacity-100': isMenuOpen || isReactionSelectorOpen,
+ '!opacity-100': isMenuOpen,
})
}
>
- {features.chatEmojiReactions && (
- createReaction.mutate({ emoji, messageId: chatMessage.id, chatMessage })}
- >
-
-
- )}
{menu.length > 0 && (
{
- {(chatMessage.emoji_reactions?.length) ? (
-
- {emojiReactionRows?.map((emojiReactionRow: any, idx: number) => (
-
- {emojiReactionRow.map((emojiReaction: any, idx: number) => (
- createReaction.mutate({ emoji, messageId: chatMessage.id, chatMessage })}
- onRemoveReaction={(emoji) => deleteReaction.mutate({ emoji, messageId: chatMessage.id })}
- />
- ))}
-
- ))}
-
- ) : null}
-
{
{intl.formatTime(chatMessage.created_at)}
-
- {(isMyMessage && features.chatsReadReceipts) ? (
- <>
- {isRead ? (
-
-
-
- ) : (
-
-
-
- )}
-
- ) : null}