From c6776486f1dc6d8884de5111798c2a748ab5765e Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Wed, 22 Nov 2017 17:33:58 -0200
Subject: [PATCH 1/2] FIX allow reaction on read only rooms

---
 .../client/views/channelSettings.js           |  4 ++--
 .../.npm/package/npm-shrinkwrap.json          | 24 +++++++++----------
 server/publications/room.js                   |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
index bbcdd918f23..dab0a1134ab 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.js
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -361,12 +361,12 @@ Template.channelSettings.onCreated(function() {
 			},
 			save(value, room) {
 				this.processing.set(true);
-				return Meteor.call('saveRoomSettings', room._id, 'reactWhenReadOnly', value, (err) => {
+				Meteor.call('saveRoomSettings', room._id, 'reactWhenReadOnly', value, (err) => {
 					if (err) {
 						return handleError(err);
 					}
 					this.processing.set(false);
-					return toastr.success(TAPi18n.__('React_when_read_only_changed_successfully'));
+					toastr.success(TAPi18n.__('React_when_read_only_changed_successfully'));
 				});
 			}
 		},
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index 2b45ef4db29..cc5ba3b8fdb 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "ajv": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto="
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz",
+      "integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ="
     },
     "ansi-regex": {
       "version": "2.1.1",
@@ -353,9 +353,9 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "grpc": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.1.tgz",
-      "integrity": "sha512-lMgjZUzJx09VL5iCfs7rFagE5htikdv/9VzX/ji3zuwlzAhijqcU47bi5N5lbVw/UB2fxneeYg8sBTfQfd0c4A==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.2.tgz",
+      "integrity": "sha512-GH6xziNGjW8LAtqQ3HmYI7Tx8BIlr46iaMRXHfh46kkaOP6PNWUx47ULNTUlXSYR3P00d0Pl8uzodTLwPk805w==",
       "dependencies": {
         "abbrev": {
           "version": "1.0.9",
@@ -1124,9 +1124,9 @@
       "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
     },
     "nan": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
     },
     "node-forge": {
       "version": "0.7.1",
@@ -1209,9 +1209,9 @@
       "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE="
     },
     "pump": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
+      "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw=="
     },
     "pumpify": {
       "version": "1.3.5",
diff --git a/server/publications/room.js b/server/publications/room.js
index 1ba67abf419..d3382bd5368 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -28,6 +28,7 @@ const fields = {
 	v: 1,
 	label: 1,
 	ro: 1,
+	reactWhenReadOnly: 1,
 	sentiment: 1
 };
 

From e0e879a38349657ce7b1a51cdd325bead932ce98 Mon Sep 17 00:00:00 2001
From: Bradley Hilton <graywolf336@craftyn.com>
Date: Mon, 11 Dec 2017 10:30:05 -0600
Subject: [PATCH 2/2] Turn off prettyJson if the node environment isn't
 development

---
 packages/rocketchat-api/server/api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
index 4fa3055f2d1..834f66db833 100644
--- a/packages/rocketchat-api/server/api.js
+++ b/packages/rocketchat-api/server/api.js
@@ -359,7 +359,7 @@ const createApi = function(enableCors) {
 		RocketChat.API.v1 = new API({
 			version: 'v1',
 			useDefaultAuth: true,
-			prettyJson: true,
+			prettyJson: process.env.NODE_ENV === 'development',
 			enableCors,
 			auth: getUserAuth()
 		});
@@ -368,7 +368,7 @@ const createApi = function(enableCors) {
 	if (!RocketChat.API.default || RocketChat.API.default._config.enableCors !== enableCors) {
 		RocketChat.API.default = new API({
 			useDefaultAuth: true,
-			prettyJson: true,
+			prettyJson: process.env.NODE_ENV === 'development',
 			enableCors,
 			auth: getUserAuth()
 		});