Chat fixes and smileys galore.

2 files changed, 26 insertions, 13 deletions

diff --git a/ajax/chat.ajax.php b/ajax/chat.ajax.php
index 8f739d1..97db510 100644
--- a/ajax/chat.ajax.php
+++ b/ajax/chat.ajax.php
@@ -172,8 +172,7 @@ function chatFilter($chat) {
    $chat = str_ireplace("4chan", "NEWT GINGRICH", $chat);

    $chat = str_ireplace("nigger", "classy gentleman", $chat);

    $chat = str_ireplace("pedophile", "Optimus Prime", $chat);

-   $chat = str_ireplace("pedo", "Optimus Prime", $chat);

-   $chat = str_ireplace("rape", "shake hands with", $chat);

+   $chat = str_ireplace(" rape", " shake hands with", $chat);

 	

 	//Easter Eggs

    $chat = str_ireplace("i just pwned Snap", "Snap just totally pwned me ^^", $chat);

diff --git a/pages/chat.php b/pages/chat.php
index 08b6393..d479f7b 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -176,11 +176,25 @@ function chatReplaceAndEncode(chat) {
 }

 

 function replaceSmileys(chat) {

-	chat = chat.replace(/:\)/g, '<img class="chatSmiley" src="images/smileys/Smiling.png" />');

-	chat = chat.replace(/\(:/g, '<img class="chatSmiley" src="images/smileys/Smiling.png" />');

-	//chat = chat.replace(/:\//g, '<img class="chatSmiley" src="images/smileys/Uncertain.png" />');

-	chat = chat.replace(/:\(/g, '<img class="chatSmiley" src="images/smileys/Unhappy.png" />');

-	chat = chat.replace(/\&lt;3/g, '<img class="chatSmiley" src="images/smileys/Heart.png" />');

+	chat = chat.replace(/:\)|\(:|=\)/g, '<img title=":)" class="chatSmiley" src="images/smileys/Smiling.png" />');

+	chat = chat.replace(/:\(|=\(/g, '<img title=":(" class="chatSmiley" src="images/smileys/Unhappy.png" />');

+	chat = chat.replace(/\^\_\^/g, '<img title="^_^" class="chatSmiley" src="images/smileys/Happy_3.png" />');

+	chat = chat.replace(/\:d/gi, '<img title=":D" class="chatSmiley" src="images/smileys/Grinning.png" />');

+	chat = chat.replace(/\:o/gi, '<img title=":O" class="chatSmiley" src="images/smileys/Gasping.png" />');

+	chat = chat.replace(/\:p/gi, '<img title=":P" class="chatSmiley" src="images/smileys/Tongue_Out.png" />');

+	chat = chat.replace(/;p/gi, '<img title=":s" class="chatSmiley" src="images/smileys/Tongue_Out_Winking.png" />');

+	chat = chat.replace(/\:c/gi, '<img title=":c" class="chatSmiley" src="images/smileys/Childish.png" />');

+	chat = chat.replace(/\:s/gi, '<img title=":s" class="chatSmiley" src="images/smileys/Confused.png" />');

+	chat = chat.replace(/\&gt;_\&lt;/g, '<img title=">_<" class="chatSmiley" src="images/smileys/Gah.png" />');

+	chat = chat.replace(/\$_\$/gi, '<img title="$_$" class="chatSmiley" src="images/smileys/Greedy.png" />');

+	chat = chat.replace(/-\.-|-_-/gi, '<img title="-.-" class="chatSmiley" src="images/smileys/Tired.png" />');

+	chat = chat.replace(/o\.O|o\_O/g, '<img title="o_O" class="chatSmiley" src="images/smileys/Huh.png" />');

+	chat = chat.replace(/O\.o|O\_o/g, '<img title="O_o" class="chatSmiley" src="images/smileys/Huh_2.png" />');

+	chat = chat.replace(/O\.O|O\_O/g, '<img title="O_O" class="chatSmiley" src="images/smileys/Madness.png" />');

+	chat = chat.replace(/\:-\//g, '<img title="O_O" class="chatSmiley" src="images/smileys/Uncertain.png" />');

+	chat = chat.replace(/\(y\)/gi, '<img title="(y)" class="chatSmiley" src="images/smileys/Thumb_Up.png" />');

+	chat = chat.replace(/\(n\)/gi, '<img title="(n)" class="chatSmiley" src="images/smileys/Thumb_Down.png" />');

+	chat = chat.replace(/\&lt;3/g, '<img title="<3" class="chatSmiley" src="images/smileys/Heart.png" />');

 	return chat;

 }

 

@@ -197,14 +211,16 @@ function spoil(obj) {
 

 var chatIsBusy = false;

 function getChat(message) {

-	if (chatIsBusy) return;

-	chatIsBusy = true;

 	var dataString = 'getChatFromID='+lastID;

 	var backup = new Array();

-	if (chatBuffer.length > 0) {

+

+	var fncComplete = '';

+	if (!chatIsBusy && chatBuffer.length > 0) {

+		chatIsBusy = true;

 		dataString += '&send=true&messages='+prepChat(chatBuffer);

 		backup = chatBuffer.slice(0);

 		chatBuffer.length = 0;

+		fncComplete = function() {chatIsBusy = false;};

 	}

 	$.ajax({

 		type: "POST",  

@@ -218,9 +234,7 @@ function getChat(message) {
 			getChatDone(data);

 			//console.log('b:', backup);

 		},

-		complete: function() {

-			chatIsBusy = false;

-		}

+		complete: fncComplete

 	});

 }