Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add conversations API (#8832)

Browse source 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
This commit is contained in:
Eugen Rochko 2018-10-07 23:44:58 +02:00 • committed by GitHub
parent 25744d43b0
commit 774ac47373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 816 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/mastodon/components/display_name.js
View file

@ -1,18 +1,25 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
export default class DisplayName extends React.PureComponent {
static propTypes = {
account: ImmutablePropTypes.map.isRequired,
withAcct: PropTypes.bool,
};
static defaultProps = {
withAcct: true,
};
render () {
const displayNameHtml = { __html: this.props.account.get('display_name_html') };
const { account, withAcct } = this.props;
const displayNameHtml = { __html: account.get('display_name_html') };
return (
<span className='display-name'>
<bdi><strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /></bdi> <span className='display-name__account'>@{this.props.account.get('acct')}</span>
<bdi><strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /></bdi> {withAcct && <span className='display-name__account'>@{account.get('acct')}</span>}
</span>
);
}