Release 3.4.1

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.4.0
+ENV RC_VERSION 3.4.1
 
 MAINTAINER [email protected]
 

.github/history.json

@@ -46799,6 +46799,84 @@
           ]
         }
       ]
+    },
+    "3.4.1": {
+      "node_version": "12.16.1",
+      "npm_version": "6.14.0",
+      "apps_engine_version": "1.15.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "18088",
+          "title": "[FIX] Email notifications were still being sent for online users",
+          "userLogin": "densik",
+          "milestone": "3.4.1",
+          "contributors": [
+            "densik",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "18090",
+          "title": "[FIX] The livechat agent activity monitor wasn't being initialised because due to an internal error",
+          "userLogin": "paulobernardoaf",
+          "milestone": "3.4.1",
+          "contributors": [
+            "paulobernardoaf"
+          ]
+        },
+        {
+          "pr": "18101",
+          "title": "[FIX] Not possible to read encrypted messages after disable E2E on channel level",
+          "userLogin": "rodrigok",
+          "milestone": "3.4.1",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "18102",
+          "title": "[FIX] Omnichannel close room callback returning promise",
+          "userLogin": "renatobecker",
+          "milestone": "3.4.1",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "18109",
+          "title": "[FIX] Avatar ETag missing from User",
+          "userLogin": "gabriellsh",
+          "milestone": "3.4.1",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "18110",
+          "title": "[FIX] \"Add reaction\" icon missing when the viewport size is smaller than 500px",
+          "userLogin": "mariaeduardacunha",
+          "milestone": "3.4.1",
+          "contributors": [
+            "mariaeduardacunha",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "18111",
+          "title": "[FIX] Jitsi opening twice",
+          "userLogin": "ggazzo",
+          "milestone": "3.4.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }

.snapcraft/resources/prepareRocketChat

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.4.0/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.4.1/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

.snapcraft/snap/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.4.0
+version: 3.4.1
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

HISTORY.md

@@ -1,4 +1,43 @@
 
+# 3.4.1
+`2020-07-02  ·  7 🐛  ·  7 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.16.1`
+- NPM: `6.14.0`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.15.0`
+
+### 🐛 Bug fixes
+
+
+- Email notifications were still being sent for online users ([#18088](https://github.com/RocketChat/Rocket.Chat/pull/18088) by [@densik](https://github.com/densik))
+
+- The livechat agent activity monitor wasn't being initialised because due to an internal error ([#18090](https://github.com/RocketChat/Rocket.Chat/pull/18090) by [@paulobernardoaf](https://github.com/paulobernardoaf))
+
+- Not possible to read encrypted messages after disable E2E on channel level ([#18101](https://github.com/RocketChat/Rocket.Chat/pull/18101))
+
+- Omnichannel close room callback returning promise ([#18102](https://github.com/RocketChat/Rocket.Chat/pull/18102))
+
+- Avatar ETag missing from User ([#18109](https://github.com/RocketChat/Rocket.Chat/pull/18109))
+
+- "Add reaction" icon missing when the viewport size is smaller than 500px ([#18110](https://github.com/RocketChat/Rocket.Chat/pull/18110))
+
+- Jitsi opening twice ([#18111](https://github.com/RocketChat/Rocket.Chat/pull/18111))
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@densik](https://github.com/densik)
+- [@paulobernardoaf](https://github.com/paulobernardoaf)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@mariaeduardacunha](https://github.com/mariaeduardacunha)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 3.4.0
 `2020-06-30  ·  18 🎉  ·  19 🚀  ·  42 🐛  ·  52 🔍  ·  52 👩‍💻👨‍💻`
 

app/e2e/client/rocketchat.e2e.js

@@ -72,7 +72,7 @@ class E2E {
 			return;
 		}
 
-		if (room.encrypted !== true) {
+		if (room.encrypted !== true && room.e2eKeyId == null) {
 			return;
 		}
 
@@ -511,6 +511,14 @@ Meteor.startup(function() {
 			return Promise.resolve(message);
 		}
 
+		const room = Rooms.findOne({
+			_id: message.rid,
+		});
+
+		if (!room || room.encrypted !== true) {
+			return Promise.resolve(message);
+		}
+
 		const e2eRoom = await e2e.getInstanceByRoomId(message.rid);
 		if (!e2eRoom) {
 			return Promise.resolve(message);

app/lib/server/lib/sendNotificationsOnMessage.js

@@ -147,6 +147,7 @@ export const sendNotification = async ({
 
 	if (receiver.emails && shouldNotifyEmail({
 		disableAllMessageNotifications,
+		statusConnection: receiver.statusConnection,
 		emailNotifications,
 		isHighlighted,
 		hasMentionToUser,

app/livechat/server/lib/Livechat.js

@@ -378,7 +378,7 @@ export const Livechat = {
 			 */
 			Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.ILivechatRoomClosedHandler, room);
 			Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatRoomClosed, room);
-			callbacks.run('livechat.closeRoom', room);
+			callbacks.runAsync('livechat.closeRoom', room);
 		});
 
 		return true;

app/livechat/server/statistics/LivechatAgentActivityMonitor.js

@@ -44,7 +44,7 @@ export class LivechatAgentActivityMonitor {
 		Meteor.onConnection(this._handleMeteorConnection);
 		callbacks.add('livechat.agentStatusChanged', this._handleAgentStatusChanged);
 		callbacks.add('livechat.setUserStatusLivechat', this._handleUserStatusLivechatChanged);
-		this.started = true;
+		this._started = true;
 	}
 
 	_startMonitoring() {

app/theme/client/imports/components/messages.css

@@ -53,6 +53,15 @@
 }
 
 .message {
+	&:hover,
+	&.active {
+		background-color: #f7f8fa;
+
+		& .message-actions {
+			display: flex;
+		}
+	}
+
 	& .toggle-hidden {
 		display: none;
 	}
@@ -202,19 +211,6 @@
 	left: 2px;
 }
 
-@media (width >= 500px) {
-	.message {
-		&:hover,
-		&.active {
-			background-color: #f7f8fa;
-
-			& .message-actions {
-				display: flex;
-			}
-		}
-	}
-}
-
 .compact {
 	& .message {
 		min-height: 26px;

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "3.4.0"
+	"version": "3.4.1"
 }

app/utils/server/functions/getDefaultUserFields.js

@@ -30,4 +30,5 @@ export const getDefaultUserFields = () => ({
 	banners: 1,
 	'oauth.authorizedClients': 1,
 	_updatedAt: 1,
+	avatarETag: 1,
 });

app/videobridge/client/views/videoFlexTab.js

@@ -76,6 +76,7 @@ Template.videoFlexTab.onRendered(function() {
 			if (!jitsiTimeout) {
 				return;
 			}
+			clearInterval(this.intervalHandler);
 			this.intervalHandler = setInterval(update, CONSTANTS.HEARTBEAT);
 			TabBar.updateButton('video', { class: 'red' });
 			return jitsiTimeout;
@@ -127,7 +128,7 @@ Template.videoFlexTab.onRendered(function() {
 			jitsiRoomActive = jitsiRoom;
 
 			if (settings.get('Jitsi_Open_New_Window')) {
-				Tracker.nonreactive(async () => {
+				return Tracker.nonreactive(async () => {
 					await start();
 
 					const queryString = accessToken && `?jwt=${ accessToken }`;
@@ -161,7 +162,7 @@ Template.videoFlexTab.onRendered(function() {
 						* postMessage converts to events in the jitsi meet iframe.
 						* For some reason those aren't working right.
 						*/
-						Meteor.setTimeout(() => this.api.executeCommand('displayName', [name]), 5000);
+						setTimeout(() => this.api.executeCommand('displayName', [name]), 5000);
 					});
 				}
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.4.0",
+	"version": "3.4.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"