Fix the roster filters

4 files changed, 9 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 09f854d..ed8d6e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 .settings/
 .project
 .pydevproject
+alias_server/.ropeproject
+crypto/.ropeproject
 
 #config files
 config.ini
diff --git a/alias-angular/app/js/controllers.js b/alias-angular/app/js/controllers.js
index 144592a..1eb53e7 100644
--- a/alias-angular/app/js/controllers.js
+++ b/alias-angular/app/js/controllers.js
@@ -35,7 +35,7 @@ function ConnectCtl($scope, StropheSrv, $log, $rootScope) {
 }
 
 ConnectCtl.$inject = ['$scope', 'StropheSrv', '$log', '$rootScope'];
-        
+
 function RosterCtl($scope, StropheSrv, $log) {
     $scope.contacts = {};
     $scope.get_contacts = function() {
@@ -46,7 +46,7 @@ function RosterCtl($scope, StropheSrv, $log) {
         var query  = elems[0];
         Strophe.forEachChild(query, 'item', function(item){
             var jid = item.getAttribute('jid');
-            var name = item.getAttribute('name');
+            var name = item.getAttribute('name')||'';
             //contacts are offline by default
             $scope.contacts[jid] = {jid: jid, name: name, status: 'offline'};
         });
@@ -89,4 +89,3 @@ function RosterCtl($scope, StropheSrv, $log) {
  }
 
 RosterCtl.$inject = ['$scope','StropheSrv','$log'];
-
diff --git a/alias-angular/app/js/filters.js b/alias-angular/app/js/filters.js
index 3321999..6b77998 100644
--- a/alias-angular/app/js/filters.js
+++ b/alias-angular/app/js/filters.js
@@ -8,16 +8,10 @@ angular.module('Alias.filters', []).
                 return contacts;
             } else {
                 return _.filter(contacts, function(contact) {
-                    if ( contact.jid.indexOf(query) > -1) {
-                            return true;
-                    } else {
-                        if (_.has(contact, 'name') && 
-                            contact.name.indexOf(query) >-1) {
-                            return true;
-                        } else {
-                            return false;
-                        }
-                    }
+                    return (contact.hasOwnProperty('name') &&
+                            contact.name.indexOf(query) > -1) ||
+                        (contact.jid.indexOf(query) > -1 ||
+                         contact.jid.indexOf(query) > -1);
                 });
             }
         };
diff --git a/alias_server/scripts/alias-server b/alias_server/scripts/alias-server
index 34d3bf1..bad8d68 100644
--- a/alias_server/scripts/alias-server
+++ b/alias_server/scripts/alias-server
@@ -93,5 +93,6 @@ if __name__ == '__main__':
         if component.connect():  
             logging.info('Component {} connected'.format(component.boundjid))
             component.process(block=True)
+            component.use_signals()
         else:
             logging.error("Component {} couldn't connect".format(component.boundjid))