From 9e45b051cfea667f9ca3d3c72d13022259315090 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 13 Apr 2018 01:20:04 +0200
Subject: [PATCH] When notification type filtered, ignore live updates for it
(#7101)
Fix #5625
---
.../mastodon/actions/notifications.js | 39 ++++++++++++-------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index da77afbe0..7aa070f56 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -9,7 +9,8 @@ import {
} from './importer';
import { defineMessages } from 'react-intl';
-export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
+export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
+export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
export const NOTIFICATIONS_EXPAND_REQUEST = 'NOTIFICATIONS_EXPAND_REQUEST';
export const NOTIFICATIONS_EXPAND_SUCCESS = 'NOTIFICATIONS_EXPAND_SUCCESS';
@@ -39,28 +40,38 @@ const unescapeHTML = (html) => {
export function updateNotifications(notification, intlMessages, intlLocale) {
return (dispatch, getState) => {
- const showAlert = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
- const playSound = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
+ const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
+ const showAlert = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
+ const playSound = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
- dispatch(importFetchedAccount(notification.account));
- if (notification.status) {
- dispatch(importFetchedStatus(notification.status));
+ if (showInColumn) {
+ dispatch(importFetchedAccount(notification.account));
+
+ if (notification.status) {
+ dispatch(importFetchedStatus(notification.status));
+ }
+
+ dispatch({
+ type: NOTIFICATIONS_UPDATE,
+ notification,
+ meta: playSound ? { sound: 'boop' } : undefined,
+ });
+
+ fetchRelatedRelationships(dispatch, [notification]);
+ } else if (playSound) {
+ dispatch({
+ type: NOTIFICATIONS_UPDATE_NOOP,
+ meta: { sound: 'boop' },
+ });
}
- dispatch({
- type: NOTIFICATIONS_UPDATE,
- notification,
- meta: playSound ? { sound: 'boop' } : undefined,
- });
-
- fetchRelatedRelationships(dispatch, [notification]);
-
// Desktop notifications
if (typeof window.Notification !== 'undefined' && showAlert) {
const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : unescapeHTML(notification.status ? notification.status.content : '');
const notify = new Notification(title, { body, icon: notification.account.avatar, tag: notification.id });
+
notify.addEventListener('click', () => {
window.focus();
notify.close();