social_stream 0.15.5 → 0.15.6

data/base/app/assets/stylesheets/base.css.scss

@@ -132,7 +132,7 @@ div.chzn-container ul.chzn-choices li.search-field input{ cursor:pointer;}
 
 /********* Menu header SECTION ************/
 .menu_list ul{list-style-type:none;}
-.menu_list li{display: inline;padding-right: 2px; padding-left: 2px; }
+.menu_list li{display: inline;padding-right: 2px; padding-left: 2px; vertical-align: top; }
 .line{  display:block;  margin:10px 2px 10px 10px;}
 
 /*************MENU ICON SECTION**********/

data/base/app/models/activity.rb

@@ -317,7 +317,7 @@ class Activity < ActiveRecord::Base
     receiver_name= receiver.name.truncate(30, :separator => ' ')
     case verb 
       when 'like'
-        if direct_object.is_a? Actor or direct_object.respond_to? :actor
+        if direct_object.acts_as_actor?
           I18n.t('notification.fan', 
                 :sender => sender_name,
                 :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,

data/base/app/models/actor.rb

@@ -207,16 +207,25 @@ class Actor < ActiveRecord::Base
     Relation::Reject.of(self)
   end
  
-  # All the {Actor actors} this one has relation with
+  # All the {Actor Actors} this one has ties with:
+  # 
+  #   actor.contact_actors #=> array of actors that sent and receive ties from actor
   #
-  # Options:
-  # * type: Filter by the class of the contacts.
-  # * direction: sent or received
-  # * relations: Restrict the relations of considered ties. In the case of both directions,
-  #   only relations belonging to {Actor} are valid. It defaults to relations of
-  #   {Relation::Custom custom} and {Relation::Public public} types
-  # * include_self: False by default, don't include this actor as subject even they have ties with themselves.
-  # * load_subjects: True by default, make the queries for eager loading of contacts
+  #
+  #
+  # There are several options available to refine the query:
+  # type:: Filter by the class of the contacts ({User}, {Group}, etc.)
+  #          actor.contact_actors(:type => :user) #=> array of user actors. Exclude groups, etc.
+  #
+  # direction:: +:sent+ leaves only the actors this one has ties to. +:received+ gets
+  #             the actors sending ties to this actor, whether this actor added them or not
+  #               actor.contact_actors(:direction => :sent) #=> all the receivers of ties from actor
+  # relations:: Restrict to ties made up with +relations+. In the case of both directions,
+  #             only relations belonging to {Actor} are considered.
+  #             It defaults to actor's {Relation::Custom custom relations}
+  #               actor.contact_actors(:relations => [2]) #=> actors tied with relation #2
+  # include_self:: False by default, do not include this actor even they have ties with themselves.
+  # load_subjects:: True by default, make the queries for {http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Eager+loading+of+associations eager loading} of {SocialStream::Models::Subject Subject}
   #
   def contact_actors(options = {})
     subject_types   = Array(options[:type] || self.class.subtypes)
@@ -231,14 +240,19 @@ class Actor < ActiveRecord::Base
       as = as.includes(subject_types)
     end
     
-    # Make another query for getting the actors in the other way
+    # A blank :direction means reciprocate contacts, there must be ties in both directions
+    #
+    # This is achieved by getting the id of all the contacts that are sending ties
+    # Then, we filter the sent contacts query to only those contacts
     if options[:direction].blank?
       rcv_opts = options.dup
       rcv_opts[:direction] = :received
       rcv_opts[:load_subjects] = false
 
+      # Get the id of actors that are sending to this one
       sender_ids = contact_actors(rcv_opts).map(&:id)
 
+      # Filter the sent query with these ids
       as = as.where(:id => sender_ids)
 
       options[:direction] = :sent

data/base/app/views/layouts/application.html.erb

@@ -7,6 +7,7 @@
     <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
     <meta name="generator" content="SocialStream" />
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />
 
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.8".freeze
+    VERSION = "0.10.9".freeze
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.15.5".freeze
+  VERSION = "0.15.6".freeze
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.0.5".freeze
+    VERSION = "0.0.6".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.8')
-  s.add_runtime_dependency('linkser', '~> 0.0.7')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.9')
+  s.add_runtime_dependency('linkser', '~> 0.0.8')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

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

@@ -278,9 +278,10 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
 	
 	//Parse content before show it.
 	var content = getParsedContent(Strophe.getText(body), false)
+	var headerMessage = getParsedName(from_name,false);
 	
 	//Show message to chatBox.        
-	$("#" + from_slug).chatbox("option", "boxManager").addMsg(from_name, content);
+	$("#" + from_slug).chatbox("option", "boxManager").addMsg(headerMessage, content);
 	
 	//Rotate chatBoxes priority.
 	rotatePriority(from_slug);

data/presence/app/assets/javascripts/chat_parser.js

@@ -241,3 +241,17 @@ function getUrlType(url){
       return "link"
   }
 }
+
+
+///////////////////////////////////////////////////////
+// Parsing user titles
+///////////////////////////////////////////////////////
+
+function getParsedName(name, fromUser){
+  if (fromUser){
+   var chatTextclass = "ownName"
+  } else {
+   var chatTextclass = "guestName"
+  }
+  return ("<span class=\"" + chatTextclass + "\">" + name +  "</span>");
+}

data/presence/app/assets/javascripts/chat_window_manager.js

@@ -1,10 +1,12 @@
 ////////////////////
-//Chat functions
+//Chat Window Manager functions
 ////////////////////
 
 var nBox = 0;
 var maxBox = 5;
 var chatBoxWidth = 230;
+var chatBoxHeight = 170;
+var videoBoxHeight = 150;
 var visibleChatBoxes = new Array();
 var chatBoxSeparation = chatBoxWidth+12;
 
@@ -19,8 +21,6 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
 			
           //Add div with id = guest_slug
           $("#chat_divs").append("<div id=" + guest_slug + " name=" + guest_name + "></div>")
-					
-					//Add CSS [...]
           
 					
 					//Offset Management for new box
@@ -34,6 +34,8 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
 															hidden: false,
 															offset: offset, // relative to right edge of the browser window
                               width: chatBoxWidth, // width of the chatbox
+                              height: chatBoxHeight, // height of the chatbox
+                              video: 0, //height of the videoBox
                               title : guest_name,
 															position: position,
 															priority: visibleChatBoxes.length+1,
@@ -53,7 +55,8 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
 															
                               messageSent : function(id, user, msg) {
 																	rotatePriority(guest_slug);
-                                  $("#" + guest_slug).chatbox("option", "boxManager").addMsg(id, getParsedContent(msg,true));
+																	var headerMessage = getParsedName(id,true);
+                                  $("#" + guest_slug).chatbox("option", "boxManager").addMsg(headerMessage, getParsedContent(msg,true));
                                   sendChatMessage(user_jid,guest_jid,msg);
                               }});
 															
@@ -102,37 +105,82 @@ function getBoxParams(){
 }
 
 
+function getChatVariableFromSlug(slug){
+	return "slug_" + slug;
+}
+
+
+function getSlugFromChatVariable(variable){
+	return variable.split("_")[1];
+}
+
+
+////////////////////
+//Box replacement
+////////////////////
+
 function getBoxIndexToReplace(){
 
-	tmp = visibleChatBoxes[0];
-	for (i=0;i<visibleChatBoxes.length;i++){
+  tmp = visibleChatBoxes[0];
+  for (i=0;i<visibleChatBoxes.length;i++){
     if (visibleChatBoxes[i].chatbox("option", "priority") > tmp.chatbox("option", "priority")) {
-			tmp = visibleChatBoxes[i];
-	  }
+      tmp = visibleChatBoxes[i];
+    }
   }
-	
-	return visibleChatBoxes.indexOf(tmp);
+  
+  return visibleChatBoxes.indexOf(tmp);
 }
 
 
 function rotatePriority(guest_slug){
-	priority = $("#" + guest_slug).chatbox("option", "priority")
-	if(priority>1){		
-			for (i=0;i<visibleChatBoxes.length;i++){
+  priority = $("#" + guest_slug).chatbox("option", "priority")
+  if(priority>1){   
+      for (i=0;i<visibleChatBoxes.length;i++){
         if(visibleChatBoxes[i].chatbox("option", "priority")<priority){
-					visibleChatBoxes[i].chatbox("option", "priority",visibleChatBoxes[i].chatbox("option", "priority")+1);
-				}
-      }		
-			$("#" + guest_slug).chatbox("option", "priority", 1);		
-	}	
+          visibleChatBoxes[i].chatbox("option", "priority",visibleChatBoxes[i].chatbox("option", "priority")+1);
+        }
+      }   
+      $("#" + guest_slug).chatbox("option", "priority", 1);   
+  } 
 }
 
 
-function getChatVariableFromSlug(slug){
-	return "slug_" + slug;
+////////////////////
+//Video Window Manager functions
+////////////////////
+
+function getVideoBoxFromSlug(slug){
+	return $("#" + slug).parent().find("div.ui-videobox")
 }
 
+function showVideoBox(slug,embed){
+	var chatBox = window[getChatVariableFromSlug(slug)]
+	getVideoBoxFromSlug(slug).html(embed);
+  chatBox.chatbox("option", "video",videoBoxHeight);
+}
 
-function getSlugFromChatVariable(variable){
-	return variable.split("_")[1];
+
+function hideVideoBox(slug){
+	  var chatBox = window[getChatVariableFromSlug(slug)]
+    chatBox.chatbox("option", "video", 0);
+}
+
+
+//Function called from JQuery UI Plugin
+function toogleVideoBox(uiElement){
+	  var slug = $(uiElement.element).attr("id");
+    toogleVideoBoxForSlug(slug)
+}
+
+function toogleVideoBoxForSlug(slug){
+	var chatBox = window[getChatVariableFromSlug(slug)]
+	if (chatBox.chatbox("option", "video")==0){
+		showVideoBox(slug,getVideoEmbedForSlug(slug))
+	} else {
+		hideVideoBox(slug);
+	}
+}
+
+function getVideoEmbedForSlug(slug){
+	return "<img src=\"http://www.batiburrillo.net/wp-content/uploads/2011/03/Freemake.jpg?cda6c1\" width=\"" + (chatBoxWidth-20) + "\"/>"
 }

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

@@ -91,10 +91,10 @@ function ifCookie(){
 
 //Global variables
 var userStatus = "chat";
-var awayTimerPeriod = 16000;
+var awayTimerPeriod = 60000;
 var timerPeriod = 5000;
 var refreshMinTime = 3*timerPeriod;
-var awayTime = 300000;
+var awayTime = 20*60000; //20 minutes
 var awayCounter = 0;
 var timerCounter = 0;
 var connection = null;

data/presence/app/assets/stylesheets/{chat.css → chat.css.scss}

@@ -1,21 +1,28 @@
+@import "colors";
+
+
 /* Chatbox style sheet */
 
+.ui-widget-content{
+  border: none;  
+}
+
 .ui-chatbox {
     position: fixed;
     bottom:0;
     padding: 2px 2px 2px 2px;
     padding: 2px 2px 2px 2px;
-    background:  #CCCCCC;
+    background: $separation-color;
 }
 
 .ui-state-highlight {
-	background: #CCCCCC;
-	background-color: #CCCCCC;
-	border: 1px solid lightgrey;
+	background: $separation-color;
+	background-color: $separation-color;
+	border: 1px solid $separation-color;
 }
 
 .chatWindowhighlighted {
-	color: #CAC8F4;
+	color: $fill-color;
 }
 
 .ui-chatbox-titlebar {
@@ -33,28 +40,28 @@
     padding: 3px 3px 3px 3px;
     height: 150px;
     overflow-y: auto;
-    background: #FFFFFF;
+    background: $text-over-main;
 }
 
 .ui-chatbox-input {
     padding: 3px 3px 3px 3px;
-    border-top: 1px solid grey;
+    border-top: 1px solid $separation-color;
     overflow: hidden;
-    /* background: #FFFFFF; */
 }
 
 .ui-chatbox-input-box {
     margin: 5px 5px 5px 5px;
-    border: 2px solid lightgrey;
+    border: 1px solid $separation-color;
     height: 35px;
 }
 
+
 .ui-chatbox-icon {
     float: right;
 }
 
 .ui-chatbox-input-focus {
-    border-color: #6699FF;
+    border-color: $header-notification-color;
 }
 
 .ui-chatbox-msg {
@@ -62,10 +69,27 @@
     clear: both;
 }
 
+.ui-chatbox-log {
+	border: none;
+}
+
+
+/* video window style */
+div.ui-videobox{
+	height: 0px;
+	border-bottom: 1px solid $separation-color;
+}
+
+div.ui-videobox-icon{
+  
+}
+
+/* notifications style sheet */
+
 div.ui-chatbox-notify{
 	visibility: hidden;
-	background: #E5E5E5;
-	background-color: #E5E5E5;
+	background: $fill-color;
+	background-color: $fill-color;
 	color: black;
 	z-index: 1;
 	position:absolute;
@@ -76,7 +100,7 @@ div.ui-chatbox-notify{
 	text-align: center;
 	border-style:solid;
   border-width:1px;
-	border-color: #CCCCCC;
+	border-color: $fill-color;
 	opacity:0.95;
   filter:alpha(opacity=95); /* For IE8 and earlier */
 }
@@ -87,6 +111,7 @@ p.ui-chatbox-notify-text{
 }
 
 
+
 /* Ticks */
 
 .chat-thick {
@@ -108,6 +133,10 @@ p.ui-chatbox-notify-text{
 	background-position: -96px -128px;
 }
 
+.chat-videothick{
+	display: none;
+}
+
 
 /* Presence Partial */
 
@@ -147,7 +176,7 @@ div.user_presence {
 
 #passwordFormChat{
 	width: 150px;
-  background-color: #1F4A75;
+  background-color: $main-color;
   padding-top:3px;
 	padding-bottom:1px;
 }
@@ -168,7 +197,7 @@ input.chat_password{
 input.connectChatButton{
 	text-align: center;
 	width: 150px;
-	background-color: #1F4A75;
+	background-color: $main-color;
   border: 0 none;
   cursor: pointer;
 	color: white;
@@ -189,28 +218,19 @@ input.connectChatButton{
   width:160px;
   padding: 18px 25px 15px 25px;
 	margin: -15px 0px 0px 0px;
-  color:#fff;
+  color: white;
 	background:transparent url(black_arrow3.png);
 	text-align: center;
-	/* border: 5px solid red; */
 }
 
 
-/* Status style sheet */
 
+/* Status style sheet */
 
 #status{
 	z-index: 1;
 }
-
-.desc { 
-  color:#6b6b6b;
-}
-
-.desc a {
-	color:#0092dd;
-}
-        
+       
 .dropdown dd, .dropdown dt, .dropdown ul { 
   margin:0px; 
 	padding:0px; 
@@ -221,29 +241,28 @@ input.connectChatButton{
 }
 
 .dropdown a, .dropdown a:visited { 
-  color:#1F4A75; 
+  color: $main-color; 
 	text-decoration:none; 
 	outline:none;
 }
 
 .dropdown a:hover { 
-  color:#1F4A75;
+  color: $main-color;
 }
 .dropdown dt a:hover { 
-  color:#1F4A75; 
-	border: 1px solid #1F4A75;
+  color: $main-color; 
+	border: 1px solid $main-color;
 }
 
 .dropdown dt a {
-	background:#DFECF1 url(btn/arrowBlue.png) no-repeat scroll right center; 
+	background:$secondary-color url(btn/arrowBlue.png) no-repeat scroll right center; 
 	display:block; 
 	padding-right:20px;
-  border:1px solid #DFECF1; 
+  border:1px solid $secondary-color; 
 	width:128px;
 }
 
 
-
 .dropdown dt a span {
 	cursor:pointer; 
 	display:block; 
@@ -251,8 +270,9 @@ input.connectChatButton{
 }
 	
 .dropdown dd ul { 
-  background:#DFECF1 none repeat scroll 0 0; 
-	border:1px solid #DFECF1; color:#DFECF1; 
+  background: $secondary-color none repeat scroll 0 0; 
+	border:1px solid $secondary-color; 
+	color: $secondary-color; 
 	display:none;
   left:0px; 
 	padding:5px 0px; 
@@ -274,7 +294,7 @@ input.connectChatButton{
 }
 
 .dropdown dd ul li a:hover { 
-  background-color:#D4E5EF;
+  background-color: $separation-color;
 }
 
 .dropdown img.flag { 
@@ -287,22 +307,23 @@ input.connectChatButton{
   display:none;
 }
 
-.input_select{ 
-  width: 100%; 
-	background-color: #D0C9AF; 
-	margin-top:5px;
-	margin-bottom:5px; 
-}
-
 
 /* Chat text style */
 
 .ownChatText {
-  color: #342E82;
+  color: $main-color;
 }
 
 .guestChatText {
-  color: #342E82;
+  color: $sentence-color;
+}
+
+.ownName {
+  color: $main-color;
+}
+
+.guestName {
+  color: $sentence-color;
 }
 
 .chatImage {
@@ -321,9 +342,9 @@ input.connectChatButton{
 }
 
 a.chatLink:link, a.chatLink:visited {
-    color: #1E726A;
+    color: $main-color;
 }
 
 a.chatImageLink:link, a.chatImageLink:visited {
-    color: #1E726A;
+    color: $main-color;
 }

data/presence/ejabberd/ejabberd_scripts/emanagement

@@ -54,7 +54,7 @@ PARAMS_FOR_COMMANDS = {
 	'sendMessageToUser' => 3,
 	'getUserResource' => 1,
 	'isEjabberdNodeStarted' => 0,
-	'broadcast' => 2,
+	'broadcast' => 3,
 	'checkEjabberdctlQuotedString' => 0,
         'getConnectedUsers' => 0,
 	'help' => 0,
@@ -79,7 +79,7 @@ SYNTAX_FOR_COMMANDS = {
 	'sendMessageToUser' => 'sendMessageToUser from_name to_name msg',
 	'getUserResource' => 'getUserResource username',
 	'isEjabberdNodeStarted' => 'isEjabberdNodeStarted',
-	'broadcast' => 'broadcast users msg (users values: "all" or slugs array)',
+	'broadcast' => 'broadcast admin users msg (users values: "all" or slugs array)',
 	'checkEjabberdctlQuotedString' => 'checkEjabberdctlQuotedString',
         'getConnectedUsers' => 'getConnectedUsers',
 	'help' => 'help',
@@ -364,7 +364,7 @@ def getConnectedUsers
 	return users
 end
 
-def broadcast(users,msg)
+def broadcast(admin,users,msg)
 	output = executeCommand("ejabberdctl connected-users")
         lines = output.split("\n");
 	lines.each do |line|
@@ -372,7 +372,7 @@ def broadcast(users,msg)
 		if (users == "all") or (users.length > 1 and users.include?(username))
 			s = line.split("@")[1];
 			resource = s.split("/")[1];
-			sendMessageToUser("SocialStream",username,msg)
+			sendMessageToUser(admin,username,msg)
 		end
 	end
 	return "Done"

data/presence/ejabberd/ejabberd_scripts/reset_connection_script

@@ -6,8 +6,6 @@
 
 require 'logger'
 require 'rest_client'
-require 'openssl'
-require 'digest/md5'
 
 
 path = "/var/log/ejabberd/scripts.log"
@@ -34,7 +32,7 @@ end
 $secure_rest_api = getOption("secure_rest_api=")
 $pass = getOption("ejabberd_password=")
 $scripts_path = getOption("scripts_path=")
-$script_title = "Reset Connection script"
+$script_title = "Reset Connection Script"
 
 
 def log(title,text)
@@ -194,6 +192,9 @@ def sendHttpRequest(url,params,encrypted_params)
 
 
     if $secure_rest_api == "true"
+	#Require libraries
+	require 'openssl'
+
 	xmpp_private_key_path = $scripts_path + "/rsa_keys/xmpp_rsa_key_private.pem";
     	web_public_key_path = $scripts_path + "/rsa_keys/web_rsa_key_public.pem";
     	xmpp_private_key = OpenSSL::PKey::RSA.new(File.read(xmpp_private_key_path))
@@ -241,6 +242,8 @@ end
 
 
 def calculateHash(request_params)
+	require 'digest/md5'
+
 	unless request_params
 		request_params = {};
 	end