Merge pull request #131 from DeForce/develop

Release 0.3.0
DeForce · Oct 30, 2016 · 811e54b · 811e54b
2 parents ee522b2 + 3234895
commit 811e54b
Show file tree

Hide file tree

Showing 108 changed files with 1,930 additions and 875 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ levels.db*
 /conf
 *.spec
 *.log
+govno_rutony.py
diff --git a/gui.py b/gui.py
diff --git a/http/czt/css/czt.css → http/czt/css/style.css b/http/czt/css/czt.css → http/czt/css/style.css
@@ -12,7 +12,7 @@ body{
 .msg{
     background-color: rgba( 35, 35, 37, 0.627451 );
     font-family: 'Consolas', serif;
-    font-size: 13pt;
+    font-size: {{ font_size }}pt;
     text-shadow: 0 1px 1px black;
     padding-top: 2px;
     word-wrap: break-word;

diff --git a/http/czt/index.html b/http/czt/index.html
@@ -4,7 +4,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 
     <script src="js/socket.js"></script>
-    <link rel="stylesheet" type="text/css" href="css/czt.css">
+    <link rel="stylesheet" type="text/css" href="css/style.css">
 </head>
 
 <body>

diff --git a/http/czt/js/socket.js b/http/czt/js/socket.js
@@ -1,30 +1,47 @@
+var MAX_MESSAGES = 70;
 var find_location = window.location.href;
 var RegExp = /:(\d+)/;
 var find_list = RegExp.exec(find_location.toString());
 var find_port = find_list[1];
 var ws_url = "ws://127.0.0.1:".concat(find_port, "/ws");
 
+// Chat settings
+var timeout = 0;
+var loadHistory = true;
+
 var socket = new WebSocket(ws_url);
+
+var chatMessages;
 socket.onopen = function() {
-	//console.log("Соединение установлено.");
+    console.log("Socket connected")
+    chatMessages = document.getElementById('ChatContainer');
 };
 
 socket.onclose = function(event) {
 	if (event.wasClean) {
-		//console.log('Соединение закрыто чисто');
-	} else {
-		//console.log('Обрыв соединения'); // например, "убит" процесс сервера
+	    console.log("Socket closed cleanly")
+	}
+	else {
+	    console.log("Socket closed not cleanly")
 	}
-	//console.log('Код: ' + event.code + ' причина: ' + event.reason);
 };
 
 socket.onmessage = function(event) {
-	var incomingMessage = event.data;
-	showMessage(incomingMessage);
+	var incomingMessage = JSON.parse(event.data);
+    if(incomingMessage.hasOwnProperty('command')) {
+        runCommand(incomingMessage);
+    }
+    else {
+        if (loadHistory) {
+            showMessage(incomingMessage);
+        }
+        else if (!incomingMessage.hasOwnProperty('history')) {
+            showMessage(incomingMessage);
+        }
+    }
 };
 
 socket.onerror = function(error) {
-	//console.log("Ошибка " + error.message);
 };
 
 twitch_processEmoticons = function(message, emotes) {
@@ -92,18 +109,37 @@ escapeHtml = (function () {
     };
 }());
 
+function removeMessage(element) {
+    var elm = element || chatMessages.lastChild;
+    chatMessages.removeChild(elm);
+  }
+
+function updateMessages() {
+    if(chatMessages.children.length < MAX_MESSAGES) return;
+    var element = chatMessages.lastChild;
+    if(element.hasAttribute('timer-id')) {
+        var timerId = element.getAttribute('timer-id');
+        window.clearTimeout(timerId);
+    }
+    removeMessage(element);
+  }
+
+
 function showMessage(message) {
 	var badge_colors = 1;
-	
+
 	var elements = {};
 	elements['message'] = document.createElement('div');
 	elements.message.setAttribute('class', 'msg');
-
-	var messageJSON = JSON.parse(message);
-
+	if(timeout > 0) {
+		elements.message.setAttribute('timer-id', setTimeout(removeMessage, timeout * 1000, elements.message));
+	}
+
+	var messageJSON = message;
+
 	if(messageJSON.hasOwnProperty('source')) {
 		//console.log("message has source " + messageJSON.source);
-		
+
 		elements.message['source'] = document.createElement('div');
 		elements.message.source.setAttribute('class', 'msgSource');
 
@@ -119,44 +155,44 @@ function showMessage(message) {
 		elements.message.source.appendChild(elements.message.source.img);
 		elements.message.appendChild(elements.message.source);
 	}
-	
+
 	if(messageJSON.hasOwnProperty('levels')) {
 		elements.message['level'] = document.createElement('div');
 		elements.message.level.setAttribute('class', 'msgLevel');
 
 		elements.message.level['img'] = document.createElement('img');
 		elements.message.level.img.setAttribute('class', 'imgLevel');
 		elements.message.level.img.setAttribute('src', messageJSON.levels.url);
-		
+
 		elements.message.level.appendChild(elements.message.level.img);
 		elements.message.appendChild(elements.message.level);
 	}
-	
+
 	if(messageJSON.hasOwnProperty('s_levels')) {
-		
+
 		for (i = 0; i < messageJSON.s_levels.length; i++) {
 			elements.message['s_level'] = document.createElement('div');
 			elements.message.s_level.setAttribute('class', 'msgSLevel');
 
 			elements.message.s_level['img'] = document.createElement('img');
 			elements.message.s_level.img.setAttribute('class', 'imgSLevel');
 			elements.message.s_level.img.setAttribute('src', messageJSON.s_levels[i].url);
-			
+
 			elements.message.s_level.appendChild(elements.message.s_level.img);
 			elements.message.appendChild(elements.message.s_level);
 		}
 	}
-	
+
 	if(messageJSON.hasOwnProperty('badges')) {
-		
+
 		for (i = 0; i < messageJSON.badges.length; i++) {
 			elements.message['badge'] = document.createElement('div');
 			elements.message.badge.setAttribute('class', 'msgBadge');
 
 			elements.message.badge['img'] = document.createElement('img');
 			elements.message.badge.img.setAttribute('class', 'imgBadge');
 			elements.message.badge.img.setAttribute('src', messageJSON.badges[i].url);
-			
+
 			if(badge_colors) {
 				if(messageJSON.badges[i].badge == 'broadcaster') {
 					elements.message.badge.img.setAttribute('style', 'background-color: #e71818');
@@ -172,7 +208,7 @@ function showMessage(message) {
 			elements.message.appendChild(elements.message.badge);
 		}
 	}
-	
+
 	if(messageJSON.hasOwnProperty('user')) {
 		// console.log("message has user " + messageJSON.user);
 		elements.message['user'] = document.createElement('div');
@@ -189,10 +225,10 @@ function showMessage(message) {
         }
 
 		elements.message.user.appendChild(document.createTextNode(addString));
-		
+
 		elements.message.appendChild(elements.message.user);
 	}
-	
+
 	if(messageJSON.hasOwnProperty('text')) {
 		// console.log("message has text " + messageJSON.text);
 		elements.message['text'] = document.createElement('div');
@@ -208,7 +244,7 @@ function showMessage(message) {
 		else {
 			elements.message.text.setAttribute('class', 'msgText');
 		}
-		
+
 		if(messageJSON.source == 'tw') {
 			messageJSON.text = htmlifyTwitchEmoticons(escapeHtml(twitch_processEmoticons(messageJSON.text, messageJSON.emotes)));
 			if(messageJSON.hasOwnProperty('bttv_emotes')) {
@@ -221,11 +257,19 @@ function showMessage(message) {
 		else if(messageJSON.source == 'fs') {
 			messageJSON.text = htmlifyGGEmoticons(escapeHtml(messageJSON.text), messageJSON.emotes)
 		}
-		
+
 		// elements.message.text.appendChild(document.createTextNode(messageJSON.text));
 		elements.message.text.innerHTML = messageJSON.text;
-		
+
 		elements.message.appendChild(elements.message.text);
+
 	}
 	document.getElementById('ChatContainer').appendChild(elements.message);
+    updateMessages();
+}
+
+function runCommand(message) {
+    if(message.command == 'reload'){
+        window.location.reload();
+    }
 }
diff --git a/http/czt_timed/css/style.css b/http/czt_timed/css/style.css
@@ -0,0 +1,77 @@
+::-webkit-scrollbar {
+    visibility: hidden;
+}
+body{
+    margin: 0;
+}
+#ChatContainer{
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+}
+.msg{
+    background-color: rgba( 35, 35, 37, 0.627451 );
+    font-family: 'Consolas', serif;
+    font-size: {{ font_size }}pt;
+    text-shadow: 0 1px 1px black;
+    padding-top: 2px;
+    word-wrap: break-word;
+    color: #FFFFFF;
+}
+.msgSource,
+.msgBadge,
+.msgLevel,
+.msgSLevel{
+    width: 16px;
+    height: 16px;
+    background-color: rgba(0,0,0,0.6);
+    border-radius: 3px;
+    margin: 0 3px 0 0;
+    position: relative;
+    top: 3px;
+    left: 3px;
+    display: inline-block;
+}
+.msgUser{
+    display: inline-block;
+    position: relative;
+    padding-left: 5px;
+}
+.msgText{
+    display: inline;
+    height: auto;
+    padding-left: 5px;
+}
+.msgTextPriv{
+    display: inline;
+    height: auto;
+    padding-left: 5px;
+    color: #e57017;
+}
+.msgTextMention{
+    display: inline;
+    height: auto;
+    padding-left: 5px;
+    color: #c0ffc0;
+}
+.msgTextSystem{
+    display: inline;
+    height: auto;
+    padding-left: 5px;
+    color: #ff68fb;
+}
+.imgSmile{
+    margin-top: -4px;
+    height: 20px;
+    width: auto;
+    top: 2px;
+    position: relative;
+}
+.imgBadge,
+.imgSource,
+.imgLevel,
+.imgSLevel{
+    width: 16px;
+    height: 16px;
+    border-radius: 3px;
+}
diff --git a/http/czt_timed/img/levels/0.png b/http/czt_timed/img/levels/0.png
diff --git a/http/czt_timed/img/levels/1.png b/http/czt_timed/img/levels/1.png
diff --git a/http/czt_timed/img/levels/10.png b/http/czt_timed/img/levels/10.png
diff --git a/http/czt_timed/img/levels/11.png b/http/czt_timed/img/levels/11.png
diff --git a/http/czt_timed/img/levels/12.png b/http/czt_timed/img/levels/12.png
diff --git a/http/czt_timed/img/levels/13.png b/http/czt_timed/img/levels/13.png
diff --git a/http/czt_timed/img/levels/14.png b/http/czt_timed/img/levels/14.png
diff --git a/http/czt_timed/img/levels/15.png b/http/czt_timed/img/levels/15.png
diff --git a/http/czt_timed/img/levels/16.png b/http/czt_timed/img/levels/16.png
diff --git a/http/czt_timed/img/levels/17.png b/http/czt_timed/img/levels/17.png
diff --git a/http/czt_timed/img/levels/18.png b/http/czt_timed/img/levels/18.png
diff --git a/http/czt_timed/img/levels/19.png b/http/czt_timed/img/levels/19.png
diff --git a/http/czt_timed/img/levels/2.png b/http/czt_timed/img/levels/2.png
diff --git a/http/czt_timed/img/levels/20.png b/http/czt_timed/img/levels/20.png
diff --git a/http/czt_timed/img/levels/21.png b/http/czt_timed/img/levels/21.png
diff --git a/http/czt_timed/img/levels/22.png b/http/czt_timed/img/levels/22.png
diff --git a/http/czt_timed/img/levels/23.png b/http/czt_timed/img/levels/23.png
diff --git a/http/czt_timed/img/levels/24.png b/http/czt_timed/img/levels/24.png
diff --git a/http/czt_timed/img/levels/25.png b/http/czt_timed/img/levels/25.png
diff --git a/http/czt_timed/img/levels/26.png b/http/czt_timed/img/levels/26.png
diff --git a/http/czt_timed/img/levels/27.png b/http/czt_timed/img/levels/27.png
diff --git a/http/czt_timed/img/levels/28.png b/http/czt_timed/img/levels/28.png
diff --git a/http/czt_timed/img/levels/29.png b/http/czt_timed/img/levels/29.png
diff --git a/http/czt_timed/img/levels/3.png b/http/czt_timed/img/levels/3.png
diff --git a/http/czt_timed/img/levels/30.png b/http/czt_timed/img/levels/30.png
diff --git a/http/czt_timed/img/levels/31.png b/http/czt_timed/img/levels/31.png
diff --git a/http/czt_timed/img/levels/32.png b/http/czt_timed/img/levels/32.png
diff --git a/http/czt_timed/img/levels/33.png b/http/czt_timed/img/levels/33.png
diff --git a/http/czt_timed/img/levels/34.png b/http/czt_timed/img/levels/34.png
diff --git a/http/czt_timed/img/levels/35.png b/http/czt_timed/img/levels/35.png
diff --git a/http/czt_timed/img/levels/36.png b/http/czt_timed/img/levels/36.png
diff --git a/http/czt_timed/img/levels/37.png b/http/czt_timed/img/levels/37.png
diff --git a/http/czt_timed/img/levels/38.png b/http/czt_timed/img/levels/38.png
diff --git a/http/czt_timed/img/levels/39.png b/http/czt_timed/img/levels/39.png
diff --git a/http/czt_timed/img/levels/4.png b/http/czt_timed/img/levels/4.png
diff --git a/http/czt_timed/img/levels/40.png b/http/czt_timed/img/levels/40.png
diff --git a/http/czt_timed/img/levels/41.png b/http/czt_timed/img/levels/41.png
diff --git a/http/czt_timed/img/levels/42.png b/http/czt_timed/img/levels/42.png
diff --git a/http/czt_timed/img/levels/43.png b/http/czt_timed/img/levels/43.png
diff --git a/http/czt_timed/img/levels/5.png b/http/czt_timed/img/levels/5.png
diff --git a/http/czt_timed/img/levels/6.png b/http/czt_timed/img/levels/6.png
diff --git a/http/czt_timed/img/levels/7.png b/http/czt_timed/img/levels/7.png
diff --git a/http/czt_timed/img/levels/8.png b/http/czt_timed/img/levels/8.png
diff --git a/http/czt_timed/img/levels/9.png b/http/czt_timed/img/levels/9.png
diff --git a/http/czt_timed/img/levels/cube.png b/http/czt_timed/img/levels/cube.png
diff --git a/http/czt_timed/img/sources/cybergame.png b/http/czt_timed/img/sources/cybergame.png
diff --git a/http/czt_timed/img/sources/empire.png b/http/czt_timed/img/sources/empire.png
diff --git a/http/czt_timed/img/sources/fs.png b/http/czt_timed/img/sources/fs.png
diff --git a/http/czt_timed/img/sources/gamerstv.png b/http/czt_timed/img/sources/gamerstv.png
diff --git a/http/czt_timed/img/sources/gg.png b/http/czt_timed/img/sources/gg.png
diff --git a/http/czt_timed/img/sources/gipsyteam.png b/http/czt_timed/img/sources/gipsyteam.png
diff --git a/http/czt_timed/img/sources/gohatv.png b/http/czt_timed/img/sources/gohatv.png
diff --git a/http/czt_timed/img/sources/hitboxtv.png b/http/czt_timed/img/sources/hitboxtv.png
diff --git a/http/czt_timed/img/sources/lalka_cup.png b/http/czt_timed/img/sources/lalka_cup.png
diff --git a/http/czt_timed/img/sources/midlane.png b/http/czt_timed/img/sources/midlane.png
diff --git a/http/czt_timed/img/sources/streamcube.png b/http/czt_timed/img/sources/streamcube.png
diff --git a/http/czt_timed/img/sources/tw.png b/http/czt_timed/img/sources/tw.png
diff --git a/http/czt_timed/img/sources/youtube.png b/http/czt_timed/img/sources/youtube.png
diff --git a/http/czt_timed/index.html b/http/czt_timed/index.html
@@ -0,0 +1,12 @@
+<head>
+    <title>LalkaChat</title>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+
+    <link rel="stylesheet" type="text/css" href="css/style.css">
+    <script src="js/socket.js"></script>
+</head>
+
+<body>
+    <div id='ChatContainer'></div>
+</body>