moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chats: make message_expiration optional (for Pleroma compatibility)

This commit is contained in:
Alex Gleason 2022-11-02 13:53:41 -05:00
parent eeb8ca37a6
commit 239b2af553
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/soapbox/features/chats/components/chat-message-list-intro.tsx
View File

@ -97,9 +97,11 @@ const ChatMessageListIntro = () => {
) : ( ) : (
<HStack justifyContent='center' alignItems='center' space={1} className='flex-shrink-0'> <HStack justifyContent='center' alignItems='center' space={1} className='flex-shrink-0'>
<Icon src={require('@tabler/icons/clock.svg')} className='text-gray-600 w-4 h-4' /> <Icon src={require('@tabler/icons/clock.svg')} className='text-gray-600 w-4 h-4' />
<Text size='sm' theme='muted'> {chat.message_expiration && (
{intl.formatMessage(messages.messageLifespan, { day: secondsToDays(chat.message_expiration) })} <Text size='sm' theme='muted'>
</Text> {intl.formatMessage(messages.messageLifespan, { day: secondsToDays(chat.message_expiration) })}
</Text>
)}
</HStack> </HStack>
)} )}
</Stack> </Stack>

22
app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx
View File

@ -105,16 +105,18 @@ const ChatPageMain = () => {
{chat.account?.verified && <VerificationBadge />} {chat.account?.verified && <VerificationBadge />}
</div> </div>
<Text {chat.message_expiration && (
align='left' <Text
size='sm' align='left'
weight='medium' size='sm'
theme='primary' weight='medium'
truncate theme='primary'
className='w-full' truncate
> className='w-full'
{intl.formatMessage(messages.autoDeleteMessage, { day: secondsToDays(chat.message_expiration) })} >
</Text> {intl.formatMessage(messages.autoDeleteMessage, { day: secondsToDays(chat.message_expiration) })}
</Text>
)}
</Stack> </Stack>
</HStack> </HStack>

8
app/soapbox/features/chats/components/chat-widget/chat-window.tsx
View File

@ -87,9 +87,11 @@ const ChatWindow = () => {
<Text size='sm' weight='bold' truncate>{chat.account.display_name}</Text> <Text size='sm' weight='bold' truncate>{chat.account.display_name}</Text>
{chat.account.verified && <VerificationBadge />} {chat.account.verified && <VerificationBadge />}
</div> </div>
<Text size='sm' weight='medium' theme='primary' truncate> {chat.message_expiration && (
{intl.formatMessage(messages.autoDeleteMessage, { day: secondsToDays(chat.message_expiration) })} <Text size='sm' weight='medium' theme='primary' truncate>
</Text> {intl.formatMessage(messages.autoDeleteMessage, { day: secondsToDays(chat.message_expiration) })}
</Text>
)}
</Stack> </Stack>
</LinkWrapper> </LinkWrapper>
</HStack> </HStack>

2
app/soapbox/queries/chats.ts
View File

@ -44,7 +44,7 @@ export interface IChat {
[id: number]: string [id: number]: string
}[] }[]
latest_read_message_created_at: null | string latest_read_message_created_at: null | string
message_expiration: MessageExpirationValues message_expiration?: MessageExpirationValues
unread: number unread: number
} }