From 7c78a5518ff0b0d9674029185944946bdd87d86d Mon Sep 17 00:00:00 2001
From: vynmera <39674991+vynmera@users.noreply.github.com>
Date: Sat, 30 Jun 2018 21:33:06 +0000
Subject: [PATCH] :put_litter_in_its_place:

---
 server/methods/eraseRoom.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/server/methods/eraseRoom.js b/server/methods/eraseRoom.js
index 83a09918d3aa..bb4f55a59b37 100644
--- a/server/methods/eraseRoom.js
+++ b/server/methods/eraseRoom.js
@@ -26,6 +26,21 @@ Meteor.methods({
 		}
 
 		if (RocketChat.roomTypes.roomTypes[room.t].canBeDeleted(room)) {
+			RocketChat.models.Messages.find({
+				rid,
+				file: {
+					$exists: true
+				}
+			}, {
+				fields: {
+					file: 1
+				}
+			}).fetch().map(function(document) {
+				if (document.file && document.file._id) {
+					FileUpload.getStore('Uploads').deleteById(document.file._id);
+				}
+			});
+
 			RocketChat.models.Messages.removeByRoomId(rid);
 			RocketChat.models.Subscriptions.removeByRoomId(rid);
 			const result = RocketChat.models.Rooms.removeById(rid);