From 35aaf641db6680b8d159dec64539dbb2be537cd2 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 26 Dec 2017 15:31:23 -0200 Subject: [PATCH] Merge pull request #9240 from RocketChat/hotfix/9037 Fix: Unneeded warning in payload of REST API calls --- packages/rocketchat-api/server/api.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js index 3f81a157f317d..df2e1a9dd72a0 100644 --- a/packages/rocketchat-api/server/api.js +++ b/packages/rocketchat-api/server/api.js @@ -58,8 +58,6 @@ class API extends Restivus { success(result = {}) { if (_.isObject(result)) { result.success = true; - // TODO: Remove this after three versions have been released. That means at 0.64 this should be gone. ;) - result.developerWarning = '[WARNING]: The "usernames" field has been removed for performance reasons. Please use the "*.members" endpoint to get a list of members/users in a room.'; } return { @@ -141,7 +139,20 @@ class API extends Restivus { return RocketChat.API.v1.failure(e.message, e.error); } - return result ? result : RocketChat.API.v1.success(); + result = result ? result : RocketChat.API.v1.success(); + + if ( + /(channels|groups)\./.test(route) + && result + && result.body + && result.body.success === true + && (result.body.channel || result.body.channels || result.body.group || result.body.groups) + ) { + // TODO: Remove this after three versions have been released. That means at 0.64 this should be gone. ;) + result.body.developerWarning = '[WARNING]: The "usernames" field has been removed for performance reasons. Please use the "*.members" endpoint to get a list of members/users in a room.'; + } + + return result; }; for (const [name, helperMethod] of this.helperMethods) {