fix default settings and tcwebserview userId

Author: gondzo

connect/connectNotificationServer.js

@@ -178,7 +178,7 @@ const handler = (topic, message, callback) => {
 
   // filter out `notifications.connect.project.topic.created` events send by bot
   // because they create too much clutter and duplicate info
-  if (topic === 'notifications.connect.project.topic.created' && message.userId === config.TCWEBSERVICE_ID) {
+  if (topic === 'notifications.connect.project.topic.created' && message.userId.toString() === config.TCWEBSERVICE_ID) {
     return callback(null, []);
   }
 

src/services/NotificationService.js

@@ -87,13 +87,16 @@ function* updateSettings(data, userId) {
  */
 function* listNotifications(query, userId) {
   const settings = yield getSettings(userId);
-  // only filter out notifications types which were explicitly set to 'no' - so we return notification by default
-  const notificationTypes = _.keys(settings).filter((notificationType) => settings[notificationType].web !== 'no');
+  
 
   const filter = { where: {
     userId,
-    type: { $in: notificationTypes },
   }, offset: query.offset, limit: query.limit, order: [['createdAt', 'DESC']] };
+  if (_.keys(settings).length>0){
+    // only filter out notifications types which were explicitly set to 'no' - so we return notification by default
+    const notificationTypes = _.keys(settings).filter((notificationType) => settings[notificationType].web !== 'no');
+    filter.where.type = { $in: notificationTypes };
+  }
   if (query.type) {
     filter.where.type = query.type;
   }