Skip to content

[IMPROVE] Added Markdown links to custom status. #20470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
Feb 2, 2021
Merged

[IMPROVE] Added Markdown links to custom status. #20470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca9271
userDropdown added markdown
yash-rajpal Jan 28, 2021
ca97c64
markdown added to userCard
yash-rajpal Jan 28, 2021
5ebe913
lint fixes
yash-rajpal Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/components/UserCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const UserCard = forwardRef(({
<Username status={status} name={name} title={username !== name ? username : undefined} />
{nickname && <Box title={t('Nickname')} color='hint' mis='x8' fontScale='p1' withTruncatedText>({ nickname })</Box>}
</Box>
{ customStatus && <Info>{customStatus}</Info> }
{ customStatus && <Info>{typeof customStatus === 'string' ? <MarkdownText content={customStatus} withRichContent={false}/> : customStatus}</Info> }
<Roles>{roles}</Roles>
<Info>{localTime}</Info>
{ bio && <Info withTruncatedText={false} style={clampStyle} height='x60'><MarkdownText content={bio}/></Info> }
Expand Down
3 changes: 2 additions & 1 deletion client/sidebar/header/UserDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useAtLeastOnePermission } from '../../contexts/AuthorizationContext';
import { userStatus } from '../../../app/user-status';
import { callbacks } from '../../../app/callbacks';
import { popover, AccountBox, modal, SideNav } from '../../../app/ui-utils';
import MarkdownText from '../../components/MarkdownText';

const ADMIN_PERMISSIONS = [
'view-logs',
Expand Down Expand Up @@ -113,7 +114,7 @@ const UserDropdown = ({ user, onClose }) => {
</Margins>
</Box>
<Box color='hint' withTruncatedText display='inline-block'>
{statusText || t(status)}
<MarkdownText content={statusText || t(status)} withRichContent={false}/>
</Box>
</Box>
</Box>
Expand Down