Merge pull request #2715 from whowillcare/master

fix some issues found

client/components/main/layouts.styl

@@ -381,6 +381,10 @@ a
   display: block
   word-wrap: break-word
 
+  table
+    word-wrap: normal
+    word-break: normal
+
   ol
     list-style-type: decimal
     padding-left: 20px

models/activities.js

@@ -180,7 +180,7 @@ if (Meteor.isServer) {
       const comment = activity.comment();
       params.comment = comment.text;
       if (board) {
-        const atUser = /(?:^|>|\b|\s)@(\S+)(?:\s|$|<|\b)/g;
+        const atUser = /(?:^|>|\b|\s)@(\S+?)(?:\s|$|<|\b)/g;
         const comment = params.comment;
         if (comment.match(atUser)) {
           const commenter = params.user;
@@ -192,7 +192,8 @@ if (Meteor.isServer) {
             }
             const atUser =
               Users.findOne(username) || Users.findOne({ username });
-            const uid = atUser && atUser._id;
+            if (atUser && atUser._id) {
+              const uid = atUser._id;
               params.atUsername = username;
               params.atEmails = atUser.emails;
               if (board.hasMember(uid)) {
@@ -202,6 +203,7 @@ if (Meteor.isServer) {
             }
           }
         }
+      }
       params.commentId = comment._id;
     }
     if (activity.attachmentId) {

server/notifications/outgoing.js

@@ -10,11 +10,39 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
 
 const Lock = {
   _lock: {},
-  has(id) {
+  _timer: {},
-    return !!this._lock[id];
+  echoDelay: 500, // echo should be happening much faster
+  normalDelay: 1e3, // normally user typed comment will be much slower
+  ECHO: 2,
+  NORMAL: 1,
+  NULL: 0,
+  has(id, value) {
+    const existing = this._lock[id];
+    let ret = this.NULL;
+    if (existing) {
+      ret = existing === value ? this.ECHO : this.NORMAL;
+    }
+    return ret;
   },
-  set(id) {
+  clear(id, delay) {
-    this._lock[id] = 1;
+    const previous = this._timer[id];
+    if (previous) {
+      Meteor.clearTimeout(previous);
+    }
+    this._timer[id] = Meteor.setTimeout(() => this.unset(id), delay);
+  },
+  set(id, value) {
+    const state = this.has(id, value);
+    let delay = this.normalDelay;
+    if (state === this.ECHO) {
+      delay = this.echoDelay;
+    }
+    if (!value) {
+      // user commented, we set a lock
+      value = 1;
+    }
+    this._lock[id] = value;
+    this.clear(id, delay); // always auto reset the locker after delay
   },
   unset(id) {
     delete this._lock[id];
@@ -33,10 +61,7 @@ const webhooksAtbts = (process.env.WEBHOOKS_ATTRIBUTES &&
   'commentId',
   'swimlaneId',
 ];
-const responseFunc = 'reactOnHookResponse';
+const responseFunc = data => {
-Meteor.methods({
-  [responseFunc](data) {
-    check(data, Object);
   const paramCommentId = data.commentId;
   const paramCardId = data.cardId;
   const paramBoardId = data.boardId;
@@ -48,25 +73,32 @@ Meteor.methods({
       cardId: paramCardId,
       boardId: paramBoardId,
     });
+    const board = Boards.findOne(paramBoardId);
+    const card = Cards.findOne(paramCardId);
+    if (board && card) {
       if (comment) {
-        CardComments.update(comment._id, {
+        Lock.set(comment._id, newComment);
+        CardComments.direct.update(comment._id, {
           $set: {
             text: newComment,
           },
         });
+      }
     } else {
       const userId = data.userId;
       if (userId) {
-          CardComments.insert({
+        const inserted = CardComments.direct.insert({
           text: newComment,
           userId,
           cardId,
           boardId,
         });
+        Lock.set(inserted._id, newComment);
       }
     }
   }
-  },
+};
+Meteor.methods({
   outgoingWebhooks(integration, description, params) {
     check(integration, Object);
     check(description, String);
@@ -119,9 +151,20 @@ Meteor.methods({
     if (token) headers['X-Wekan-Token'] = token;
     const options = {
       headers,
-      data: is2way ? clonedParams : value,
+      data: is2way ? { description, ...clonedParams } : value,
     };
     const url = integration.url;
+    if (is2way) {
+      const cid = params.commentId;
+      const comment = params.comment;
+      const lockState = cid && Lock.has(cid, comment);
+      if (cid && lockState !== Lock.NULL) {
+        // it's a comment  and there is a previous lock
+        return;
+      } else if (cid) {
+        Lock.set(cid, comment); // set a lock here
+      }
+    }
     const response = postCatchError(url, options);
 
     if (
@@ -131,21 +174,12 @@ Meteor.methods({
       response.statusCode < 300
     ) {
       if (is2way) {
-        const cid = params.commentId;
-        const tooSoon = Lock.has(cid); // if an activity happens to fast, notification shouldn't fire with the same id
-        if (!tooSoon) {
-          let clearNotification = () => {};
-          if (cid) {
-            Lock.set(cid);
-            const clearNotificationFlagTimeout = 1000;
-            clearNotification = () => Lock.unset(cid);
-            Meteor.setTimeout(clearNotification, clearNotificationFlagTimeout);
-          }
         const data = response.data; // only an JSON encoded response will be actioned
         if (data) {
-            Meteor.call(responseFunc, data, () => {
+          try {
-              clearNotification();
+            responseFunc(data);
-            });
+          } catch (e) {
+            throw new Meteor.Error('error-process-data');
           }
         }
       }