From d4ea455b92fd0a5704ff7f227a42f1b28dd07e07 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Fri, 16 Dec 2016 14:31:43 +1300
Subject: [PATCH] Fixing pusher name set

---
 mopidy_iris/pusher.py             | 2 +-
 src/js/services/pusher/actions.js | 8 --------
 src/js/views/Settings.js          | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mopidy_iris/pusher.py b/mopidy_iris/pusher.py
index 5eb5d530..7cd9547d 100755
--- a/mopidy_iris/pusher.py
+++ b/mopidy_iris/pusher.py
@@ -166,7 +166,7 @@ class PusherWebsocketHandler(tornado.websocket.WebSocketHandler):
             elif messageJson['action'] == 'change_username':
                 
                 # username is the only value we allow clients to change
-                connections[messageJson['origin']['connectionid']]['client']['username'] = messageJson['data']
+                connections[messageJson['origin']['connectionid']]['client']['username'] = messageJson['username']
                 
                 # respond to request
                 send_message(
diff --git a/src/js/services/pusher/actions.js b/src/js/services/pusher/actions.js
index 585d79c6..8c7c6382 100755
--- a/src/js/services/pusher/actions.js
+++ b/src/js/services/pusher/actions.js
@@ -10,14 +10,6 @@ export function setPort( port ){
 	}
 }
 
-export function changeUsername( username ){
-	return {
-		type: 'PUSHER_INSTRUCT',
-		action: 'change_username',
-		data: username
-	}
-}
-
 export function connect(){
 	return {
 		type: 'PUSHER_CONNECT'
diff --git a/src/js/views/Settings.js b/src/js/views/Settings.js
index 8e5affc2..63016c86 100755
--- a/src/js/views/Settings.js
+++ b/src/js/views/Settings.js
@@ -171,7 +171,7 @@ class Settings extends React.Component{
 								<input 
 									type="text"
 									onChange={ e => this.setState({ pusher_username: e.target.value }) } 
-									onBlur={ e => this.props.pusherActions.changeUsername( this.state.pusher_username ) } 
+									onBlur={ e => this.props.pusherActions.instruct( 'query', { action: 'change_username', username: this.state.pusher_username }) } 
 									value={ this.state.pusher_username } />
 							</div>
 						</div>