Merge remote-tracking branch 'origin/develop' into release-candidate

RocketChat · Nov 30, 2021 · 068ab43 · 068ab43
2 parents 479bb09 + 3b27db4
commit 068ab43
Show file tree

Hide file tree

Showing 81 changed files with 2,077 additions and 933 deletions.
diff --git a/app/authorization/server/streamer/permissions/index.ts b/app/authorization/server/streamer/permissions/index.ts
@@ -10,15 +10,17 @@ Meteor.methods({
 		// TODO: should we return this for non logged users?
 		// TODO: we could cache this collection
 
-		const records = await Permissions.find(updatedAt && { _updatedAt: { $gt: updatedAt } }).toArray();
+		const records = await Permissions.find(
+			updatedAt && { _updatedAt: { $gt: updatedAt } },
+		).toArray();
 
 		if (updatedAt instanceof Date) {
 			return {
 				update: records,
 				remove: await Permissions.trashFindDeletedAfter(
 					updatedAt,
 					{},
-					{ fields: { _id: 1, _deletedAt: 1 } },
+					{ projection: { _id: 1, _deletedAt: 1 } },
 				).toArray(),
 			};
 		}

diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
@@ -569,6 +569,7 @@ export class FileUploadClass {
 	}
 
 	delete(fileId) {
+		// TODO: Remove this method
 		if (this.store && this.store.delete) {
 			this.store.delete(fileId);
 		}

diff --git a/app/livechat/server/config.ts b/app/livechat/server/config.ts
@@ -619,6 +619,7 @@ Meteor.startup(function() {
 			],
 			i18nDescription: 'Feature_depends_on_selected_call_provider_to_be_enabled_from_administration_settings',
 			i18nLabel: 'Call_provider',
+			alert: 'The WebRTC provider is currently in alpha!<br/>We recommend using Firefox Browser for this feature since there are some known bugs within other browsers that still need to be fixed.<br/>Please report bugs to github.com/RocketChat/Rocket.Chat/issues',
 			enableQuery: omnichannelEnabledQuery,
 		});
 	});

diff --git a/app/models/server/raw/Banners.ts b/app/models/server/raw/Banners.ts
@@ -7,7 +7,7 @@ type T = IBanner;
 export class BannersRaw extends BaseRaw<T> {
 	constructor(
 		public readonly col: Collection<T>,
-		public readonly trash?: Collection<T>,
+		trash?: Collection<T>,
 	) {
 		super(col, trash);
 

diff --git a/app/models/server/raw/BannersDismiss.ts b/app/models/server/raw/BannersDismiss.ts
@@ -6,7 +6,7 @@ import { BaseRaw } from './BaseRaw';
 export class BannersDismissRaw extends BaseRaw<IBannerDismiss> {
 	constructor(
 		public readonly col: Collection<IBannerDismiss>,
-		public readonly trash?: Collection<IBannerDismiss>,
+		trash?: Collection<IBannerDismiss>,
 	) {
 		super(col, trash);