Fixed chat

- Syntax error on chat - Reviewed INSTALL.chat - Added function to update the list of users online on main window (ActionItem2667)

Fixed chat
- Syntax error on chat - Reviewed INSTALL.chat - Added function to update the list of users online on main window (ActionItem2667)
Daniela Feitosa
1 parent 36553bc6
Showing 6 changed files with 34 additions and 18 deletions Show diff stats
INSTALL.chat
app/models/user.rb
app/views/shared/logged_in/xmpp_chat.rhtml
public/javascripts/application.js
public/javascripts/chat.js
test/unit/user_test.rb
@@ -6,15 +6,13 @@ To configure XMPP/BOSH in Noosfero you need:
 * SystemTimer - http://ph7spot.com/musings/system-timer
 * Pidgin data files - http://www.pidgin.im/
-If you use Debian Lenny:
+If you use Debian Wheezy:
-# apt-get install librestclient-ruby (from backports)
-# apt-get install pidgin-data
-# apt-get install ruby1.8-dev
+# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
 # gem install SystemTimer
-Take a look at util/chat directory to see samples of config file to configure a
-XMPP/BOSH server with ejabberd, postgresql and apache2.
+The samples of config file to configure a XMPP/BOSH server with
+ejabberd, postgresql and apache2 can be found at util/chat directory.
 == XMPP/Chat Server Setup
@@ -22,8 +20,7 @@ This is a step-by-step guide to get a XMPP service working, in a Debian system.
 1. Install the required packages
-# apt-get -t lenny-backports install ejabberd
-# apt-get install odbc-postgresql
+# apt-get install ejabberd odbc-postgresql
 2. Ejabberd configuration
@@ -108,7 +105,7 @@ Unused modules can be disabled, for example:
  * web_admin
  * mod_pubsub
  * mod_irc
- * mod_offine
+ * mod_offline
  * mod_admin_extra
  * mod_register
@@ -132,7 +129,7 @@ This will create a new schema inside the noosfero database, called &#39;ejabberd&#39;.
 Note 'noosfero' user should have permission to create Postgresql schemas. Also,
 there should be at least one domain with 'is_default = true' in 'domains'
-table, otherwise people couldn't see your friends online.
+table, otherwise people won't be able to see their friends online.
 4. ODBC configuration
@@ -168,9 +165,12 @@ Debug       = 0
 CommLog     = 1
 UsageCount  = 3
- * testing all:
+ 4.1 testing all:
-# isql 'PostgreSQLEjabberdNoosfero' DBUSER
+# isql 'PostgreSQLEjabberdNoosfero'
+
+If the configuration was done right, the message "Connected!"
+will be displayed.
 5. Enabling kernel polling and SMP in /etc/default/ejabberd
@@ -294,7 +294,8 @@ class User &lt; ActiveRecord::Base
       'email_domain' => self.enable_email ? self.email_domain : nil,
       'friends_list' => friends_list,
       'enterprises' => enterprises,
-      'amount_of_friends' => friends_list.count
+      'amount_of_friends' => friends_list.count,
+      'chat_enabled' => person.environment.enabled?('xmpp_chat')
     }
   end
@@ -6,6 +6,6 @@
     </div>
   </div>
   <a href='#' id='chat-online-users-title' onclick='return false;'>
-    <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
+    <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
   </a>
 </div>
@@ -486,7 +486,9 @@ jQuery(function($) {
       // logged in
       loggedInDataCallBack(data);
       addManageEnterprisesToOldStyleMenu(data);
-      chatOnlineUsersDataCallBack(data);
+      if (data.chat_enabled) {
+        setInterval(function(){ $.getJSON('/account/user_data', chatOnlineUsersDataCallBack)}, 10000);
+      }
     } else {
       // not logged in
       $('#user .not-logged-in, .login-block .not-logged-user').fadeIn();
@@ -538,7 +540,7 @@ jQuery(function($) {
       return;
     }
     var content = '';
-    $('#chat-online-users').html($('#chat-online-users').html().replace(/%{amount}/g, data['amount_of_friends']));
+    $('#chat-online-users .amount_of_friends').html(data['amount_of_friends']);
     $('#chat-online-users').fadeIn();
     for (var user in data['friends_list']) {
       var name = "<span class='friend_name'>%{name}</span>";
@@ -253,7 +253,7 @@ jQuery(function($) {
                  result.show = 'away';
               }
            }
-           if ($(stanza).find('x[xmlns='+ Strophe.NS.MUC_USER +']').length > 0) {
+           if ($(stanza).find('x[xmlns="'+ Strophe.NS.MUC_USER +'"]').length > 0) {
               result.is_from_room = true;
               result.from_user = $(stanza).find('x item').attr('jid');
               if ($(stanza).find('x item').attr('affiliation') == 'owner') {
@@ -351,7 +351,7 @@ jQuery(function($) {
      },
      on_muc_support: function(iq) {
-        if ($(iq).find('identity[category=conference]').length > 0 && $(iq).find('feature[var='+ Strophe.NS.MUC +']').length > 0) {
+        if ($(iq).find('identity[category=conference]').length > 0 && $(iq).find('feature[var="'+ Strophe.NS.MUC +'"]').length > 0) {
            var name = $(iq).find('identity[category=conference]').attr('name');
            log('muc support found with identity '+ name);
            Jabber.muc_supported = true;
@@ -399,6 +399,19 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal 15, User.expires_chat_status_every
   end
+  should "return status of chat on environment in data_hash" do
+    person = create_user('coldplay').person
+    env = person.environment
+    env.enable('xmpp_chat')
+    env.save
+    assert_equal true, person.user.data_hash['chat_enabled']
+
+    env.disable('xmpp_chat')
+    env.save
+    person.reload
+    assert_equal false, person.user.data_hash['chat_enabled']
+  end
+
   should 'respond name with related person name' do
     user = create_user('testuser')
     user.person.name = 'Test User'
	@@ -6,6 +6,6 @@		@@ -6,6 +6,6 @@
6	</div>	6	</div>
7	</div>	7	</div>
8	<a href='#' id='chat-online-users-title' onclick='return false;'>	8	<a href='#' id='chat-online-users-title' onclick='return false;'>
9	- <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>	9	+ <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
10	</a>	10	</a>
11	</div>	11	</div>
	@@ -253,7 +253,7 @@ jQuery(function($) {		@@ -253,7 +253,7 @@ jQuery(function($) {
253	result.show = 'away';	253	result.show = 'away';
254	}	254	}
255	}	255	}
256	- if ($(stanza).find('x[xmlns='+ Strophe.NS.MUC_USER +']').length > 0) {	256	+ if ($(stanza).find('x[xmlns="'+ Strophe.NS.MUC_USER +'"]').length > 0) {
257	result.is_from_room = true;	257	result.is_from_room = true;
258	result.from_user = $(stanza).find('x item').attr('jid');	258	result.from_user = $(stanza).find('x item').attr('jid');
259	if ($(stanza).find('x item').attr('affiliation') == 'owner') {	259	if ($(stanza).find('x item').attr('affiliation') == 'owner') {
	@@ -351,7 +351,7 @@ jQuery(function($) {		@@ -351,7 +351,7 @@ jQuery(function($) {
351	},	351	},
352		352
353	on_muc_support: function(iq) {	353	on_muc_support: function(iq) {
354	- if ($(iq).find('identity[category=conference]').length > 0 && $(iq).find('feature[var='+ Strophe.NS.MUC +']').length > 0) {	354	+ if ($(iq).find('identity[category=conference]').length > 0 && $(iq).find('feature[var="'+ Strophe.NS.MUC +'"]').length > 0) {
355	var name = $(iq).find('identity[category=conference]').attr('name');	355	var name = $(iq).find('identity[category=conference]').attr('name');
356	log('muc support found with identity '+ name);	356	log('muc support found with identity '+ name);
357	Jabber.muc_supported = true;	357	Jabber.muc_supported = true;
	@@ -399,6 +399,19 @@ class UserTest < ActiveSupport::TestCase		@@ -399,6 +399,19 @@ class UserTest < ActiveSupport::TestCase
399	assert_equal 15, User.expires_chat_status_every	399	assert_equal 15, User.expires_chat_status_every
400	end	400	end
401		401
		402	+ should "return status of chat on environment in data_hash" do
		403	+ person = create_user('coldplay').person
		404	+ env = person.environment
		405	+ env.enable('xmpp_chat')
		406	+ env.save
		407	+ assert_equal true, person.user.data_hash['chat_enabled']
		408	+
		409	+ env.disable('xmpp_chat')
		410	+ env.save
		411	+ person.reload
		412	+ assert_equal false, person.user.data_hash['chat_enabled']
		413	+ end
		414	+
402	should 'respond name with related person name' do	415	should 'respond name with related person name' do
403	user = create_user('testuser')	416	user = create_user('testuser')
404	user.person.name = 'Test User'	417	user.person.name = 'Test User'