Merge pull request #11410 from RocketChat/release-0.66.3

Release 0.66.3
RocketChat · Jul 10, 2018 · 9c82650 · 9c82650
2 parents 78fdef6 + e373b49
commit 9c82650
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 13 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.2
+ENV RC_VERSION 0.66.3
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history.json b/.github/history.json
@@ -16835,6 +16835,30 @@
           ]
         }
       ]
+    },
+    "0.66.3": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11398",
+          "title": "[FIX] All messages notifications via email were sent as mention alert",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.3",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11406",
+          "title": "[FIX] Livechat taking inquiry leading to 404 page",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.3",
+          "contributors": [
+            "renatobecker"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 79,  # Increment this for every release.
+		appVersion = 80,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.2"),
+		appMarketingVersion = (defaultText = "0.66.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

diff --git a/.travis/snap.sh b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.2
+    RC_VERSION=0.66.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,21 @@
 
+# 0.66.3
+`2018-07-09  ·  2 🐛  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
+
+### 🐛 Bug fixes
+
+- All messages notifications via email were sent as mention alert ([#11398](https://github.com/RocketChat/Rocket.Chat/pull/11398))
+- Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.66.2
 `2018-07-06  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.2",
+	"version": "0.66.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.2"
+	"version": "0.66.3"
 }
diff --git a/packages/rocketchat-lib/server/functions/notifications/email.js b/packages/rocketchat-lib/server/functions/notifications/email.js
@@ -84,7 +84,7 @@ function getMessageLink(room, sub) {
 	return `<p style="text-align:center;margin-bottom:8px;"><a style="${ style }" href="${ path }">${ message }</a>`;
 }
 
-export function sendEmail({ message, user, subscription, room, emailAddress, toAll }) {
+export function sendEmail({ message, user, subscription, room, emailAddress, hasMentionToUser }) {
 	let emailSubject;
 	const username = RocketChat.settings.get('UI_Use_Real_Name') ? message.u.name : message.u.username;
 
@@ -93,13 +93,13 @@ export function sendEmail({ message, user, subscription, room, emailAddress, toA
 			user: username,
 			room: RocketChat.roomTypes.getRoomName(room.t, room)
 		});
-	} else if (toAll) {
-		emailSubject = RocketChat.placeholders.replace(RocketChat.settings.get('Offline_Mention_All_Email'), {
+	} else if (hasMentionToUser) {
+		emailSubject = RocketChat.placeholders.replace(RocketChat.settings.get('Offline_Mention_Email'), {
 			user: username,
 			room: RocketChat.roomTypes.getRoomName(room.t, room)
 		});
 	} else {
-		emailSubject = RocketChat.placeholders.replace(RocketChat.settings.get('Offline_Mention_Email'), {
+		emailSubject = RocketChat.placeholders.replace(RocketChat.settings.get('Offline_Mention_All_Email'), {
 			user: username,
 			room: RocketChat.roomTypes.getRoomName(room.t, room)
 		});

diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -130,7 +130,7 @@ const sendNotification = ({
 	})) {
 		receiver.emails.some((email) => {
 			if (email.verified) {
-				sendEmail({ message, receiver, subscription, room, emailAddress: email.address });
+				sendEmail({ message, receiver, subscription, room, emailAddress: email.address, hasMentionToUser });
 
 				return true;
 			}

diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js
@@ -314,7 +314,7 @@ RocketChat.Livechat = {
 
 	forwardOpenChats(userId) {
 		RocketChat.models.Rooms.findOpenByAgent(userId).forEach((room) => {
-			const guest = RocketChat.models.Users.findOneById(room.v._id);
+			const guest = LivechatVisitors.findOneById(room.v._id);
 			this.transfer(room, guest, { departmentId: guest.department });
 		});
 	},

diff --git a/packages/rocketchat-livechat/server/methods/takeInquiry.js b/packages/rocketchat-livechat/server/methods/takeInquiry.js
@@ -61,6 +61,6 @@ Meteor.methods({
 		});
 
 		// return room corresponding to inquiry (for redirecting agent to the room route)
-		return room;
+		return inquiry;
 	}
 });