post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix unfollows not clearing reblogs, fix blocks not clearing reblogs and notifications,

Browse source 
skip ActionCable for follow/unfollow/block events, instead clear UI from
blocked account's posts instantly if block request succeeds. Add forgotten
i18n for sensitive content
This commit is contained in:
Eugen Rochko 2016-11-23 22:57:57 +01:00
parent 3373ae02de
commit 7cee27f517
13 changed files with 86 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/components/containers/mastodon.jsx
View file

@ -75,11 +75,6 @@ const Mastodon = React.createClass({
return store.dispatch(updateTimeline(data.timeline, JSON.parse(data.message)));
case 'delete':
return store.dispatch(deleteFromTimelines(data.id));
case 'merge':
case 'unmerge':
return store.dispatch(refreshTimeline('home', true));
case 'block':
return store.dispatch(refreshTimeline('mentions', true));
case 'notification':
return store.dispatch(updateNotifications(JSON.parse(data.message), getMessagesForLocale(locale), locale));
}

17
app/assets/javascripts/components/containers/status_container.jsx
View file

@ -1,18 +1,19 @@
import { connect } from 'react-redux';
import Status from '../components/status';
import { connect } from 'react-redux';
import Status from '../components/status';
import { makeGetStatus } from '../selectors';
import {
replyCompose,
mentionCompose
} from '../actions/compose';
} from '../actions/compose';
import {
reblog,
favourite,
unreblog,
unfavourite
} from '../actions/interactions';
import { deleteStatus } from '../actions/statuses';
import { openMedia } from '../actions/modal';
} from '../actions/interactions';
import { blockAccount } from '../actions/accounts';
import { deleteStatus } from '../actions/statuses';
import { openMedia } from '../actions/modal';
import { createSelector } from 'reselect'
const mapStateToProps = (state, props) => ({
@ -91,6 +92,10 @@ const mapDispatchToProps = (dispatch) => ({
onOpenMedia (url) {
dispatch(openMedia(url));
},
onBlock (account) {
dispatch(blockAccount(account.get('id')));
}
});