cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-22 07:00:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

merge: branch 'master' into production

Browse source
This commit is contained in:
Paul Makles 2022-07-13 12:57:07 +01:00
commit 3204d176de
4 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/common/messaging/Message.tsx
View file

@ -159,7 +159,8 @@ const Message = observer(
/> />
</span> </span>
)} )}
{replacement ?? <Markdown content={content} />} {replacement ??
(content && <Markdown content={content} />)}
{!queued && <InviteList message={message} />} {!queued && <InviteList message={message} />}
{queued?.error && ( {queued?.error && (
<Category> <Category>

16
src/components/common/messaging/attachments/MessageReply.tsx
View file

@ -221,13 +221,15 @@ export const MessageReply = observer(
</em> </em>
</> </>
)} )}
<Markdown {message.content && (
disallowBigEmoji <Markdown
content={message.content?.replace( disallowBigEmoji
/\n/g, content={message.content.replace(
" ", /\n/g,
)} " ",
/> )}
/>
)}
</div> </div>
</> </>
)} )}

16
src/components/common/messaging/bars/ReplyBar.tsx
View file

@ -185,13 +185,15 @@ export default observer(({ channel, replies, setReplies }: Props) => {
hideInfo hideInfo
/> />
) : ( ) : (
<Markdown message.content && (
disallowBigEmoji <Markdown
content={message.content?.replace( disallowBigEmoji
/\n/g, content={message.content.replace(
" ", /\n/g,
)} " ",
/> )}
/>
)
)} )}
</div> </div>
</div> </div>

16
src/controllers/modals/components/legacy/UserProfile.tsx
View file

@ -322,13 +322,17 @@ export const UserProfile = observer(
/> />
)} )}
{profile?.content && ( {profile?.content && (
<div className={styles.category}> <>
<Text id="app.special.popovers.user_profile.sub.information" /> <div className={styles.category}>
</div> <Text id="app.special.popovers.user_profile.sub.information" />
</div>
<div className={styles.markdown}>
<Markdown
content={profile.content}
/>
</div>
</>
)} )}
<div className={styles.markdown}>
<Markdown content={profile?.content} />
</div>
{/*<div className={styles.category}><Text id="app.special.popovers.user_profile.sub.connections" /></div>*/} {/*<div className={styles.category}><Text id="app.special.popovers.user_profile.sub.connections" /></div>*/}
</div> </div>
) : ( ) : (