API: Improve query of getIntegrations

9 years ago · b3d43fa12e
parent ffd787fceb
commit b3d43fa12e
1 changed files with 4 additions and 16 deletions
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@ -181,25 +181,13 @@ RocketChat.API.v1.addRoute('channels.getIntegrations', { authRequired: true }, {
 		}

 		let ourQuery = {
-			$or: [{
-				channel: {
-					$in: [`#${findResult.name}`]
-				}
-			}]
+			channel: `#${findResult.name}`
 		};

 		if (includeAllPublicChannels) {
-			ourQuery.$or.push({
-				channel: {
-					$eq: []
-				}
-			});
-
-			ourQuery.$or.push({
-				channel: {
-					$in: ['all_public_channels']
-				}
-			});
+			ourQuery.channel = {
+				$in: [ourQuery.channel, 'all_public_channels']
+			};
 		}

 		const { offset, count } = this.getPaginationItems();