Merge branch 'andresmanelli-webhook-ids' into devel

Gogs integration part 1. Thanks to andresmanelli !

3 files changed, 14 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc86b997..5dc1a479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,15 @@ This release adds the following new features:
 * [Add display Wekan version number and runtime
    environment to Admin Panel](https://github.com/wekan/wekan/pull/1156);
 * [Change Email address](https://github.com/wekan/wekan/pull/1161);
-* [Ubuntu snap: Use version scriptlet](https://github.com/wekan/wekan/pull/1164).
+* [Ubuntu snap: Use version scriptlet](https://github.com/wekan/wekan/pull/1164);
+* [Gogs integration part 1](https://github.com/wekan/wekan/pull/1189).
 
 and fixes the following bugs:
 
 * [Fix Squeezed tickbox in Card](https://github.com/wekan/wekan/pull/1171).
 
-Thanks to GitHub users kubiko, nztqa and xet7 for their contributions.
+Thanks to GitHub users andresmanelli, kubiko, nztqa and xet7
+for their contributions.
 
 # v0.32 2017-07-30 Wekan release
 
diff --git a/models/activities.js b/models/activities.js
index b7fbc61b..208dd629 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -73,12 +73,14 @@ if (Meteor.isServer) {
       // No need send notification to user of activity
       // participants = _.union(participants, [activity.userId]);
       params.user = activity.user().getName();
+      params.userId = activity.userId;
     }
     if (activity.boardId) {
       board = activity.board();
       params.board = board.title;
       title = 'act-withBoardTitle';
       params.url = board.absoluteUrl();
+      params.boardId = activity.boardId;
     }
     if (activity.memberId) {
       participants = _.union(participants, [activity.memberId]);
@@ -88,11 +90,13 @@ if (Meteor.isServer) {
       const list = activity.list();
       watchers = _.union(watchers, list.watchers || []);
       params.list = list.title;
+      params.listId = activity.listId;
     }
     if (activity.oldListId) {
       const oldList = activity.oldList();
       watchers = _.union(watchers, oldList.watchers || []);
       params.oldList = oldList.title;
+      params.oldListId = activity.oldListId;
     }
     if (activity.cardId) {
       const card = activity.card();
@@ -101,6 +105,7 @@ if (Meteor.isServer) {
       params.card = card.title;
       title = 'act-withCardTitle';
       params.url = card.absoluteUrl();
+      params.cardId = activity.cardId;
     }
     if (activity.commentId) {
       const comment = activity.comment();
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index a5bbc737..88e50fa0 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -28,6 +28,11 @@ Meteor.methods({
       text: `${text}`,
     };
 
+    ['cardId', 'listId', 'oldListId', 'boardId'].forEach((key) => {
+      if (params[key]) value[key] = params[key];
+    });
+    value['description'] = description;
+
     const options = {
       headers: {
         // 'Content-Type': 'application/json',