From f1e034896d9059d9c90b46f4e1a11607c50dcdc8 Mon Sep 17 00:00:00 2001
From: Houston VPS <tom@muska.co.uk>
Date: Tue, 19 May 2015 03:17:21 +0400
Subject: [PATCH] Display error message on attempt to join invalid socket room

---
 src/application/components/interface.js | 26 ++++++++++++++++++++-----
 src/public/index.html                   |  5 +----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/application/components/interface.js b/src/application/components/interface.js
index 744eb1a..5eded9f 100644
--- a/src/application/components/interface.js
+++ b/src/application/components/interface.js
@@ -50,8 +50,21 @@ var UserInterface = {
 		}
 	},
 	
-	showRoomId: function(roomid) {
-		$('#room-id > span').text(roomid);
+	showRoomId: function(roomid, err) {
+		if(err) {
+			$('#room-id').html('Room ID Invalid');
+			
+			setTimeout(function() {
+				if(WebSocket.room) {
+					$('#room-id').html('<strong>Current Room ID:</strong><br /><span>' + WebSocket.room + '</span>');
+				} else {
+					$('#room-id').html('');
+				}
+			}, 4000);
+		} else {
+			$('#room-id').html('<strong>Current Room ID:</strong><br /><span>' + roomid + '</span>');
+		}
+		
 		$('#room-id').removeClass('hidden');
 	},
 	
@@ -96,13 +109,16 @@ var UserInterface = {
 				break;
 			
 			case 'join':
-				var guid = $('#prompt input').val();
+				var uuid = $('#prompt input').val();
 				
-				if(guid === '') return;
+				if(!/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i.test(uuid)) {
+					this.showRoomId(null, true);
+					return;	
+				}
 				
 				if(WebSocket.room) WebSocket.leaveRoom();
 				
-				WebSocket.joinRoom(guid);
+				WebSocket.joinRoom(uuid);
 				break;
 				
 			default:
diff --git a/src/public/index.html b/src/public/index.html
index 743b7c1..0bbe8a3 100644
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -68,10 +68,7 @@
 			</ul>
 		</nav>
 		
-		<div id="room-id" class="hidden animated bounceInRight">
-			<strong>Current Room ID:</strong><br />
-			<span></span>
-		</div>
+		<div id="room-id" class="hidden animated bounceInRight"></div>
 		
 		<div class="shortcuts unselectable animated bounceInLeft">
 			<img src="/public/svg/keyboard.svg" width="40px" />