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

Merge branch 'develop' into hooks-migration

Browse source
This commit is contained in:
marcin mikołajczak 2024-10-22 08:24:09 +02:00
commit e583d15d0d
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/pl-fe/src/features/admin/components/report.tsx
View file

@ -127,10 +127,9 @@ const Report: React.FC<IReport> = ({ id }) => {
<Stack> <Stack>
{!!report.comment && report.comment.length > 0 && ( {!!report.comment && report.comment.length > 0 && (
<Text <Text tag='blockquote'>
tag='blockquote' {report.comment}
dangerouslySetInnerHTML={{ __html: report.comment }} </Text>
/>
)} )}
{!!account && ( {!!account && (

6
packages/pl-fe/src/features/chats/components/chat-list-item.tsx
View file

@ -4,6 +4,7 @@ import { useHistory } from 'react-router-dom';
import { useRelationship } from 'pl-fe/api/hooks/accounts/useRelationship'; import { useRelationship } from 'pl-fe/api/hooks/accounts/useRelationship';
import DropdownMenu from 'pl-fe/components/dropdown-menu'; import DropdownMenu from 'pl-fe/components/dropdown-menu';
import { ParsedContent } from 'pl-fe/components/parsed-content';
import RelativeTimestamp from 'pl-fe/components/relative-timestamp'; import RelativeTimestamp from 'pl-fe/components/relative-timestamp';
import Avatar from 'pl-fe/components/ui/avatar'; import Avatar from 'pl-fe/components/ui/avatar';
import HStack from 'pl-fe/components/ui/hstack'; import HStack from 'pl-fe/components/ui/hstack';
@ -124,8 +125,9 @@ const ChatListItem: React.FC<IChatListItemInterface> = ({ chat, onClick }) => {
truncate truncate
className='truncate-child pointer-events-none h-5 w-full' className='truncate-child pointer-events-none h-5 w-full'
data-testid='chat-last-message' data-testid='chat-last-message'
dangerouslySetInnerHTML={{ __html: chat.last_message?.content }} >
/> <ParsedContent html={chat.last_message?.content} emojis={chat.last_message.emojis} />
</Text>
)} )}
</> </>
)} )}

4
packages/pl-fe/src/features/chats/components/chat-message.tsx
View file

@ -5,11 +5,11 @@ import React, { useMemo, useState } from 'react';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import DropdownMenu from 'pl-fe/components/dropdown-menu'; import DropdownMenu from 'pl-fe/components/dropdown-menu';
import { ParsedContent } from 'pl-fe/components/parsed-content';
import HStack from 'pl-fe/components/ui/hstack'; import HStack from 'pl-fe/components/ui/hstack';
import Icon from 'pl-fe/components/ui/icon'; import Icon from 'pl-fe/components/ui/icon';
import Stack from 'pl-fe/components/ui/stack'; import Stack from 'pl-fe/components/ui/stack';
import Text from 'pl-fe/components/ui/text'; import Text from 'pl-fe/components/ui/text';
import Emojify from 'pl-fe/features/emoji/emojify';
import { MediaGallery } from 'pl-fe/features/ui/util/async-components'; import { MediaGallery } from 'pl-fe/features/ui/util/async-components';
import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; import { useAppSelector } from 'pl-fe/hooks/useAppSelector';
import { ChatKeys, useChatActions } from 'pl-fe/queries/chats'; import { ChatKeys, useChatActions } from 'pl-fe/queries/chats';
@ -240,7 +240,7 @@ const ChatMessage = (props: IChatMessage) => {
tabIndex={0} tabIndex={0}
> >
<Text size='sm' theme='inherit' className='break-word-nested'> <Text size='sm' theme='inherit' className='break-word-nested'>
<Emojify text={content} emojis={chatMessage.emojis} /> <ParsedContent html={content} emojis={chatMessage.emojis} />
</Text> </Text>
</div> </div>
</HStack> </HStack>

2
packages/pl-fe/src/features/status/components/detailed-status.tsx
View file

@ -25,7 +25,7 @@ import StatusTypeIcon from './status-type-icon';
import type { SelectedStatus } from 'pl-fe/selectors'; import type { SelectedStatus } from 'pl-fe/selectors';
const messages = defineMessages({ const messages = defineMessages({
applicationName: { id: 'status.application_name', defaultMessage: 'Sent form {name}' }, applicationName: { id: 'status.application_name', defaultMessage: 'Sent from {name}' },
}); });
interface IDetailedStatus { interface IDetailedStatus {

2
packages/pl-fe/src/locales/en.json
View file

@ -1434,7 +1434,7 @@
"status.add_known_language": "Do not auto-translate posts in {language}.", "status.add_known_language": "Do not auto-translate posts in {language}.",
"status.admin_account": "Moderate @{name}", "status.admin_account": "Moderate @{name}",
"status.admin_status": "Open this post in the moderation interface", "status.admin_status": "Open this post in the moderation interface",
"status.application_name": "Sent form {name}", "status.application_name": "Sent from {name}",
"status.approval.pending": "Pending approval", "status.approval.pending": "Pending approval",
"status.approval.rejected": "Rejected", "status.approval.rejected": "Rejected",
"status.bookmark": "Bookmark", "status.bookmark": "Bookmark",