From 846c4bebe05c6ca812d30d50936035c091e6b770 Mon Sep 17 00:00:00 2001
From: Hudell <brian@hudell.com>
Date: Mon, 12 Mar 2018 11:13:36 -0300
Subject: [PATCH] Removed Private History

---
 client/routes/router.js                       | 13 ---
 .../rocketchat-ui-sidenav/client/sideNav.html |  6 --
 .../client/views/app/privateHistory.html      | 59 -----------
 .../client/views/app/privateHistory.js        | 97 -------------------
 packages/rocketchat-ui/package.js             |  2 -
 server/publications/privateHistory.js         | 16 ---
 6 files changed, 193 deletions(-)
 delete mode 100644 packages/rocketchat-ui/client/views/app/privateHistory.html
 delete mode 100644 packages/rocketchat-ui/client/views/app/privateHistory.js
 delete mode 100644 server/publications/privateHistory.js

diff --git a/client/routes/router.js b/client/routes/router.js
index d75f07595f0bf..67d0f4870e5ef 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -95,19 +95,6 @@ FlowRouter.route('/account/:group?', {
 	}]
 });
 
-FlowRouter.route('/history/private', {
-	name: 'privateHistory',
-
-	subscriptions(/*params, queryParams*/) {
-		this.register('privateHistory', Meteor.subscribe('privateHistory'));
-	},
-
-	action() {
-		Session.setDefault('historyFilter', '');
-		BlazeLayout.render('main', {center: 'privateHistory'});
-	}
-});
-
 FlowRouter.route('/terms-of-service', {
 	name: 'terms-of-service',
 
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.html b/packages/rocketchat-ui-sidenav/client/sideNav.html
index 3474a37c18f91..f668cbebb4621 100644
--- a/packages/rocketchat-ui-sidenav/client/sideNav.html
+++ b/packages/rocketchat-ui-sidenav/client/sideNav.html
@@ -9,12 +9,6 @@
 					{{#each roomType}}
 						{{> Template.dynamic template=template data=data }}
 					{{/each}}
-
-					{{#if canViewHistory}}
-						<h3 class="history-div">
-							<a href="{{pathFor 'privateHistory'}}">{{_ "History"}}</a>
-						</h3>
-					{{/if}}
 				</div>
 				<div class="unread-rooms background-primary-action-color color-primary-action-contrast bottom-unread-rooms hidden">
 					{{_ "More_unreads"}} <i class="icon-down-big"></i>
diff --git a/packages/rocketchat-ui/client/views/app/privateHistory.html b/packages/rocketchat-ui/client/views/app/privateHistory.html
deleted file mode 100644
index c432346dc6a6e..0000000000000
--- a/packages/rocketchat-ui/client/views/app/privateHistory.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<template name="privateHistory">
-	<section class="page-container page-list content-background-color">
-		{{> header sectionName="History"}}
-		<div class="content">
-			<form class="search-form" role="form">
-				<div class="input-line search">
-					<input type="text" id="history-filter" placeholder="{{_ "Search"}}" dir="auto">
-					<i class="icon-search secondary-font-color"></i>
-				</div>
-			</form>
-			<div class="results">
-				{{{_ "Showing_results" history.length}}}
-			</div>
-			<div class="list">
-				{{#each history.items}}
-					<a href="{{path}}">
-						<div class="info">
-							<h3><i class="{{type}}"></i><span class="enter-room">{{name}}</span></h3>
-							<ul>
-								{{#with roomOf rid}}
-									<li>{{_ "n_messages" msgs}}</li>
-									<li>{{_ "since_creation" creation}}</li>
-								{{/with}}
-							</ul>
-						</div>
-						<div class="title">
-							{{#with roomOf rid}}
-								<strong>{{lastMessage}}</strong>
-							{{/with}}
-						</div>
-					</a>
-				{{/each}}
-			</div>
-			<div class="results">
-				{{{_ "Showing_archived_results" archivedHistory.length}}}
-			</div>
-			<div class="list">
-				{{#each archivedHistory.items}}
-					<a href="{{path}}">
-						<div class="info">
-							<h3><i class="{{type}}"></i><span class="enter-room">{{name}}</span></h3>
-							<ul>
-								{{#with roomOf rid}}
-									<li>{{_ "n_messages" msgs}}</li>
-									<li>{{_ "since_creation" creation}}</li>
-								{{/with}}
-							</ul>
-						</div>
-						<div class="title">
-							{{#with roomOf rid}}
-								<strong>{{lastMessage}}</strong>
-							{{/with}}
-						</div>
-					</a>
-				{{/each}}
-			</div>
-		</div>
-	</section>
-</template>
diff --git a/packages/rocketchat-ui/client/views/app/privateHistory.js b/packages/rocketchat-ui/client/views/app/privateHistory.js
deleted file mode 100644
index 7c22c1c6254b3..0000000000000
--- a/packages/rocketchat-ui/client/views/app/privateHistory.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import moment from 'moment';
-
-Template.privateHistory.helpers({
-	history() {
-		const items = ChatSubscription.find({
-			name: {
-				$regex: Session.get('historyFilter'),
-				$options: 'i'
-			},
-			t: {
-				$in: ['d', 'c', 'p']
-			},
-			archived: {
-				$ne: true
-			}
-		}, {
-			'sort': {
-				'ts': -1
-			}
-		});
-		return {
-			items,
-			length: items.count()
-		};
-	},
-	archivedHistory() {
-		const items = ChatSubscription.find({
-			name: {
-				$regex: Session.get('historyFilter'),
-				$options: 'i'
-			},
-			t: {
-				$in: ['d', 'c', 'p']
-			},
-			archived: true
-		}, {
-			'sort': {
-				'ts': -1
-			}
-		});
-		return {
-			items,
-			length: items.count()
-		};
-	},
-	roomOf(rid) {
-		return ChatRoom.findOne(rid);
-	},
-	type() {
-		switch (this.t) {
-			case 'd':
-				return 'icon-at';
-			case 'c':
-				return 'icon-hash';
-			case 'p':
-				return 'icon-lock';
-		}
-	},
-	creation() {
-		return moment(this.ts).format('LLL');
-	},
-	lastMessage() {
-		if (this.lm) {
-			return moment(this.lm).format('LLL');
-		}
-	},
-	path() {
-		switch (this.t) {
-			case 'c':
-				return FlowRouter.path('channel', {
-					name: this.name
-				});
-			case 'p':
-				return FlowRouter.path('group', {
-					name: this.name
-				});
-			case 'd':
-				return FlowRouter.path('direct', {
-					username: this.name
-				});
-		}
-	}
-});
-
-Template.privateHistory.events({
-	'keydown #history-filter'(event) {
-		if (event.which === 13) {
-			event.stopPropagation();
-			return event.preventDefault();
-		}
-	},
-	'keyup #history-filter'(event) {
-		event.stopPropagation();
-		event.preventDefault();
-		return Session.set('historyFilter', event.currentTarget.value);
-	}
-});
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 6eaee63c0ff79..68782079277d5 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -90,7 +90,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/popout.html', 'client');
 	api.addFiles('client/views/app/alerts.html', 'client');
 
-	api.addFiles('client/views/app/privateHistory.html', 'client');
 	api.addFiles('client/views/app/room.html', 'client');
 	api.addFiles('client/views/app/roomSearch.html', 'client');
 	api.addFiles('client/views/app/secretURL.html', 'client');
@@ -110,7 +109,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/fullModal.js', 'client');
 	api.addFiles('client/views/app/home.js', 'client');
 	api.addFiles('client/views/app/directory.js', 'client');
-	api.addFiles('client/views/app/privateHistory.js', 'client');
 	api.addFiles('client/views/app/room.js', 'client');
 	api.addFiles('client/views/app/roomSearch.js', 'client');
 	api.addFiles('client/views/app/secretURL.js', 'client');
diff --git a/server/publications/privateHistory.js b/server/publications/privateHistory.js
deleted file mode 100644
index 47aca4ae7c254..0000000000000
--- a/server/publications/privateHistory.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Meteor.publish('privateHistory', function() {
-	if (!this.userId) {
-		return this.ready();
-	}
-
-	return RocketChat.models.Rooms.findByContainingUsername(RocketChat.models.Users.findOneById(this.userId).username, {
-		fields: {
-			t: 1,
-			name: 1,
-			msgs: 1,
-			ts: 1,
-			lm: 1,
-			cl: 1
-		}
-	});
-});