Fix Model.getFilterFromChannel when custom filters are present

telepat-io · Apr 27, 2016 · a841474 · a841474
1 parent 4fc74d4
commit a841474
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Model.js b/lib/Model.js
@@ -248,17 +248,18 @@ Model.getFilterFromChannel = function(channel) {
 	}
 
 	if (channel.filter) {
-		searchFilters.and();
 		(function AddFilters(filterObject) {
 			var filterKey = Object.keys(filterObject);
-			searchFilters[filterKey]();
+			if (filterKey == 'or')
+				searchFilters.or();
 
 			filterObject[filterKey].forEach(function(filters, key) {
 				if (key == 'and' || key == 'or')
 					AddFilters(filterObject[filterKey]);
 				else {
+					console.log(filters);
 					for(var key2 in filters) {
-						searchFilters.addFilter(key2, filterObject[filterKey][filters[key2]]);
+						searchFilters.addFilter(key2, filters[key2]);
 					}
 				}
 			});