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

Standardizing bracket syntax

Browse Source
This commit is contained in:
James Barnsley
2017-10-10 13:05:28 +13:00
parent 0ca37b0f62
commit 2ffa337ffa
116 changed files with 7451 additions and 3246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/js/services/pusher/actions.js
View File

@ -3,14 +3,14 @@
* Actions and Action Creators
**/
export function setPort( port ){
export function setPort(port){
return {
type: 'PUSHER_SET_PORT',
port: port
}
}
export function setUsername( username ){
export function setUsername(username){
return {
type: 'PUSHER_SET_USERNAME',
username: username.replace(/[\W_]+/g,'')
@ -41,21 +41,21 @@ export function getConnections(){
}
}
export function instruct( data = null ){
export function instruct(data = null){
return {
type: 'PUSHER_INSTRUCT',
data: data
}
}
export function deliverBroadcast( data = null ){
export function deliverBroadcast(data = null){
return {
type: 'PUSHER_DELIVER_BROADCAST',
data: data
}
}
export function sendAuthorization( recipient_connectionid, authorization, me ){
export function sendAuthorization(recipient_connectionid, authorization, me){
return {
type: 'PUSHER_DELIVER_MESSAGE',
data: {
@ -69,14 +69,14 @@ export function sendAuthorization( recipient_connectionid, authorization, me ){
}
}
export function startRadio( uris ){
export function startRadio(uris){
return {
type: 'PUSHER_START_RADIO',
uris: uris
}
}
export function updateRadio( uris ){
export function updateRadio(uris){
return {
type: 'PUSHER_UPDATE_RADIO',
uris: uris
@ -89,7 +89,7 @@ export function stopRadio(){
}
}
export function debug( message = null ){
export function debug(message = null){
return {
type: 'PUSHER_DEBUG',
message: message
@ -102,7 +102,7 @@ export function getQueueMetadata(){
}
}
export function addQueueMetadata( tlids = [], from_uri = null ){
export function addQueueMetadata(tlids = [], from_uri = null){
return {
type: 'PUSHER_ADD_QUEUE_METADATA',
tlids: tlids,

40
src/js/services/pusher/middleware.js
View File

@ -31,9 +31,9 @@ const PusherMiddleware = (function(){
// response to a request [we] made
if (message.request_id !== undefined && message.request_id){
if (typeof( deferredRequests[ message.request_id ]) !== 'undefined' ){
if (typeof(deferredRequests[ message.request_id ]) !== 'undefined'){
store.dispatch(uiActions.stopLoading(message.request_id))
deferredRequests[ message.request_id ].resolve( message )
deferredRequests[ message.request_id ].resolve(message )
} else {
store.dispatch(coreActions.handleException(
@ -51,7 +51,7 @@ const PusherMiddleware = (function(){
}
const request = (store, method, data = {}) => {
return new Promise( (resolve, reject) => {
return new Promise((resolve, reject) => {
var request_id = helpers.generateGuid()
var message = {
@ -59,7 +59,7 @@ const PusherMiddleware = (function(){
data: data,
request_id: request_id
}
socket.send( JSON.stringify(message) )
socket.send(JSON.stringify(message) )
store.dispatch(uiActions.startLoading(request_id, 'pusher_'+method))
@ -81,11 +81,11 @@ const PusherMiddleware = (function(){
}
return store => next => action => {
switch(action.type) {
switch(action.type){
case 'PUSHER_CONNECT':
if(socket != null) socket.close();
if (socket != null) socket.close();
store.dispatch({ type: 'PUSHER_CONNECTING' });
var state = store.getState();
@ -94,7 +94,7 @@ const PusherMiddleware = (function(){
connection_id: helpers.generateGuid(),
username: 'Anonymous'
}
if( state.pusher.username ) connection.username = state.pusher.username;
if (state.pusher.username ) connection.username = state.pusher.username;
connection.username = connection.username.replace(/\W/g, '')
socket = new WebSocket(
@ -104,7 +104,7 @@ const PusherMiddleware = (function(){
socket.onmessage = (message) => {
var message = JSON.parse(message.data);
handleMessage( socket, store, message )
handleMessage(socket, store, message )
};
socket.onclose = () => {
@ -190,7 +190,7 @@ const PusherMiddleware = (function(){
break;
case 'PUSHER_INSTRUCT':
request( action )
request(action )
.then(
response => {
store.dispatch({ type: 'PUSHER_INSTRUCT', data: response.data })
@ -208,7 +208,7 @@ const PusherMiddleware = (function(){
request(store, 'deliver_message', action.data)
.then(
response => {
store.dispatch( uiActions.createNotification('Message delivered') )
store.dispatch(uiActions.createNotification('Message delivered') )
},
error => {
store.dispatch(coreActions.handleException(
@ -258,9 +258,9 @@ const PusherMiddleware = (function(){
}
if (response.upgrade_successful){
store.dispatch( uiActions.createNotification('Upgrade complete') )
store.dispatch(uiActions.createNotification('Upgrade complete') )
}else{
store.dispatch( uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
store.dispatch(uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
}
response.type = 'PUSHER_VERSION'
@ -342,16 +342,16 @@ const PusherMiddleware = (function(){
seed_tracks: []
}
for( var i = 0; i < action.uris.length; i++){
switch( helpers.uriType( action.uris[i] ) ){
for(var i = 0; i < action.uris.length; i++){
switch(helpers.uriType(action.uris[i] )){
case 'artist':
data.seed_artists.push( action.uris[i] );
data.seed_artists.push(action.uris[i] );
break;
case 'track':
data.seed_tracks.push( action.uris[i] );
data.seed_tracks.push(action.uris[i] );
break;
case 'genre':
data.seed_genres.push( action.uris[i] );
data.seed_genres.push(action.uris[i] );
break;
}
}
@ -409,9 +409,9 @@ const PusherMiddleware = (function(){
ReactGA.event({ category: 'Pusher', action: 'Version', label: action.version.current })
if (action.version.upgrade_available){
store.dispatch( uiActions.createNotification( 'Version '+action.version.latest+' is available. See settings to upgrade.' ) )
store.dispatch(uiActions.createNotification('Version '+action.version.latest+' is available. See settings to upgrade.' ) )
}
next( action )
next(action )
break
case 'PUSHER_CONFIG':
@ -421,7 +421,7 @@ const PusherMiddleware = (function(){
authorization_url: (action.config.authorization_url ? action.config.authorization_url : null)
}))
next( action )
next(action )
break
case 'PUSHER_DEBUG':

2
src/js/services/pusher/reducer.js
View File

@ -1,6 +1,6 @@
export default function reducer(pusher = {}, action){
switch (action.type) {
switch (action.type){
case 'PUSHER_CONNECT':
case 'PUSHER_CONNECTING':