secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Reducing usage of browser notifications in favor of in-app notifications

Browse Source
This commit is contained in:
James Barnsley
2018-02-23 09:35:38 +13:00
parent 2566c60a05
commit ac6e0eea0c
23 changed files with 1079 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/js/services/mopidy/middleware.js
View File

@ -274,24 +274,37 @@ const MopidyMiddleware = (function(){
* General playback
**/
case 'MOPIDY_NEXT':
case 'MOPIDY_PAUSE':
var data = {
type: 'browser_notification',
title: 'Track skipped',
body: store.getState().pusher.username +' skipped this track',
key: 'playback',
type: 'notification',
notification_type: 'info',
content: store.getState().pusher.username +' paused playback',
icon: (store.getState().core.current_track ? helpers.getTrackIcon(store.getState().core.current_track, store.getState().core) : false)
}
store.dispatch(pusherActions.deliverBroadcast(data) )
store.dispatch(pusherActions.deliverBroadcast(data));
break
case 'MOPIDY_NEXT':
var data = {
key: 'playback',
type: 'notification',
notification_type: 'info',
content: store.getState().pusher.username +' skipped <em>'+store.getState().core.current_track.name+'</em>',
icon: (store.getState().core.current_track ? helpers.getTrackIcon(store.getState().core.current_track, store.getState().core) : false)
}
store.dispatch(pusherActions.deliverBroadcast(data));
break
case 'MOPIDY_STOP':
var data = {
type: 'browser_notification',
title: 'Playback stopped',
key: 'playback',
type: 'notification',
notification_type: 'info',
body: store.getState().pusher.username +' stopped playback',
icon: (store.getState().core.current_track ? helpers.getTrackIcon(store.getState().core.current_track, store.getState().core) : false)
}
store.dispatch(pusherActions.deliverBroadcast(data) )
store.dispatch(pusherActions.deliverBroadcast(data));
break
case 'MOPIDY_PLAY_PLAYLIST':
@ -326,7 +339,7 @@ const MopidyMiddleware = (function(){
.then(
response => {
if (response.tracks === undefined){
store.dispatch(uiActions.createNotification('Failed to load playlist tracks','bad'))
store.dispatch(uiActions.createNotification({content: 'Failed to load playlist tracks', type: 'bad'}));
} else {
var tracks_uris = helpers.arrayOf('uri',response.tracks)
store.dispatch(mopidyActions.playURIs(tracks_uris, action.uri))
@ -344,7 +357,7 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_ENQUEUE_URIS':
if (!action.uris || action.uris.length <= 0){
this.props.uiActions.createNotification("No URIs to enqueue","warning");
this.props.uiActions.createNotification({content: "No URIs to enqueue", type: "warning"});
break;
}
@ -477,7 +490,7 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_PLAY_URIS':
if (!action.uris || action.uris.length <= 0){
this.props.uiActions.createNotification("No URIs to play","warning");
this.props.uiActions.createNotification({content: "No URIs to play", type: "warning"});
break;
}
@ -576,7 +589,7 @@ const MopidyMiddleware = (function(){
var uri_scheme = uri_schemes.shift();
if (uri_schemes_total <= 0){
store.dispatch(uiActions.createNotification('No sources selected', 'warning'));
store.dispatch(uiActions.createNotification({content: 'No sources selected', type: 'warning'}));
} else {
store.dispatch(uiActions.startProcess(
'MOPIDY_GET_SEARCH_RESULTS_PROCESSOR',
@ -1287,7 +1300,7 @@ const MopidyMiddleware = (function(){
hashHistory.push(global.baseURL+'playlist/'+encodeURIComponent(response.uri));
}
store.dispatch(uiActions.createNotification('Saved'));
store.dispatch(uiActions.createNotification({content: 'Saved'}));
})
});
break
@ -1337,7 +1350,7 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_CREATE_PLAYLIST':
instruct(socket, store, 'playlists.create', { name: action.name, uri_scheme: action.scheme })
.then(response => {
store.dispatch(uiActions.createNotification('Created playlist'))
store.dispatch(uiActions.createNotification({content: 'Created playlist'}))
store.dispatch({
type: 'PLAYLIST_LOADED',
@ -1356,7 +1369,7 @@ const MopidyMiddleware = (function(){
case 'MOPIDY_DELETE_PLAYLIST':
instruct(socket, store, 'playlists.delete', { uri: action.uri })
.then(response => {
store.dispatch(uiActions.createNotification('Deleted playlist'))
store.dispatch(uiActions.createNotification({content: 'Deleted playlist'}))
store.dispatch({
type: 'MOPIDY_LIBRARY_PLAYLIST_DELETED',
key: action.uri