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

Fix notifications in UI, added new API for fetching account relationships

Browse Source
This commit is contained in:
Eugen Rochko
2016-09-21 22:07:18 +02:00
parent 4bec613897
commit e46abc71ca
11 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/components/actions/notifications.jsx
View File

@ -1,4 +1,5 @@
export const NOTIFICATION_DISMISS = 'NOTIFICATION_DISMISS';
export const NOTIFICATION_CLEAR = 'NOTIFICATION_CLEAR';
export function dismissNotification(notification) {
return {
@ -6,3 +7,9 @@ export function dismissNotification(notification) {
notification: notification
};
};
export function clearNotifications() {
return {
type: NOTIFICATION_CLEAR
};
};

24
app/assets/javascripts/components/features/ui/containers/notifications_container.jsx
View File

@ -1,18 +1,18 @@
import { connect } from 'react-redux';
import { NotificationStack } from 'react-notification';
import { dismissNotification } from '../../../actions/notifications';
import {
dismissNotification,
clearNotifications
} from '../../../actions/notifications';
const mapStateToProps = (state, props) => {
return {
notifications: state.get('notifications').map((item, i) => ({
message: item.get('message'),
title: item.get('title'),
key: i,
action: 'Dismiss',
dismissAfter: 5000
})).toJS()
};
};
const mapStateToProps = (state, props) => ({
notifications: state.get('notifications').map((item, i) => ({
message: item.get('message'),
title: item.get('title'),
key: item.get('key'),
dismissAfter: 5000
})).toJS()
});
const mapDispatchToProps = (dispatch) => {
return {

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

@ -2,13 +2,14 @@ import { COMPOSE_SUBMIT_FAIL, COMPOSE_UPLOAD_FAIL } from '../actions/compose';
import { FOLLOW_SUBMIT_FAIL } from '../actions/follow';
import { REBLOG_FAIL, FAVOURITE_FAIL } from '../actions/interactions';
import { TIMELINE_REFRESH_FAIL } from '../actions/timelines';
import { NOTIFICATION_DISMISS } from '../actions/notifications';
import { NOTIFICATION_DISMISS, NOTIFICATION_CLEAR } from '../actions/notifications';
import Immutable from 'immutable';
const initialState = Immutable.List();
function notificationFromError(state, error) {
let n = Immutable.Map({
key: state.size > 0 ? state.last().get('key') + 1 : 0,
message: ''
});
@ -34,6 +35,8 @@ export default function notifications(state = initialState, action) {
case TIMELINE_REFRESH_FAIL:
return notificationFromError(state, action.error);
case NOTIFICATION_DISMISS:
return state.filterNot(item => item.get('key') === action.notification.key);
case NOTIFICATION_CLEAR:
return state.clear();
default:
return state;