Merge pull request #679 from assistify/release/3.7.1

Release 3.7.1 - which brings some fixes not in the current (actually ahead) master

.docker/Dockerfile.rhel

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

.github/history.json

@@ -50221,6 +50221,74 @@
         "4.0"
       ],
       "pull_requests": []
+    },
+    "3.7.1": {
+      "node_version": "12.18.4",
+      "npm_version": "6.14.8",
+      "apps_engine_version": "1.18.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "19179",
+          "title": "[FIX] Adding missing custom fields translation in my account's profile",
+          "userLogin": "dougfabris",
+          "milestone": "3.7.1",
+          "contributors": [
+            "dougfabris"
+          ]
+        },
+        {
+          "pr": "19181",
+          "title": "[FIX] Performance issues when using new Oplog implementation",
+          "userLogin": "rodrigok",
+          "description": "A missing configuration was not limiting the new oplog tailing to pool the database frequently even when no data was available, leading to both node and mongodb process been consuming high CPU even with low usage. This case was happening for installations using `mmapv1` database engine or when no admin access was granted to the database user, both preventing the usage of the new [Change Streams](https://docs.mongodb.com/manual/changeStreams/) implementation and fallbacking to our custom oplog implementation in replacement to the Meteor's one what was able to be disabled and use the native implementation via the environmental variable `USE_NATIVE_OPLOG=true`.",
+          "milestone": "3.7.1",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "19101",
+          "title": "[FIX] Admin Sidebar overflowing",
+          "userLogin": "gabriellsh",
+          "milestone": "3.7.1",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "19133",
+          "title": "[FIX] VisitorAutoComplete component",
+          "userLogin": "renatobecker",
+          "milestone": "3.7.1",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "19134",
+          "title": "[FIX] Omnichannel: triggers page not rendering.",
+          "userLogin": "gabriellsh",
+          "milestone": "3.7.1",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "19166",
+          "title": "[FIX] Missing \"Bio\" in user's profile view (#18821)",
+          "userLogin": "dougfabris",
+          "milestone": "3.7.1",
+          "contributors": [
+            "dougfabris"
+          ]
+        }
+      ]
     }
   }
-}
+}

.snapcraft/resources/prepareRocketChat

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.8.0-develop/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.7.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.8.0-develop
+version: 3.7.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,38 @@
 
+# 3.7.1
+`2020-10-09  ·  6 🐛  ·  5 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.18.4`
+- NPM: `6.14.8`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.18.0`
+
+### 🐛 Bug fixes
+
+
+- Adding missing custom fields translation in my account's profile ([#19179](https://github.com/RocketChat/Rocket.Chat/pull/19179))
+
+- Admin Sidebar overflowing ([#19101](https://github.com/RocketChat/Rocket.Chat/pull/19101))
+
+- Missing "Bio" in user's profile view (#18821) ([#19166](https://github.com/RocketChat/Rocket.Chat/pull/19166))
+
+- Omnichannel: triggers page not rendering. ([#19134](https://github.com/RocketChat/Rocket.Chat/pull/19134))
+
+- Performance issues when using new Oplog implementation ([#19181](https://github.com/RocketChat/Rocket.Chat/pull/19181))
+
+  A missing configuration was not limiting the new oplog tailing to pool the database frequently even when no data was available, leading to both node and mongodb process been consuming high CPU even with low usage. This case was happening for installations using `mmapv1` database engine or when no admin access was granted to the database user, both preventing the usage of the new [Change Streams](https://docs.mongodb.com/manual/changeStreams/) implementation and fallbacking to our custom oplog implementation in replacement to the Meteor's one what was able to be disabled and use the native implementation via the environmental variable `USE_NATIVE_OPLOG=true`.
+
+- VisitorAutoComplete component ([#19133](https://github.com/RocketChat/Rocket.Chat/pull/19133))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@dougfabris](https://github.com/dougfabris)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.7.0
 `2020-09-28  ·  10 🎉  ·  3 🚀  ·  39 🐛  ·  26 🔍  ·  22 👩‍💻👨‍💻`
 
@@ -373,10 +407,8 @@
 
 - **2FA:** Password enforcement setting and 2FA protection when saving settings or resetting E2E encryption ([#18640](https://github.com/RocketChat/Rocket.Chat/pull/18640))
 
-  - Increase the 2FA remembering time from 5min to 30min
-
-  - Add new setting to enforce 2FA password fallback (enabled only for new installations)
-
+  - Increase the 2FA remembering time from 5min to 30min  
+  - Add new setting to enforce 2FA password fallback (enabled only for new installations)  
   - Require 2FA to save settings and reset E2E Encryption keys
 
 - **Omnichannel:** Allow set other agent status via method `livechat:changeLivechatStatus ` ([#18571](https://github.com/RocketChat/Rocket.Chat/pull/18571))
@@ -394,7 +426,7 @@
 
 - 2FA by Email setting showing for the user even when disabled by the admin ([#18473](https://github.com/RocketChat/Rocket.Chat/pull/18473))
 
-  The option to disable/enable the **Two-factor authentication via Email** at `Account > Security > Two Factor Authentication
+  The option to disable/enable the **Two-factor authentication via Email** at `Account > Security > Two Factor Authentication
   ` was visible even when the setting **Enable Two Factor Authentication via Email** at `Admin > Accounts > Two Factor Authentication` was disabled leading to misbehavior since the functionality was disabled.
 
 - Agents enabledDepartment attribute not set on collection ([#18614](https://github.com/RocketChat/Rocket.Chat/pull/18614) by [@paulobernardoaf](https://github.com/paulobernardoaf))
@@ -744,16 +776,13 @@
 
 - Mention autocomplete UI and performance improvements  ([#18309](https://github.com/RocketChat/Rocket.Chat/pull/18309))
 
-  * New setting to configure the number of suggestions `Admin > Layout > User Interface > Number of users' autocomplete suggestions` (default 5)
-
-  * The UI shows whenever the user is not a member of the room
-
-  * The UI shows when the suggestion came from the last messages for quick selection/reply
-
-  * The suggestions follow this order:
-    * The user with the exact username and member of the room
-    * The user with the exact username but not a member of the room (if allowed to list non-members)
-    * The users containing the text in username, name or nickname and member of the room
+  * New setting to configure the number of suggestions `Admin > Layout > User Interface > Number of users' autocomplete suggestions` (default 5)  
+  * The UI shows whenever the user is not a member of the room  
+  * The UI shows when the suggestion came from the last messages for quick selection/reply  
+  * The suggestions follow this order:
+    * The user with the exact username and member of the room
+    * The user with the exact username but not a member of the room (if allowed to list non-members)
+    * The users containing the text in username, name or nickname and member of the room
     * The users containing the text in username, name or nickname and not a member of the room (if allowed to list non-members)
 
 - Message action styles ([#18190](https://github.com/RocketChat/Rocket.Chat/pull/18190))
@@ -1095,10 +1124,10 @@
 
 - Split NOTIFICATIONS_SCHEDULE_DELAY into three separate variables ([#17669](https://github.com/RocketChat/Rocket.Chat/pull/17669) by [@jazztickets](https://github.com/jazztickets))
 
-  Email notification delay can now be customized with the following environment variables:
-  NOTIFICATIONS_SCHEDULE_DELAY_ONLINE
-  NOTIFICATIONS_SCHEDULE_DELAY_AWAY
-  NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE
+  Email notification delay can now be customized with the following environment variables:
+  NOTIFICATIONS_SCHEDULE_DELAY_ONLINE
+  NOTIFICATIONS_SCHEDULE_DELAY_AWAY
+  NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE
   Setting the value to -1 disable notifications for that type.
 
 - Threads ([#17416](https://github.com/RocketChat/Rocket.Chat/pull/17416))
@@ -1498,11 +1527,11 @@
 
 - **ENTERPRISE:** Omnichannel Last-Chatted Agent Preferred option ([#17666](https://github.com/RocketChat/Rocket.Chat/pull/17666))
 
-  If activated, this feature will store the last agent that assisted each Omnichannel visitor when a conversation is taken. So, when a visitor returns(it works with any entry point, Livechat, Facebook, REST API, and so on) and starts a new chat, the routing system checks:
-
-  1   - The visitor object for any stored agent that the visitor has previously talked to;
-  2   - If a previous agent is not found, the system will try to find a previous conversation of the same visitor. If a room is found, the system will get the previous agent from the room;
-
+  If activated, this feature will store the last agent that assisted each Omnichannel visitor when a conversation is taken. So, when a visitor returns(it works with any entry point, Livechat, Facebook, REST API, and so on) and starts a new chat, the routing system checks:
+
+  1   - The visitor object for any stored agent that the visitor has previously talked to;
+  2   - If a previous agent is not found, the system will try to find a previous conversation of the same visitor. If a room is found, the system will get the previous agent from the room;
+
   After this process, if an agent has been found, the system will check the agent's availability to assist the new chat. If it's not available, then the routing system will get the next available agent in the queue.
 
 - **ENTERPRISE:** Support for custom Livechat registration form fields ([#17581](https://github.com/RocketChat/Rocket.Chat/pull/17581))
@@ -1607,12 +1636,9 @@
 
 - Notification sounds ([#17616](https://github.com/RocketChat/Rocket.Chat/pull/17616))
 
-  * Global CDN config was ignored when loading the sound files
-
-  * Upload of custom sounds wasn't getting the file extension correctly
-
-  * Some translations were missing
-
+  * Global CDN config was ignored when loading the sound files  
+  * Upload of custom sounds wasn't getting the file extension correctly  
+  * Some translations were missing  
   * Edit and delete of custom sounds were not working correctly
 
 - Omnichannel departments are not saved when the offline channel name is not defined ([#17553](https://github.com/RocketChat/Rocket.Chat/pull/17553))
@@ -1900,19 +1926,14 @@
 
 - Better Push and Email Notification logic ([#17357](https://github.com/RocketChat/Rocket.Chat/pull/17357))
 
-  We are still using the same logic to define which notifications every new message will generate, it takes some servers' settings, users's preferences and subscriptions' settings in consideration to determine who will receive each notification type (desktop, audio, email and mobile push), but now it doesn't check the user's status (online, away, offline) for email and mobile push notifications but send those notifications to a new queue with the following rules:
-
-
-  - When the user is online the notification is scheduled to be sent in 120 seconds
-
-  - When the user is away the notification is scheduled to be sent in 120 seconds minus the amount of time he is away
-
-  - When the user is offline the notification is scheduled to be sent right away
-
-  - When the user reads a channel all the notifications for that user are removed (clear queue)
-
-  - When a notification is processed to be sent to a user and there are other scheduled notifications:
-    - All the scheduled notifications for that user are rescheduled to now
+  We are still using the same logic to define which notifications every new message will generate, it takes some servers' settings, users's preferences and subscriptions' settings in consideration to determine who will receive each notification type (desktop, audio, email and mobile push), but now it doesn't check the user's status (online, away, offline) for email and mobile push notifications but send those notifications to a new queue with the following rules:
+
+  - When the user is online the notification is scheduled to be sent in 120 seconds  
+  - When the user is away the notification is scheduled to be sent in 120 seconds minus the amount of time he is away  
+  - When the user is offline the notification is scheduled to be sent right away  
+  - When the user reads a channel all the notifications for that user are removed (clear queue)  
+  - When a notification is processed to be sent to a user and there are other scheduled notifications:
+    - All the scheduled notifications for that user are rescheduled to now
     - The current notification goes back to the queue to be processed ordered by creation date
 
 - Buttons to check/uncheck all users and channels on import ([#17207](https://github.com/RocketChat/Rocket.Chat/pull/17207))
@@ -2275,7 +2296,7 @@
 
 - Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
 
-  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
+  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
   In addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.
 
 - Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
@@ -13775,4 +13796,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@sampaiodiego](https://github.com/sampaiodiego)

app/models/server/models/Users.js

@@ -722,20 +722,6 @@ export class Users extends Base {
 		return this.find(query, options);
 	}
 
-	findActiveNotLoggedInAfterWithRole(latestLastLoginDate, role = 'user', options) {
-		const neverActive = { $and: [{ lastLogin: { $exists: 0 } }, { createdAt: { $lte: latestLastLoginDate } }] };
-		const idleTooLong = { lastLogin: { $lte: latestLastLoginDate } };
-		const hasRole = { roles: role };
-		const query = {
-			$and: [
-				{ $or: [neverActive, idleTooLong] },
-				hasRole,
-				{ active: true },
-			],
-		};
-		return this.find(query, options);
-	}
-
 	findByActiveUsersExcept(searchTerm, exceptions, options, forcedSearchFields, extraQuery = [], { startsWith = false, endsWith = false } = {}) {
 		if (exceptions == null) { exceptions = []; }
 		if (options == null) { options = {}; }

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "3.8.0-develop"
+	"version": "3.7.1"
 }

package.json

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