social_stream-presence 0.1.0 → 0.1.1

data/app/assets/javascripts/chat_interface_manager.js.erb

@@ -1,6 +1,9 @@
 ////////////////////
 //Hash table
 ////////////////////
+
+//Keys: Xmpp status
+//Value: Social Stream Status
 var statusIcons = new Array();
 statusIcons[''] = "available";
 statusIcons['chat'] = "available";
@@ -63,29 +66,55 @@ function setUserFunctions(){
 	$(".dropdown dt a").click(function(event) {
 	 	event.preventDefault();
     $(".dropdown dd ul").toggle();
+		
+		if($(".dropdown dd ul").is(":visible")){
+			setStatusWidgetTitle("default");
+		} else {
+			setStatusWidgetTitle(userStatus);
+		}
+		
+		restartAwayTimer(false);
+		
   });
           
   $(".dropdown dd ul li a.option").click(function(event) { 
 	  event.preventDefault();
-		var text = $(this).html();
-    $(".dropdown dt a span").html(text);
-    userStatus = getSelectedValue("status");
+		userStatus = $(this).find("span.value").html();
     sendStatus(userStatus);
 		$(".dropdown dd ul").hide();
   });
   
-       
-  function getSelectedValue(id) {
-    return $("#" + id).find("dt a span.value").html();
-  }
   
   $(document).bind('click', function(e) {
     var $clicked = $(e.target);
     if (! $clicked.parents().hasClass("dropdown")){
       //Click outside the select...
         $(".dropdown dd ul").hide();
+				setStatusWidgetTitle(userStatus);
     }
   });
+	
+}
+
+function setStatusWidgetTitle(status){
+	
+	if ($(".dropdown dt a span").length == 0){
+		return;
+	}
+	
+  if (status in statusIcons) {
+		
+	  if ($("#" + statusIcons[status]).length == 0){
+      return;
+    }
+	  var text = $("#" + statusIcons[status]).html();
+    $(".dropdown dt a span").html(text);
+		
+  } else if(status=="default"){
+    var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
+    $(".dropdown dt a span").html(defaultTitle);
+  }
+	 
 }
 
 
@@ -96,21 +125,32 @@ function setUserFunctions(){
 function awayTimerFunction(){
 	  awayCounter++;
 	  if (awayCounter > (awayTime/awayTimerPeriod)){
-	    userStatus = "away";
-			sendStatus(userStatus);
+			if (userStatus != "dnd") {
+	  	  userStatus = "away";
+	  	  sendStatus(userStatus);
+	    }
 			clearTimeout(awayTimer);
-	  } else {
-	    userStatus = "chat";
 	  }
 }
 
-function resumeAwayTimerIfAway(){
+function autochangeStatusOnUserAway(){
 	  if (userStatus == "away"){
-			awayCounter = 0;
-			userStatus = "chat";
-			sendStatus(userStatus);
+      userStatus = "chat";
+      sendStatus(userStatus);
+    }
+}
+
+function restartAwayTimer(autochangeStatus){
+		
+		if (awayCounter > (awayTime/awayTimerPeriod)){
 			awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
+			
+			if(autochangeStatus){
+        autochangeStatusOnUserAway();
+      }
 		}
+		
+		awayCounter = 0;		
 }
 
 
@@ -144,6 +184,7 @@ function updateChatWindow(){
 			$(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(data);
       if (userConnected) {
+				setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();
         setUserFunctions();
       }
@@ -194,4 +235,52 @@ function getAllConnectedSlugs(){
 	    }
 	});
   return connectedSlugs
+}
+
+
+////////////////////
+//Insert received message in chatbox
+////////////////////
+
+function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
+	
+	//Antiflood control
+	 if (antifloodControl(from_jid,from_slug,body,msgID)){
+	 	return;
+	 }
+	
+	//Check for from_slug name and connectionBox visibility
+	if (typeof($('div.user_presence[slug=' + from_slug + ']').attr('name')) == 'undefined') {
+		//No connectionBox for this user!
+		var from_name = from_slug;
+		refreshChatWindow();
+	}	else {
+		showConnectionBoxFromSlug(from_slug);
+		var from_name = $('div.user_presence[slug=' + from_slug + ']').attr('name');
+	}
+	
+	
+	//Create or toggle from_slug's chatBox.
+	if (createChatBox(from_slug, from_name, from_jid, user_name, user_jid)) {
+	}	else {
+		window[getChatVariableFromSlug(from_slug)].chatbox("option", "boxManager").toggleBox(true);
+	}
+	
+	//Parse content before show it.
+	var content = getParsedContent(Strophe.getText(body), false)
+	
+	//Show message to chatBox.        
+	$("#" + from_slug).chatbox("option", "boxManager").addMsg(from_name, content);
+	
+	//Rotate chatBoxes priority.
+	rotatePriority(from_slug);
+	
+	//Check for start blinkTitle.
+	blinkTitleOnMessage(from_name);
+	
+	//Check for play sound
+	if (mustPlaySoundForChatWindow(window[getChatVariableFromSlug(from_slug)])) {
+		playSound("onMessageAudio");
+	}
+	
 }

data/app/assets/javascripts/chat_utilities.js

@@ -64,6 +64,132 @@ function blinkTitleOnMessage(username){
 }
 
 
+
+////////////////////
+//Antiflood
+////////////////////
+
+var lastMessageTimes = new Array();
+//lastMessageTimes['from_slug'] = ["timeOfLastMessage",["msgID1","msgID2"]];
+
+var timeBetweenMessages = 500; //mseconds
+
+//Return true when detects a text storm and control the text flood:
+//timeBetweenMessages is the minimum time that must elapse between the messages of the same contact.
+function antifloodControl(from_jid,from_slug,body,msgID) {
+	
+	if( from_slug in lastMessageTimes){
+
+  } else {
+    lastMessageTimes[from_slug] = [,[]];
+  }
+	
+	if (msgID==null){
+		msgID = generateMessageID();
+	}
+	
+	var lastMessageTime = lastMessageTimes[from_slug][0];
+	
+  var t = (new Date()).getTime();
+  if(t - lastMessageTime < timeBetweenMessages) {
+		        //Flood detected
+						return retryToShowMessage(from_jid,from_slug,body,msgID);
+  }
+	
+	//Check if is the first message of this user to be send.
+	//var messageQueue = lastMessageTimes[from_slug][1];
+	
+	if (lastMessageTimes[from_slug][1].length>0){
+		if((lastMessageTimes[from_slug][1])[0]==msgID){
+			//Message is the first on the queue: Show it and remove from the queue
+			lastMessageTimes[from_slug][1].splice(0,1);
+		} else {
+			//Message is not the first on the queue
+			return retryToShowMessage(from_jid,from_slug,body,msgID);
+		}
+	}
+	
+	//Message can be send
+  lastMessageTimes[from_slug][0] = t;	
+  return false;
+};
+
+
+var rootMessageID=1;
+function generateMessageID(){
+	return (++rootMessageID);
+}
+
+
+function retryToShowMessage(from_jid,from_slug,body,msgID){
+	//Enque the message if isn't in the queue
+  if (lastMessageTimes[from_slug][1].indexOf(msgID)==-1){
+    lastMessageTimes[from_slug][1].push(msgID);
+  }
+      
+  setTimeout(function(){putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID)}, timeBetweenMessages);
+  return true;
+}
+
+
+
+
+
+////////////////////
+//Controlflood
+////////////////////
+var timeBetweenOwnMessages = 500; //mseconds
+var lastMessageSentTime=null;
+
+function floodControl() {
+  var t = (new Date()).getTime();
+	
+	if(lastMessageSentTime==null){
+    lastMessageSentTime = t;
+    return true;
+  }
+	
+	if (t - lastMessageSentTime < timeBetweenOwnMessages) {
+    return false;
+  } else {
+    lastMessageSentTime = t;
+    return true;
+  } 
+};
+
+
+function initControlFlood(){
+	$(".ui-chatbox-input-box")
+}
+
+
+////////////////////
+//Bounce chatbox control
+////////////////////
+var lastBounceTimes = new Array();
+var timeBetweenBounces = 5000; //mseconds
+
+function mustBounceBoxForChatWindow(jqueryUIChatbox){
+	var from_slug = $($(jqueryUIChatbox.elem.uiChatbox).find(".ui-chatbox-content").children()[0]).attr("id")
+	
+  var t = (new Date()).getTime();
+	
+	if(!(from_slug in lastBounceTimes)){
+    lastBounceTimes[from_slug] = t;
+		return true;
+  }
+	 
+  var lastBounceTime = lastBounceTimes[from_slug];
+	
+  if (t - lastBounceTime < timeBetweenBounces) {
+    return false;
+  } else {
+		lastBounceTimes[from_slug] = t;
+		return true;
+	} 
+	
+}
+
 ////////////////////
 //Next features...
 ////////////////////

data/app/assets/javascripts/chat_window_manager.js

@@ -52,7 +52,7 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
 															},
 															
                               messageSent : function(id, user, msg) {
-																  rotatePriority(guest_slug);
+																	rotatePriority(guest_slug);
                                   $("#" + guest_slug).chatbox("option", "boxManager").addMsg(id, getParsedContent(msg,true));
                                   sendChatMessage(user_jid,guest_jid,msg);
                               }});

data/app/assets/javascripts/xmpp_client_management.js.erb

@@ -181,36 +181,11 @@ function onMessage(msg) {
     var elems = msg.getElementsByTagName('body');
 
     if (type == "chat" && elems.length > 0) {
-	
 			var body = elems[0];
 			var from_slug = from.split("@")[0];
-			var from_name = $("#" + from_slug).attr("name");
 			var from_jid = from_slug + "@" + domain;
 		
-		
-		  if (typeof ($('div.user_presence[slug=' + from_slug + ']').attr('name')) == 'undefined') {
-				//No connectionBox for this user!
-		    var from_name = from_slug;
-				refreshChatWindow();
-		  } else {
-				showConnectionBoxFromSlug(from_slug);
-		    var from_name = $('div.user_presence[slug=' + from_slug + ']').attr('name');
-		  }
-			
-			if (createChatBox(from_slug,from_name,from_jid,user_name,user_jid)) {
-			} else {
-        window[getChatVariableFromSlug(from_slug)].chatbox("option", "boxManager").toggleBox(true);
-			}
-			
-			var content = getParsedContent(Strophe.getText(body),false)
-			//Send message to chatBox and post-message functions.					
-			$("#" + from_slug).chatbox("option", "boxManager").addMsg(from_name, content);
-			rotatePriority(from_slug);
-			blinkTitleOnMessage(from_name);
-			if (mustPlaySoundForChatWindow(window[getChatVariableFromSlug(from_slug)])){
-          playSound("onMessageAudio");
-      }
-			
+		  putReceivedMessageOnChatWindow(from_jid,from_slug,body,null)	
     }
 
     // we must return true to keep the handler alive.  
@@ -283,7 +258,7 @@ function sendChatMessage(from,to,text){
     body.t(text);
     var message = $msg({to: to, from: from, type: 'chat'}).cnode(body.tree());
     connection.send(message.tree());	  	
-		resumeAwayTimerIfAway();
+		restartAwayTimer(false);
 		return true;
 }
 
@@ -300,5 +275,6 @@ function sendStatus(status){
       .c('show')
       .t(status);
        connection.send(pres.tree());
+			 setStatusWidgetTitle(status);
     }
 }

data/app/controllers/xmpp_controller.rb

@@ -172,15 +172,12 @@ class XmppController < ApplicationController
     redirect_to :controller => :settings, :action => :index
   end
   
-  #TEST METHODS
+  
+  #Test Method
   def active_users
     @users = User.find_all_by_connected(true)
     @all_users = User.all
   end
-   
-  def test
-    #puts "TEST"
-  end
   
   
   private

data/app/views/chat/_contacts.html.erb

@@ -12,9 +12,9 @@
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
+					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
+					      <li><a id="away" href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
+					      <li><a id="dnd" href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
 			        </ul>
 			    </dd>
         </div>

data/app/views/chat/_settings.html.erb

@@ -1,9 +1,7 @@
-<% if current_user and current_subject and current_user==current_subject %>
-	
 <div class="block" id="chat_settings">
     <div class="header">
         <div class="header_text">
-             Chat
+             <%=t('chat.title')%>
         </div>
         <div class="header_icon_right">
           <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"chat_settings\");" %>
@@ -11,7 +9,7 @@
     </div>
     <div id="chat_settings_briefing" class="settings_briefing content">        
         <div class="form_row">
-            Enable and configure Social Stream Chat
+            <%=t('chat.settings.title')%>
         </div>
     </div>
     <div class="content settings_content" id="chat_settings_content" style="display:none;">
@@ -23,16 +21,14 @@
           <div class="form_sub_row">
             <% checked = current_user.chat_enabled %>
             <%= check_box_tag 'enable_chat', true, checked %>
-            <%= label_tag(:enable_chat, "Enable or disable Social Stream Chat") %> 
+            <%= label_tag(:enable_chat, t('chat.settings.checkbox')) %> 
           </div>
           <div class="actions center">
               <%= hidden_field_tag :settings_section, :chat %>
-              <%= submit_tag "Update Settings", :class => "button" %>
+              <%= submit_tag t('chat.settings.update'), :class => "button" %>
           </div>
         </div>
         </ul>
         <% end %>
     </div>
 </div>
-	
-<% end %>

data/app/views/xmpp/active_users.html.erb

@@ -1,33 +1,33 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Demo2</title>
+  <title>Social Stream Presence</title>
 </head>
 <body>
 
 
-<p> Usuarios conectados Social Stream </p>
+<p> Social Stream connected users </p>
 
 <p>&nbsp;</p>
 <ul>
-<%@users.each do |user| %>
-  <li><b><%=user.name%></b></li>
-<%end%>
+  <%@users.each do |user| %>
+    <li><b><%=user.name%></b></li>
+  <%end%>
  </ul>
 <p>&nbsp;</p>
 
 
-<p> Usuarios Social Stream </p>
+<p> All Social Stream users </p>
 
 <p>&nbsp;</p>
 <ul>
-<%@all_users.each do |user| %>
-  <li><b><%=user.slug%></b> with email: <%=user.email%></li>
-<%end%>
+  <%@all_users.each do |user| %>
+    <li><b><%=user.slug%></b> with email: <%=user.email%></li>
+  <%end%>
  </ul>
 <p>&nbsp;</p>
  
-<p> <a href="/test">Volver</a></p>
+<p> <a href="/test">Come back</a></p>
 
 </body>
 </html>

data/config/locales/en.yml

@@ -8,4 +8,8 @@ en:
       choose: "Choose status"
       available: "Available"
       away: "Away"
-      dnd: "Busy"
+      dnd: "Busy"
+    settings:
+      title: "Enable and configure Social Stream Chat"  
+      checkbox: "Enable or disable Social Stream Chat"  
+      update: "Update Settings"

data/config/locales/es.yml

@@ -8,4 +8,9 @@ es:
       choose: "Establecer estado"
       available: "Disponible"
       away: "Ausente"
-      dnd: "No molestar"
+      dnd: "No molestar"
+    settings:
+      title: "Activación y configuración del chat de Social Stream"
+      checkbox: "Activar o desactivar chat"  
+      update: "Guardar configuración"
+       

data/config/routes.rb

@@ -1,8 +1,5 @@
 Rails.application.routes.draw do
-  match "/test" => "Xmpp#index"
-  match "/xmpp4r_test" => "Xmpp#test"
-  match "/active_users" => "Xmpp#active_users"
-  match '/chat' => "Xmpp#chat"
+  #match "/active_users" => "Xmpp#active_users"
   
   match '/xmpp/resetConnection' => "Xmpp#resetConnection"
   match '/xmpp/setConnection' => "Xmpp#setConnection"

data/lib/social_stream-presence.rb

@@ -1,6 +1,12 @@
 require 'social_stream-base'
 
 module SocialStream
+  module Views
+    module Settings
+      autoload :Presence, 'social_stream/views/settings/presence'
+    end
+  end
+
   module Presence   
 
     autoload :XmppServerOrder, 'social_stream/presence/xmpp_server_order'
@@ -9,6 +15,7 @@ module SocialStream
       autoload :BuddyManager, 'social_stream/presence/models/buddy_manager'
     end
 
+
     mattr_accessor :domain
     mattr_accessor :bosh_service
     mattr_accessor :auth_method
@@ -37,4 +44,4 @@ module SocialStream
   end
 end
 
-require 'social_stream/presence/engine'
+require 'social_stream/presence/engine'

data/lib/social_stream/presence/engine.rb

@@ -1,15 +1,17 @@
 module SocialStream
   module Presence
     class Engine < Rails::Engine
-      config.to_prepare do
-        
-        #Patching Tie
-        Tie.class_eval do
+      initializer "social_stream-presence.tie" do
+        ActiveSupport.on_load(:tie) do
           include SocialStream::Presence::Models::BuddyManager
         end
-        
       end
- 
+
+      initializer "social_stream-presence.views.settings" do
+        SocialStream::Views::Settings.module_eval do
+          include SocialStream::Views::Settings::Presence
+        end
+      end
     end
   end
 end

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/social_stream/views/settings/presence.rb

@@ -0,0 +1,20 @@
+module SocialStream
+  module Views
+    module Settings
+      module Presence
+        def settings_items
+          super.tap do |items|
+            if SocialStream::Presence.enable
+              if current_subject == current_user
+                items.insert_before 'notifications', {
+                  :key  => 'chat',
+                  :html => render(:partial => "chat/settings")
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/assets/javascripts/jquery.ui.chatbox.js

@@ -54,11 +54,18 @@
 				//Get highlight color from css
 				var dummy_element = $("<p class=\"chatWindowhighlighted\"></div>");
         var options = {color: $(dummy_element).css("color")};
+				
 		    self.elem.uiChatboxTitlebar.effect("highlight", options, 300);
-		    self.elem.uiChatbox.effect("bounce", {times:3}, 300, function(){
-			     self.highlightLock = false;
-			     self._scrollToBottom();
-		    });
+				
+				
+				if (((typeof mustBounceBoxForChatWindow == 'function')&&(mustBounceBoxForChatWindow(self)))||((typeof mustBounceBoxForChatWindow != 'function'))) {
+					 self.elem.uiChatbox.effect("bounce", {times:3}, 300, function(){
+           self.highlightLock = false;
+           self._scrollToBottom();
+          });
+				} else {
+					 self.highlightLock = false;
+				}
 		},
 		toggleBox: function(show) {
 		    this.elem.uiChatbox.toggle(show);
@@ -187,15 +194,17 @@
 			 )
 		.appendTo(uiChatboxInput)
 	        .keydown(function(event) {
-		    if(event.keyCode && event.keyCode == $.ui.keyCode.ENTER) {
-			msg = $.trim($(this).val());
-			if(msg.length > 0) {
-			    self.options.messageSent(self.options.id, self.options.user, msg);
-			}
-			$(this).val('');
-			return false;
-		    }
-		})
+				    if(event.keyCode && event.keyCode == $.ui.keyCode.ENTER) {
+							if (((typeof floodControl == 'function')&&(floodControl()))||((typeof floodControl != 'function'))) {
+						  	msg = $.trim($(this).val());
+						  	if (msg.length > 0) {
+						  		self.options.messageSent(self.options.id, self.options.user, msg);
+						  	}
+						  	$(this).val('');
+						  }
+							return false;
+				    }
+		      })
 		.focusin(function() {
 		    uiChatboxInputBox.addClass('ui-chatbox-input-focus');
 		    var box = $(this).parent().prev();

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 +01:00
+date: 2011-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,8 +118,6 @@ files:
 - app/views/chat/_off.html.erb
 - app/views/chat/_settings.html.erb
 - app/views/xmpp/active_users.html.erb
-- app/views/xmpp/index.html
-- app/views/xmpp/test.html.erb
 - config/locales/en.yml
 - config/locales/es.yml
 - config/routes.rb
@@ -154,6 +152,7 @@ files:
 - lib/social_stream/presence/models/buddy_manager.rb
 - lib/social_stream/presence/version.rb
 - lib/social_stream/presence/xmpp_server_order.rb
+- lib/social_stream/views/settings/presence.rb
 - lib/tasks/presence/synchronize.rake
 - social_stream-presence.gemspec
 - spec/demo/.gitignore

data/app/views/xmpp/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Ruby on Rails: Welcome aboard</title>
-    <script type="text/javascript">
-
-    </script>
-  </head>
-  <body>
-    <div id="page">
-      <p> Hello World </p>
-			
-			<p> <a href="/xmpp4r_test">Test</a></p>
-			<p> <a href="/active_users">Usuarios conectados al servidor XMPP</a></p>
-			
-    </div>
-  </body>
-</html>

data/app/views/xmpp/test.html.erb

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Demo2</title>
-</head>
-<body>
-
-<p> <a href="/test">Volver</a></p>
-
-</body>
-</html>