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

Fix #41, debug #42

Browse Source
This commit is contained in:
Eugen Rochko
2016-09-17 16:36:10 +02:00
parent e906677092
commit 8c0b19012b
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/assets/javascripts/components/reducers/notifications.jsx
View File

@@ -7,6 +7,23 @@ import Immutable from 'immutable';
const initialState = Immutable.List();
function notificationFromError(state, error) {
let n = Immutable.Map({
message: ''
});
if (error.response) {
n = n.withMutations(map => {
map.set('message', error.response.statusText);
map.set('title', `${error.response.status}`);
});
} else {
n = n.set('message', `${error}`);
}
return state.push(n);
};
export default function meta(state = initialState, action) {
switch(action.type) {
case COMPOSE_SUBMIT_FAIL:
@@ -15,10 +32,7 @@ export default function meta(state = initialState, action) {
case REBLOG_FAIL:
case FAVOURITE_FAIL:
case TIMELINE_REFRESH_FAIL:
return state.push(Immutable.fromJS({
message: action.error.response.statusText,
title: `${action.error.response.status}`
}));
return notificationFromError(state, action.error);
case NOTIFICATION_DISMISS:
return state.clear();
default: