Merge pull request #14850 from RocketChat/release-1.1.3

Release 1.1.3

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 1.1.2
+ENV RC_VERSION 1.1.3
 
 MAINTAINER buildmaster@rocket.chat
 

.github/history.json

@@ -31883,6 +31883,36 @@
           ]
         }
       ]
+    },
+    "1.1.3": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "14839",
+          "title": "Regression: thread loading parent msg if is not loaded",
+          "userLogin": "ggazzo",
+          "milestone": "1.1.3",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "14837",
+          "title": "[FIX] Gap of messages when loading history when using threads",
+          "userLogin": "ggazzo",
+          "milestone": "1.1.3",
+          "contributors": [
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=1.1.2
+    RC_VERSION=1.1.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,4 +1,27 @@
 
+# 1.1.3
+`2019-06-21  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- Gap of messages when loading history when using threads ([#14837](https://github.com/RocketChat/Rocket.Chat/pull/14837))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: thread loading parent msg if is not loaded ([#14839](https://github.com/RocketChat/Rocket.Chat/pull/14839))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.1.2
 `2019-06-17  ·  3 🐛  ·  4 👩‍💻👨‍💻`
 

app/ui-message/client/message.js

@@ -429,33 +429,34 @@ Template.message.helpers({
 
 const findParentMessage = (() => {
 	const waiting = [];
-
+	const uid = Tracker.nonreactive(() => Meteor.userId());
 	const getMessages = _.debounce(async function() {
-		const uid = Tracker.nonreactive(() => Meteor.userId());
 		const _tmp = [...waiting];
 		waiting.length = 0;
-		(await call('getMessages', _tmp)).map((msg) => upsertMessage({ msg, uid }));
+		(await call('getMessages', _tmp)).map((msg) => Messages.findOne({ _id: msg._id }) || upsertMessage({ msg: { ...msg, _hidden: true }, uid }));
 	}, 500);
 
+
 	return (tmid) => {
 		if (waiting.indexOf(tmid) > -1) {
 			return;
 		}
-
 		const message = Messages.findOne({ _id: tmid });
-		if (message) {
-			const uid = Tracker.nonreactive(() => Meteor.userId());
-			return Messages.update({ tmid, repliesCount: { $exists: 0 } }, {
+		if (!message) {
+			waiting.push(tmid);
+			return getMessages();
+		}
+		return Messages.update(
+			{ tmid, repliesCount: { $exists: 0 } },
+			{
 				$set: {
 					following: message.replies && message.replies.indexOf(uid) > -1,
 					threadMsg: normalizeThreadMessage(message),
 					repliesCount: message.tcount,
 				},
-			}, { multi: true });
-		}
-
-		waiting.push(tmid);
-		getMessages();
+			},
+			{ multi: true }
+		);
 	};
 })();
 

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "1.1.2"
+	"version": "1.1.3"
 }

package.json

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