gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Unreblogging and unfavouriting from the UI

Browse source
This commit is contained in:
Eugen Rochko 2016-10-02 15:14:26 +02:00
parent 4909bbf415
commit 1fce687f8e
6 changed files with 119 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/components/features/account/components/action_bar.jsx
View file

@ -7,25 +7,24 @@ const ActionBar = React.createClass({
propTypes: {
account: ImmutablePropTypes.map.isRequired,
me: React.PropTypes.number.isRequired,
onFollow: React.PropTypes.func.isRequired,
onUnfollow: React.PropTypes.func.isRequired
onFollow: React.PropTypes.func.isRequired
},
mixins: [PureRenderMixin],
render () {
const { account, me } = this.props;
let infoText = '';
let actionButton = '';
let buttonText = '';
if (account.get('id') === me) {
infoText = 'This is you!';
buttonText = 'This is you!';
} else {
if (account.getIn(['relationship', 'following'])) {
actionButton = <Button text='Unfollow' onClick={this.props.onUnfollow} />
buttonText = 'Unfollow';
} else {
actionButton = <Button text='Follow' onClick={this.props.onFollow} />
buttonText = 'Follow';
}
if (account.getIn(['relationship', 'followed_by'])) {
@ -35,7 +34,7 @@ const ActionBar = React.createClass({
return (
<div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px', overflow: 'hidden', flex: '0 0 auto' }}>
{actionButton} <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase', float: 'right', display: 'block' }}>{infoText}</span>
<Button text={buttonText} onClick={this.props.onFollow} disabled={account.get('id') === me} /> <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase', float: 'right', display: 'block' }}>{infoText}</span>
</div>
);
},

29
app/assets/javascripts/components/features/account/index.jsx
View file

@ -10,7 +10,12 @@ import {
} from '../../actions/accounts';
import { deleteStatus } from '../../actions/statuses';
import { replyCompose } from '../../actions/compose';
import { favourite, reblog } from '../../actions/interactions';
import {
favourite,
reblog,
unreblog,
unfavourite
} from '../../actions/interactions';
import Header from './components/header';
import {
selectStatus,
@ -54,11 +59,11 @@ const Account = React.createClass({
},
handleFollow () {
this.props.dispatch(followAccount(this.props.account.get('id')));
},
handleUnfollow () {
this.props.dispatch(unfollowAccount(this.props.account.get('id')));
if (this.props.account.getIn(['relationship', 'following'])) {
this.props.dispatch(unfollowAccount(this.props.account.get('id')));
} else {
this.props.dispatch(followAccount(this.props.account.get('id')));
}
},
handleReply (status) {
@ -66,11 +71,19 @@ const Account = React.createClass({
},
handleReblog (status) {
this.props.dispatch(reblog(status));
if (status.get('reblogged')) {
this.props.dispatch(unreblog(status));
} else {
this.props.dispatch(reblog(status));
}
},
handleFavourite (status) {
this.props.dispatch(favourite(status));
if (status.get('favourited')) {
this.props.dispatch(unfavourite(status));
} else {
this.props.dispatch(favourite(status));
}
},
handleDelete (status) {