Merge remote-tracking branch 'origin/develop' into chore/convert-ts-a…

…nd-create-endpoints
RocketChat · Jun 7, 2022 · 3482cbe · 3482cbe
2 parents e2207ec + 440dfaa
commit 3482cbe
Show file tree

Hide file tree

Showing 239 changed files with 4,745 additions and 3,060 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,5 @@ yarn-error.log*
 !.yarn/sdks
 !.yarn/versions
 
-.nvmrc
+.nvmrc
+.idea/
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -11,3 +11,4 @@ plugins:
     spec: '@yarnpkg/plugin-typescript'
 
 yarnPath: .yarn/releases/yarn-3.2.0.cjs
+checksumBehavior: 'ignore'
diff --git a/apps/meteor/app/api/server/v1/im.ts b/apps/meteor/app/api/server/v1/im.ts
@@ -358,7 +358,7 @@ API.v1.addRoute(
 				sort: sortObj,
 				skip: offset,
 				limit: count,
-				...(fields && { fields }),
+				...(fields && { projection: fields }),
 			}).toArray();
 
 			return API.v1.success({
@@ -410,7 +410,7 @@ API.v1.addRoute(
 				sort: sort || { ts: -1 },
 				skip: offset,
 				limit: count,
-				fields,
+				projection: fields,
 			}).toArray();
 
 			if (!msgs) {

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
@@ -105,8 +105,6 @@ import { SystemLogger } from '../../../../server/lib/logger/system';
  *                            type: object
  *                          tokenpass:
  *                            type: object
- *                          blockstack:
- *                            type: object
  *                          password:
  *                            type: object
  *                            properties:

diff --git a/apps/meteor/app/blockstack/client/index.js b/apps/meteor/app/blockstack/client/index.js
diff --git a/apps/meteor/app/blockstack/client/routes.js b/apps/meteor/app/blockstack/client/routes.js
diff --git a/apps/meteor/app/blockstack/server/index.js b/apps/meteor/app/blockstack/server/index.js
diff --git a/apps/meteor/app/blockstack/server/logger.js b/apps/meteor/app/blockstack/server/logger.js
diff --git a/apps/meteor/app/blockstack/server/loginHandler.js b/apps/meteor/app/blockstack/server/loginHandler.js
diff --git a/apps/meteor/app/blockstack/server/routes.js b/apps/meteor/app/blockstack/server/routes.js
diff --git a/apps/meteor/app/blockstack/server/settings.js b/apps/meteor/app/blockstack/server/settings.js
diff --git a/apps/meteor/app/blockstack/server/tokenHandler.js b/apps/meteor/app/blockstack/server/tokenHandler.js