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

packages/rocketchat-api/server/v1/chat.js

@@ -357,9 +357,10 @@ RocketChat.API.v1.addRoute('chat.getDeletedMessages', { authRequired: true }, {
 		} else if (isNaN(Date.parse(since))) {
 			throw new Meteor.Error('The "since" query parameter must be a valid date.');
 		}
-		const cursor = RocketChat.models.Messages.trashFindDeleted(new Date(since), { rid: roomId }, {
+		const cursor = RocketChat.models.Messages.trashFindDeletedAfter(new Date(since), { rid: roomId }, {
 			skip: offset,
 			limit: count,
+			fields: { _id: 1 },
 		});
 
 		const total = cursor.count();

packages/rocketchat-importer/server/classes/ImporterBase.js

@@ -99,7 +99,7 @@ export class Base {
 		this.progress = new Progress(this.info.key, this.info.name);
 		this.collection = RawImports;
 
-		const userId = Meteor.user()._id;
+		const userId = Meteor.userId();
 		const importRecord = Imports.findPendingImport(this.info.key);
 
 		if (importRecord) {

packages/rocketchat-importer/server/methods/downloadPublicImportFile.js

@@ -7,7 +7,6 @@ import http from 'http';
 Meteor.methods({
 	downloadPublicImportFile(fileUrl, importerKey) {
 		const userId = Meteor.userId();
-		console.log(fileUrl);
 
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'downloadPublicImportFile' });

packages/rocketchat-importer/server/methods/uploadImportFile.js

@@ -30,9 +30,6 @@ Meteor.methods({
 		const readStream = RocketChatFile.bufferToStream(file);
 		const writeStream = RocketChatImportFileInstance.createWriteStream(newFileName, contentType);
 
-		writeStream.on('end', Meteor.bindEnvironment(() => {
-		}));
-
 		readStream.pipe(writeStream);
 	},
 });

packages/rocketchat-lib/server/models/_Base.js

@@ -128,10 +128,6 @@ class ModelsBase {
 		return this._db.trashFindDeletedAfter(...args);
 	}
 
-	trashFindDeleted(...args) {
-		return this._db.trashFindDeleted(...args);
-	}
-
 	processQueryOptionsOnResult(result, options = {}) {
 		if (result === undefined || result === null) {
 			return undefined;

packages/rocketchat-lib/server/models/_BaseDb.js

@@ -376,15 +376,6 @@ class ModelsBaseDb extends EventEmitter {
 
 		return trash.find(query, options);
 	}
-
-	trashFindDeleted(deletedAt, query = {}, options) {
-		query.__collection__ = this.name;
-		query._deletedAt = {
-			$gte: deletedAt,
-		};
-
-		return trash.find(query, options);
-	}
 }
 
 export default ModelsBaseDb;