tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-10-16 01:29:02 -05:00
parent f72ad67a39 894da3dcca
commit 6cd5b3bbe5
60 changed files with 738 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/actions/accounts.js
View File

@@ -122,7 +122,7 @@ export function unfollowAccount(id) {
dispatch(unfollowAccountRequest(id));
api(getState).post(`/api/v1/accounts/${id}/unfollow`).then(response => {
dispatch(unfollowAccountSuccess(response.data));
dispatch(unfollowAccountSuccess(response.data, getState().get('statuses')));
}).catch(error => {
dispatch(unfollowAccountFail(error));
});
@@ -157,10 +157,11 @@ export function unfollowAccountRequest(id) {
};
};
export function unfollowAccountSuccess(relationship) {
export function unfollowAccountSuccess(relationship, statuses) {
return {
type: ACCOUNT_UNFOLLOW_SUCCESS,
relationship,
statuses,
};
};