tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

count statuses on approvals

Browse Source
This commit is contained in:
Baptiste Lemoine 2020-02-03 09:57:56 +01:00
parent 271738e5a9
commit 5eb8d00f25
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/javascript/mastodon/features/follow_requests/components/account_authorize.js
View File

@ -5,44 +5,73 @@ import Permalink from '../../../components/permalink';
import Avatar from '../../../components/avatar';
import DisplayName from '../../../components/display_name';
import IconButton from '../../../components/icon_button';
import { defineMessages, injectIntl } from 'react-intl';
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import { shortNumberFormat } from 'mastodon/utils/numbers';
import ImmutablePureComponent from 'react-immutable-pure-component';
const messages = defineMessages({
authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
reject : { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
export default @injectIntl
class AccountAuthorize extends ImmutablePureComponent {
static propTypes = {
account: ImmutablePropTypes.map.isRequired,
account : ImmutablePropTypes.map.isRequired,
onAuthorize: PropTypes.func.isRequired,
onReject: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
onReject : PropTypes.func.isRequired,
intl : PropTypes.object.isRequired,
};
render () {
render() {
const { intl, account, onAuthorize, onReject } = this.props;
const content = { __html: account.get('note_emojified') };
return (
<div className='account-authorize__wrapper'>
<div className='account-authorize'>
<Permalink href={account.get('url')} to={`/accounts/${account.get('id')}`} className='detailed-status__display-name'>
<div className='account-authorize__avatar'><Avatar account={account} size={48} /></div>
<Permalink
href={account.get('url')}
to={`/accounts/${account.get('id')}`}
className='detailed-status__display-name'
>
<div className='account-authorize__avatar'><Avatar
account={account}
size={48}
/></div >
<DisplayName account={account} />
</Permalink>
{/*count posts*/}
<strong >{shortNumberFormat(account.get('statuses_count'))}</strong >
<FormattedMessage
id='account.posts'
defaultMessage='Toots'
/>
</Permalink >
<div className='account__header__content' dangerouslySetInnerHTML={content} />
</div>
<div
className='account__header__content'
dangerouslySetInnerHTML={content}
/>
</div >
<div className='account--panel'>
<div className='account--panel__button'><IconButton title={intl.formatMessage(messages.authorize)} icon='check' onClick={onAuthorize} /></div>
<div className='account--panel__button'><IconButton title={intl.formatMessage(messages.reject)} icon='times' onClick={onReject} /></div>
</div>
</div>
<div className='account--panel__button'>
<IconButton
title={intl.formatMessage(messages.authorize)}
icon='check'
onClick={onAuthorize}
/> {intl.formatMessage(messages.authorize)}
</div >
<div className='account--panel__button'>
<IconButton
title={intl.formatMessage(messages.reject)}
icon='times'
onClick={onReject}
/> {intl.formatMessage(messages.reject)}
</div >
</div >
</div >
);
}

3
app/views/relationships/show.html.haml
View File

@ -3,7 +3,8 @@
- content_for :header_tags do
= javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
.well
%strong= @accounts.length
.filters
.filter-subset
%strong= t 'relationships.relationship'