bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide message history if blocked

Browse source
This commit is contained in:
Chewbacca 2022-10-25 13:07:25 -04:00
parent 70957fe540
commit f156c1026d
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/soapbox/features/chats/components/chat-composer.tsx
View file

@ -12,7 +12,6 @@ const messages = defineMessages({
send: { id: 'chat.actions.send', defaultMessage: 'Send' }, send: { id: 'chat.actions.send', defaultMessage: 'Send' },
failedToSend: { id: 'chat.failed_to_send', defaultMessage: 'Message failed to send.' }, failedToSend: { id: 'chat.failed_to_send', defaultMessage: 'Message failed to send.' },
retry: { id: 'chat.retry', defaultMessage: 'Retry?' }, retry: { id: 'chat.retry', defaultMessage: 'Retry?' },
blockedBy: { id: 'chat_message_list.blockedBy', defaultMessage: 'You are blocked by' },
blocked: { id: 'chat_message_list.blocked', defaultMessage: 'You blocked this user' }, blocked: { id: 'chat_message_list.blocked', defaultMessage: 'You blocked this user' },
unblock: { id: 'chat_composer.unblock', defaultMessage: 'Unblock' }, unblock: { id: 'chat_composer.unblock', defaultMessage: 'Unblock' },
unblockMessage: { id: 'chat_settings.unblock.message', defaultMessage: 'Unblocking will allow you to resume messaging with the user.' }, unblockMessage: { id: 'chat_settings.unblock.message', defaultMessage: 'Unblocking will allow you to resume messaging with the user.' },
@ -71,17 +70,7 @@ const ChatComposer = React.forwardRef<HTMLTextAreaElement | null, IChatComposer>
} }
if (isBlocked) { if (isBlocked) {
return ( return null;
<div className='mt-auto p-6 shadow-3xl dark:border-t-2 dark:border-solid dark:border-gray-800'>
<Text align='center' theme='muted'>
<>
<Text tag='span' theme='inherit'>{intl.formatMessage(messages.blockedBy)}</Text>
{' '}
<Text tag='span' theme='inherit'>@{chat?.account?.acct}</Text>
</>
</Text>
</div>
);
} }
return ( return (

19
app/soapbox/features/chats/components/chat-message-list.tsx
View file

@ -35,6 +35,7 @@ const messages = defineMessages({
copy: { id: 'chats.actions.copy', defaultMessage: 'Copy' }, copy: { id: 'chats.actions.copy', defaultMessage: 'Copy' },
report: { id: 'chats.actions.report', defaultMessage: 'Report' }, report: { id: 'chats.actions.report', defaultMessage: 'Report' },
deleteForMe: { id: 'chats.actions.deleteForMe', defaultMessage: 'Delete for me' }, deleteForMe: { id: 'chats.actions.deleteForMe', defaultMessage: 'Delete for me' },
blockedBy: { id: 'chat_message_list.blockedBy', defaultMessage: 'You are blocked by' },
networkFailureTitle: { id: 'chat_message_list.network_failure.title', defaultMessage: 'Whoops!' }, networkFailureTitle: { id: 'chat_message_list.network_failure.title', defaultMessage: 'Whoops!' },
networkFailureSubtitle: { id: 'chat_message_list.network_failure.subtitle', defaultMessage: 'We encountered a network failure.' }, networkFailureSubtitle: { id: 'chat_message_list.network_failure.subtitle', defaultMessage: 'We encountered a network failure.' },
networkFailureAction: { id: 'chat_message_list.network_failure.action', defaultMessage: 'Try again' }, networkFailureAction: { id: 'chat_message_list.network_failure.action', defaultMessage: 'Try again' },
@ -91,6 +92,7 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat, autosize }) => {
const formattedChatMessages = chatMessages || []; const formattedChatMessages = chatMessages || [];
const me = useAppSelector((state) => state.me); const me = useAppSelector((state) => state.me);
const isBlocked = useAppSelector((state) => state.getIn(['relationships', chat.account.id, 'blocked_by']));
const handleDeleteMessage = useMutation((chatMessageId: string) => deleteChatMessage(chatMessageId), { const handleDeleteMessage = useMutation((chatMessageId: string) => deleteChatMessage(chatMessageId), {
onSettled: () => { onSettled: () => {
@ -349,6 +351,23 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat, autosize }) => {
} }
}, [formattedChatMessages.length]); }, [formattedChatMessages.length]);
if (isBlocked) {
return (
<Stack alignItems='center' justifyContent='center' className='h-full flex-grow'>
<Stack alignItems='center' space={2}>
<Avatar src={chat.account.avatar} size={75} />
<Text align='center'>
<>
<Text tag='span'>{intl.formatMessage(messages.blockedBy)}</Text>
{' '}
<Text tag='span' theme='primary'>@{chat.account.acct}</Text>
</>
</Text>
</Stack>
</Stack>
);
}
if (isError) { if (isError) {
return ( return (
<Stack alignItems='center' justifyContent='center' className='h-full flex-grow'> <Stack alignItems='center' justifyContent='center' className='h-full flex-grow'>