From db30bd712ec7af98251259240768acdcb53083b5 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 18 Apr 2018 22:03:13 -0300
Subject: [PATCH 01/20] added ignored flag on messages

---
 .../server/lib/sendNotificationsOnMessage.js  | 10 ++--
 .../server/models/Subscriptions.js            | 15 ++++++
 .../client/imports/components/messages.css    |  4 ++
 .../client/tabs/membersList.html              |  2 +-
 .../client/tabs/membersList.js                | 11 +++--
 .../client/tabs/userActions.js                | 23 ++++++++-
 .../rocketchat-ui-message/client/message.html |  2 +-
 .../rocketchat-ui-message/client/message.js   |  3 ++
 .../client/lib/RoomHistoryManager.js          | 47 ++++++++-----------
 .../rocketchat-ui/client/lib/RoomManager.js   | 34 ++++++--------
 server/methods/ignoreUser.js                  | 29 ++++++++++++
 server/publications/subscription.js           |  3 +-
 12 files changed, 125 insertions(+), 58 deletions(-)
 create mode 100644 server/methods/ignoreUser.js

diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index 16c425a8a6dd6..40223c8ffa71d 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -206,11 +206,9 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room, userId) {
 	const maxMembersForNotification = RocketChat.settings.get('Notifications_Max_Room_Members');
 	const disableAllMessageNotifications = room.usernames.length > maxMembersForNotification && maxMembersForNotification !== 0;
 	const subscriptions = RocketChat.models.Subscriptions.findNotificationPreferencesByRoom(room._id, disableAllMessageNotifications);
-	const userIds = [];
-	subscriptions.forEach((s) => {
-		userIds.push(s.u._id);
-	});
+	const userIds = subscriptions.map(s => userIds.push(s.u._id));
 	const users = {};
+
 	RocketChat.models.Users.findUsersByIds(userIds, { fields: { 'settings.preferences': 1 } }).forEach((user) => {
 		users[user._id] = user;
 	});
@@ -223,6 +221,10 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room, userId) {
 			return;
 		}
 
+		if (subscription.ignored && subscription.ignored.find(message.u._id)) {
+			return;
+		}
+
 		const {
 			audioNotifications = RocketChat.getUserPreference(users[subscription.u._id], 'audioNotifications'),
 			desktopNotifications = RocketChat.getUserPreference(users[subscription.u._id], 'desktopNotifications'),
diff --git a/packages/rocketchat-lib/server/models/Subscriptions.js b/packages/rocketchat-lib/server/models/Subscriptions.js
index 9e585150bf012..116751db301d8 100644
--- a/packages/rocketchat-lib/server/models/Subscriptions.js
+++ b/packages/rocketchat-lib/server/models/Subscriptions.js
@@ -454,6 +454,21 @@ class ModelSubscriptions extends RocketChat.models._Base {
 		return this.update(query, update, { multi: true });
 	}
 
+	ignoreUser({_id, ignoredUser : ignored, ignore = true}) {
+		const query = {
+			_id
+		};
+		const update = {
+		};
+		if (ignore) {
+			update.$addToSet = { ignored };
+		} else {
+			update.$pull = { ignored };
+		}
+
+		return this.update(query, update);
+	}
+
 	setAlertForRoomIdExcludingUserId(roomId, userId) {
 		const query = {
 			rid: roomId,
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 16e1b2986988a..892f1852f8677 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -41,6 +41,10 @@
 }
 
 .message {
+
+	&--ignored {
+		background: red;
+	}
 	&.active {
 		& .message-actions__label {
 			color: var(--rc-color-button-primary);
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.html b/packages/rocketchat-ui-flextab/client/tabs/membersList.html
index 651b3e73f1a5f..d9c415a730356 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.html
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.html
@@ -37,7 +37,7 @@
 								{{> avatar username=user.username}}
 								<div class="rc-member-list__username">
 									<div class="rc-member-list__status rc-member-list__status--{{status}}"></div>
-									{{displayName}} {{utcOffset}}
+									{{ignored}} {{displayName}} {{utcOffset}}
 									</div>
 								{{> icon user=. block="rc-member-list__menu js-action" icon="menu" }}
 							</li>
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
index a17fa52ddb79b..9514f15839b5e 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -3,6 +3,11 @@ import _ from 'underscore';
 import {getActions} from './userActions';
 
 Template.membersList.helpers({
+	ignored() {
+		const {user} = this;
+		const sub = RocketChat.models.Subscriptions.findOne({rid: Session.get('openedRoom')});
+		return sub.ignored && sub.ignored.indexOf(user._id) > -1 ? '(ignorado)' : '';
+	},
 	tAddUsers() {
 		return t('Add_users');
 	},
@@ -63,7 +68,7 @@ Template.membersList.helpers({
 
 			return {
 				user,
-				status: (onlineUsers[user.username] != null ? onlineUsers[user.username].status : undefined),
+				status: (onlineUsers[user.username] != null ? onlineUsers[user.username].status : 'offline'),
 				muted: Array.from(roomMuted).includes(user.username),
 				utcOffset
 			};
@@ -76,7 +81,7 @@ Template.membersList.helpers({
 		}
 		// show online users first.
 		// sortBy is stable, so we can do this
-		users = _.sortBy(users, u => u.status == null);
+		users = _.sortBy(users, u => u.status === 'offline');
 
 		let hasMore = undefined;
 		const usersLimit = Template.instance().usersLimit.get();
@@ -264,6 +269,7 @@ Template.membersList.onCreated(function() {
 	this.showDetail = new ReactiveVar(false);
 	this.filter = new ReactiveVar('');
 
+
 	this.users = new ReactiveVar([]);
 	this.total = new ReactiveVar;
 	this.loading = new ReactiveVar(true);
@@ -272,7 +278,6 @@ Template.membersList.onCreated(function() {
 
 	Tracker.autorun(() => {
 		if (this.data.rid == null) { return; }
-
 		this.loading.set(true);
 		return Meteor.call('getUsersOfRoom', this.data.rid, this.showAllUsers.get(), (error, users) => {
 			this.users.set(users.records);
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
index 6f79c1c68d102..80653889f5930 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
@@ -6,7 +6,10 @@ import toastr from 'toastr';
 export const getActions = function({ user, directActions, hideAdminControls }) {
 
 	const hasPermission = RocketChat.authz.hasAllPermission;
-
+	const isIgnored = () => {
+		const sub = RocketChat.models.Subscriptions.findOne({rid : Session.get('openedRoom')});
+		return sub.ignored && sub.ignored.indexOf(user._id) > -1;
+	};
 	const canSetLeader= () => {
 		return RocketChat.authz.hasAllPermission('set-leader', Session.get('openedRoom'));
 	};
@@ -469,6 +472,24 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 				name: t('Activate'),
 				action: prevent(getUser, ({_id}) => Meteor.call('setUserActiveStatus', _id, true, success(() => toastr.success(t('User_has_been_activated')))))
 			};
+		}, () => {
+			if (user._id === Meteor.userId()) {
+				return;
+			}
+			if (isIgnored()) {
+				return {
+					group: 'channel',
+					icon : 'plus',
+					name: 'designore',
+					action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: false}, success(() => toastr.success(t('user ignored no more')))))
+				};
+			}
+			return {
+				group: 'channel',
+				icon : 'plus',
+				name: 'ignore',
+				action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: true}, success(() => toastr.success(t('user ignored')))))
+			};
 		}];
 	return actions;
 };
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index fe107febd65f4..fc8926d95b67b 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -1,5 +1,5 @@
 <template name="message">
-	<li id="{{_id}}" data-context={{actionContext}} class="message background-transparent-dark-hover {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
+	<li id="{{_id}}" data-context={{actionContext}} class="message background-transparent-dark-hover {{isIgnored}} {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
 		{{#if avatar}}
 			{{#if avatarFromUsername}}
 				<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index 3b42c51c3880d..f2b3c09877dd0 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -6,6 +6,9 @@ Template.message.helpers({
 	encodeURI(text) {
 		return encodeURI(text);
 	},
+	isIgnored() {
+		return this.ignored ? 'message--ignored' : '';
+	},
 	isBot() {
 		if (this.bot != null) {
 			return 'bot';
diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
index 6be9d25efcf55..5075e6230b2a9 100644
--- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
@@ -1,6 +1,20 @@
 /* globals readMessage UserRoles RoomRoles*/
 import _ from 'underscore';
 
+export const upsertMessage = ({msg, subscription}) => {
+	const userId = msg.u && msg.u._id;
+
+	if (subscription && subscription.ignored && subscription.ignored.indexOf(userId) > -1) {
+		msg.ignored = true;
+	}
+	const roles = [
+		(userId && UserRoles.findOne(userId, { fields: { roles: 1 }})) || {},
+		(userId && RoomRoles.findOne({rid: msg.rid, 'u._id': userId})) || {}
+	].map(e => e.roles);
+	msg.roles = _.union.apply(_.union, roles);
+	return ChatMessage.upsert({_id: msg._id}, msg);
+};
+
 export const RoomHistoryManager = new class {
 	constructor() {
 		this.defaultLimit = 50;
@@ -67,16 +81,7 @@ export const RoomHistoryManager = new class {
 				previousHeight = wrapper.scrollHeight;
 			}
 
-			messages.forEach(item => {
-				if (item.t !== 'command') {
-					const roles = [
-						(item.u && item.u._id && UserRoles.findOne(item.u._id, { fields: { roles: 1 }})) || {},
-						(item.u && item.u._id && RoomRoles.findOne({rid: item.rid, 'u._id': item.u._id})) || {}
-					].map(e => e.roles);
-					item.roles = _.union.apply(_.union, roles);
-					ChatMessage.upsert({_id: item._id}, item);
-				}
-			});
+			messages.forEach(msg => msg.t !== 'command' && upsertMessage({msg, subscription}));
 
 			if (wrapper) {
 				const heightDiff = wrapper.scrollHeight - previousHeight;
@@ -126,15 +131,8 @@ export const RoomHistoryManager = new class {
 
 		if (ts) {
 			return Meteor.call('loadNextMessages', rid, ts, limit, function(err, result) {
-				for (const item of Array.from((result != null ? result.messages : undefined) || [])) {
-					if (item.t !== 'command') {
-						const roles = [
-							(item.u && item.u._id && UserRoles.findOne(item.u._id, { fields: { roles: 1 }})) || {},
-							(item.u && item.u._id && RoomRoles.findOne({rid: item.rid, 'u._id': item.u._id})) || {}
-						].map(e => e.roles);
-						item.roles = _.union.apply(_.union, roles);
-						ChatMessage.upsert({_id: item._id}, item);
-					}
+				for (const msg of Array.from((result != null ? result.messages : undefined) || [])) {
+					if (msg.t !== 'command') { upsertMessage({msg, subscription}); }
 				}
 
 				Meteor.defer(() => RoomManager.updateMentionsMarksOfRoom(typeName));
@@ -190,15 +188,8 @@ export const RoomHistoryManager = new class {
 			}
 
 			return Meteor.call('loadSurroundingMessages', message, limit, function(err, result) {
-				for (const item of Array.from((result != null ? result.messages : undefined) || [])) {
-					if (item.t !== 'command') {
-						const roles = [
-							(item.u && item.u._id && UserRoles.findOne(item.u._id, { fields: { roles: 1 }})) || {},
-							(item.u && item.u._id && RoomRoles.findOne({rid: item.rid, 'u._id': item.u._id})) || {}
-						].map(e => e.roles);
-						item.roles = _.union.apply(_.union, roles);
-						ChatMessage.upsert({_id: item._id}, item);
-					}
+				for (const msg of Array.from((result != null ? result.messages : undefined) || [])) {
+					if (msg.t !== 'command') { upsertMessage({msg, subscription}); }
 				}
 
 				Meteor.defer(function() {
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index c50521198617b..4d2fde707469f 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-
+import { upsertMessage } from './RoomHistoryManager';
 const RoomManager = new function() {
 	const openedRooms = {};
 	const msgStream = new Meteor.Streamer('room-messages');
@@ -27,7 +27,6 @@ const RoomManager = new function() {
 
 					if (room != null) {
 						openedRooms[typeName].rid = room._id;
-
 						RoomHistoryManager.getMoreIfIsEmpty(room._id);
 
 						if (openedRooms[typeName].streamActive !== true) {
@@ -41,12 +40,8 @@ const RoomManager = new function() {
 
 										// Do not load command messages into channel
 										if (msg.t !== 'command') {
-											const roles = [
-												(msg.u && msg.u._id && UserRoles.findOne(msg.u._id, { fields: { roles: 1 }})) || {},
-												(msg.u && msg.u._id && RoomRoles.findOne({rid: msg.rid, 'u._id': msg.u._id})) || {}
-											].map(e => e.roles);
-											msg.roles = _.union.apply(_.union, roles);
-											ChatMessage.upsert({ _id: msg._id }, msg);
+											const subscription = ChatSubscription.findOne({rid: openedRooms[typeName].rid});
+											upsertMessage({msg, subscription});
 											msg.room = {
 												type,
 												name
@@ -227,18 +222,11 @@ const loadMissedMessages = function(rid) {
 	if (lastMessage == null) {
 		return;
 	}
-
+	const subscription = ChatSubscription.findOne({rid});
 	return Meteor.call('loadMissedMessages', rid, lastMessage.ts, (err, result) =>
-		Array.from(result).map((item) =>
-			RocketChat.promises.run('onClientMessageReceived', item).then(function(item) {
-				/* globals UserRoles RoomRoles*/
-				const roles = [
-					(item.u && item.u._id && UserRoles.findOne(item.u._id)) || {},
-					(item.u && item.u._id && RoomRoles.findOne({rid: item.rid, 'u._id': item.u._id})) || {}
-				].map(({roles}) => roles);
-				item.roles = _.union.apply(_, roles);
-				return ChatMessage.upsert({_id: item._id}, item);
-			}))
+		Array.from(result).map(item =>
+			RocketChat.promises.run('onClientMessageReceived', item).then(msg => upsertMessage({msg, subscription})
+			))
 	);
 };
 
@@ -311,3 +299,11 @@ Tracker.autorun(function() {
 export { RoomManager };
 this.RoomManager = RoomManager;
 RocketChat.callbacks.add('afterLogoutCleanUp', () => RoomManager.closeAllRooms(), RocketChat.callbacks.priority.MEDIUM, 'roommanager-after-logout-cleanup');
+
+
+RocketChat.Notifications.onUser('subscriptions-changed', (action, sub) => {
+	ChatMessage.update({rid: sub.rid}, {$unset : {ignored : ''}}, {multi : true});
+	if (sub.ignored) {
+		ChatMessage.update({rid: sub.rid, 'u._id': { $in : sub.ignored }}, { $set: {ignored : true}}, {multi : true});
+	}
+});
diff --git a/server/methods/ignoreUser.js b/server/methods/ignoreUser.js
new file mode 100644
index 0000000000000..72bf53e41a1c3
--- /dev/null
+++ b/server/methods/ignoreUser.js
@@ -0,0 +1,29 @@
+/* globals RocketChat */
+
+Meteor.methods({
+	ignoreUser({rid, userId: ignoredUser, ignore = true}) {
+		check(ignoredUser, String);
+		check(rid, String);
+
+		const userId = Meteor.userId();
+		if (!userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+				method: 'ignoreUser'
+			});
+		}
+
+		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, userId);
+
+		if (!subscription) {
+			throw new Meteor.Error('error-invalid-subscription', 'Invalid subscription', { method: 'ignoreUser' });
+		}
+
+		const subscriptionIgnoredUser = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, ignoredUser);
+
+		if (!subscriptionIgnoredUser) {
+			throw new Meteor.Error('error-invalid-subscription', 'Invalid subscription', { method: 'ignoreUser' });
+		}
+
+		return !!RocketChat.models.Subscriptions.ignoreUser({_id: subscription._id, ignoredUser, ignore});
+	}
+});
diff --git a/server/publications/subscription.js b/server/publications/subscription.js
index 2b00302f00fac..deb3636567313 100644
--- a/server/publications/subscription.js
+++ b/server/publications/subscription.js
@@ -28,7 +28,8 @@ const fields = {
 	autoTranslate: 1,
 	autoTranslateLanguage: 1,
 	disableNotifications: 1,
-	hideUnreadStatus: 1
+	hideUnreadStatus: 1,
+	ignored: 1
 };
 
 Meteor.methods({

From 7fcbfe77689bb71de3c8cef8498582e846df215c Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 13:27:32 -0300
Subject: [PATCH 02/20] Revert change to map that breaks subscriptions

---
 .../rocketchat-lib/server/lib/sendNotificationsOnMessage.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index 40223c8ffa71d..59aacad37d177 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -205,8 +205,9 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room, userId) {
 	// Don't fetch all users if room exceeds max members
 	const maxMembersForNotification = RocketChat.settings.get('Notifications_Max_Room_Members');
 	const disableAllMessageNotifications = room.usernames.length > maxMembersForNotification && maxMembersForNotification !== 0;
-	const subscriptions = RocketChat.models.Subscriptions.findNotificationPreferencesByRoom(room._id, disableAllMessageNotifications);
-	const userIds = subscriptions.map(s => userIds.push(s.u._id));
+	const subscriptions = RocketChat.models.Subscriptions.findNotificationPreferencesByRoom(room._id, disableAllMessageNotifications) || [];
+	const userIds = [];
+	subscriptions.forEach(s => userIds.push(s.u._id));
 	const users = {};
 
 	RocketChat.models.Users.findUsersByIds(userIds, { fields: { 'settings.preferences': 1 } }).forEach((user) => {

From 65b1b733ac2d199c2d37e37451b67668594c1f9f Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 16:53:57 -0300
Subject: [PATCH 03/20] Adds toggling to show ignored message

---
 .../client/imports/components/messages.css           | 12 +++++++++++-
 .../client/imports/general/base_old.css              |  5 +++++
 packages/rocketchat-ui-message/client/message.html   |  5 ++++-
 packages/rocketchat-ui-message/client/message.js     |  6 ++++++
 packages/rocketchat-ui/client/views/app/room.js      |  6 ++++--
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 892f1852f8677..fbdb5e87c813d 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -42,9 +42,19 @@
 
 .message {
 
+	& .toggle-hidden {
+		display: none;
+	}
+
 	&--ignored {
-		background: red;
+		& .body {
+			display: none;
+		}
+		& .toggle-hidden {
+			display: block;
+		}
 	}
+
 	&.active {
 		& .message-actions__label {
 			color: var(--rc-color-button-primary);
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 638e7da8c6fb7..b0b9f26cb94e6 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -5384,6 +5384,11 @@ body:not(.is-cordova) {
 	cursor: pointer;
 }
 
+.toggle-hidden {
+	cursor: pointer;
+	font-style: italic;
+}
+
 /* kinda hacky, needed in oembedFrageWidget.html */
 
 .rc-old br.only-after-a {
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index fc8926d95b67b..df7dd0b1c3714 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -1,5 +1,5 @@
 <template name="message">
-	<li id="{{_id}}" data-context={{actionContext}} class="message background-transparent-dark-hover {{isIgnored}} {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
+	<li id="{{_id}}" data-context={{actionContext}} class="message background-transparent-dark-hover {{ignoredClass}} {{sequentialClass}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
 		{{#if avatar}}
 			{{#if avatarFromUsername}}
 				<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
@@ -55,6 +55,9 @@
 				{{>icon icon=roomIcon}}{{channelName}}
 			</span>
 		{{/if}}
+		{{#if isIgnored}}
+			<span class="toggle-hidden icon-right-dir" data-message="{{_id}}"> This message was ignored </span>
+		{{/if}}
 		<div class="body color-primary-font-color {{system true}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
 			{{#if isSnippet}}
 				<div class="snippet-name">{{_ "Snippet_name"}}: {{snippetName}}</div>
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index e9c040fdd6eac..14e376b2f842f 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -7,6 +7,9 @@ Template.message.helpers({
 		return encodeURI(text);
 	},
 	isIgnored() {
+		return this.ignored;
+	},
+	ignoredClass() {
 		return this.ignored ? 'message--ignored' : '';
 	},
 	isBot() {
@@ -50,6 +53,9 @@ Template.message.helpers({
 		}
 	},
 	isSequential() {
+		return this.groupable !== false;
+	},
+	sequentialClass() {
 		if (this.groupable !== false) {
 			return 'sequential';
 		}
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 2d2dc51f6b898..272fef58ed066 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -722,9 +722,11 @@ Template.room.events({
 				showCancelButton: true,
 				cancelButtonText: t('Close')
 			});
-
 		}
-
+	},
+	'click .toggle-hidden'(e) {
+		const id = e.currentTarget.dataset.message;
+		document.querySelector(`#${ id }`).classList.toggle('message--ignored');
 	}
 });
 

From 7385581c71cdb9427c5c46b0ae2ed640b67b4fb5 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 17:33:27 -0300
Subject: [PATCH 04/20] Add new icon, ignore message and css for sequential
 messages

---
 packages/rocketchat-i18n/i18n/en.i18n.json             |  2 ++
 .../client/imports/components/messages.css             |  3 +++
 .../rocketchat-ui-flextab/client/tabs/userActions.js   | 10 +++++-----
 packages/rocketchat-ui-master/public/icons.svg         |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 8aab13363db55..a71bd093cddac 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2086,8 +2086,10 @@
   "User_has_been_activated": "User has been activated",
   "User_has_been_deactivated": "User has been deactivated",
   "User_has_been_deleted": "User has been deleted",
+  "User_has_been_ignored": "User has been ignored",
   "User_has_been_muted_in_s": "User has been muted in %s",
   "User_has_been_removed_from_s": "User has been removed from %s",
+  "User_has_been_unignored": "User is no longer ignored",
   "User_Info": "User Info",
   "User_Interface": "User Interface",
   "User_is_blocked": "User is blocked",
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index fbdb5e87c813d..954a02ed52f21 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -53,6 +53,9 @@
 		& .toggle-hidden {
 			display: block;
 		}
+		& + .message--ignored.sequential {
+	    display: none;
+		}
 	}
 
 	&.active {
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
index 80653889f5930..d7aeec6e40dec 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
@@ -479,16 +479,16 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 			if (isIgnored()) {
 				return {
 					group: 'channel',
-					icon : 'plus',
-					name: 'designore',
-					action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: false}, success(() => toastr.success(t('user ignored no more')))))
+					icon : 'ban',
+					name: 'Unignore',
+					action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: false}, success(() => toastr.success(t('User_has_been_unignored')))))
 				};
 			}
 			return {
 				group: 'channel',
-				icon : 'plus',
+				icon : 'ban',
 				name: 'ignore',
-				action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: true}, success(() => toastr.success(t('user ignored')))))
+				action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: true}, success(() => toastr.success(t('User_has_been_ignored')))))
 			};
 		}];
 	return actions;
diff --git a/packages/rocketchat-ui-master/public/icons.svg b/packages/rocketchat-ui-master/public/icons.svg
index f1b1d85eebce3..7b2b722e07e73 100644
--- a/packages/rocketchat-ui-master/public/icons.svg
+++ b/packages/rocketchat-ui-master/public/icons.svg
@@ -105,4 +105,5 @@
     <symbol id="icon-loading" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="lds-rolling"><circle cx="50" cy="50" fill="none" stroke="currentColor" stroke-width="5" r="26" stroke-dasharray="122.52211349000194 42.840704496667314" transform="rotate(150 50 50)"><animateTransform attributeName="transform" type="rotate" calcMode="linear" values="0 50 50;360 50 50" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform></circle></symbol>
     <symbol id="icon-sort-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M287.968 288H32.038c-28.425 0-42.767 34.488-22.627 54.627l127.962 128c12.496 12.496 32.758 12.497 45.255 0l127.968-128C330.695 322.528 316.45 288 287.968 288zM160 448L32 320h256L160 448z"/></symbol>
     <symbol id="icon-sort-up" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M32.032 224h255.93c28.425 0 42.767-34.488 22.627-54.627l-127.962-128c-12.496-12.496-32.758-12.497-45.255 0l-127.968 128C-10.695 189.472 3.55 224 32.032 224zM160 64l128 128H32L160 64z"/></symbol>
+    <symbol id="icon-ban" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 8C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zM103.265 408.735c-80.622-80.622-84.149-208.957-10.9-293.743l304.644 304.643c-84.804 73.264-213.138 69.706-293.744-10.9zm316.37-11.727L114.992 92.365c84.804-73.263 213.137-69.705 293.743 10.9 80.622 80.621 84.149 208.957 10.9 293.743z"/></symbol>
 </svg>

From 2080f3234d353b8b8ebfdc92337188f9a052785b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Apr 2018 17:33:48 -0300
Subject: [PATCH 05/20] ignore user on message action

---
 .meteor/.id                                   |  7 +++
 .../rocketchat-lib/client/MessageAction.js    | 52 +++++++++++++++++++
 .../client/tabs/membersList.js                | 14 +++--
 .../rocketchat-ui/client/lib/RoomManager.js   |  2 +-
 4 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 .meteor/.id

diff --git a/.meteor/.id b/.meteor/.id
new file mode 100644
index 0000000000000..6f1382cfd6492
--- /dev/null
+++ b/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+phfaicehb4q6.hf9cxa7uy1ph
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index dc6afdb31636a..954d268808c72 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -4,6 +4,17 @@ import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';
 
+const success = function success(fn) {
+	return function(error, result) {
+		if (error) {
+			return handleError(error);
+		}
+		if (result) {
+			fn.call(this, result);
+		}
+	};
+};
+
 RocketChat.MessageAction = new class {
 	/*
   	config expects the following keys (only id is mandatory):
@@ -279,4 +290,45 @@ Meteor.startup(function() {
 		order: 6,
 		group: 'menu'
 	});
+
+
+
+	RocketChat.MessageAction.addButton({
+		id: 'ignore-user',
+		icon: 'quote',
+		label: 'Ignore user',
+		context: ['message', 'message-mobile'],
+		action() {
+			const [, {rid, u: {_id}}] = this._arguments;
+			Meteor.call('ignoreUser', { rid, userId:_id, ignore: true}, success(() => toastr.success(t('ignored'))));
+		},
+		condition(message) {
+			const subscription = RocketChat.models.Subscriptions.findOne({rid: message.rid});
+
+			return Meteor.userId() !== message.u._id && !(subscription.ignored && subscription.ignored.indexOf(message.u._id) > -1);
+		},
+		order: 20,
+		group: 'menu'
+	});
+	// TODO: i18n icon
+	RocketChat.MessageAction.addButton({
+		id: 'remove-igonore-user',
+		icon: 'quote',
+		label: 'Remove Ignore user',
+		context: ['message', 'message-mobile'],
+		action() {
+			const [, {rid, u: {_id}}] = this._arguments;
+			Meteor.call('ignoreUser', { rid, userId:_id, ignore: false}, success(() => toastr.success(t('ignored no more'))));
+
+		},
+		condition(message) {
+			const subscription = RocketChat.models.Subscriptions.findOne({rid: message.rid});
+			return Meteor.userId() !== message.u._id && subscription.ignored && subscription.ignored.indexOf(message.u._id) > -1;
+		},
+		order: 20,
+		group: 'menu'
+	});
+
+
+
 });
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
index c5db33f9282d1..8f08c27d41a6b 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -1,4 +1,4 @@
-/* globals WebRTC popover */
+/* globals WebRTC popover isRtl */
 import _ from 'underscore';
 import {getActions} from './userActions';
 
@@ -81,7 +81,7 @@ Template.membersList.helpers({
 		}
 		// show online users first.
 		// sortBy is stable, so we can do this
-		users = _.sortBy(users, u => u.status === 'offline');
+		users = _.sortBy(users, u => u.status ===	 'offline');
 
 		let hasMore = undefined;
 		const usersLimit = Template.instance().usersLimit.get();
@@ -221,12 +221,20 @@ Template.membersList.events({
 		e.preventDefault();
 		const config = {
 			columns,
+			mousePosition: () => ({
+				x: e.currentTarget.getBoundingClientRect().right + 10,
+				y: e.currentTarget.getBoundingClientRect().bottom + 100
+			}),
+			customCSSProperties: () => ({
+				top:  `${ e.currentTarget.getBoundingClientRect().bottom + 10 }px`,
+				left: isRtl() ? `${ e.currentTarget.getBoundingClientRect().left - 10 }px` : undefined
+			}),
 			data: {
 				rid: this._id,
 				username: instance.data.username,
 				instance
 			},
-			currentTarget: e.currentTarget,
+			activeElement: e.currentTarget,
 			onDestroyed:() => {
 				e.currentTarget.parentElement.classList.remove('active');
 			}
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index 6bebf0d922de3..905f16281aee6 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -304,6 +304,6 @@ RocketChat.callbacks.add('afterLogoutCleanUp', () => RoomManager.closeAllRooms()
 RocketChat.Notifications.onUser('subscriptions-changed', (action, sub) => {
 	ChatMessage.update({rid: sub.rid}, {$unset : {ignored : ''}}, {multi : true});
 	if (sub.ignored) {
-		ChatMessage.update({rid: sub.rid, 'u._id': { $in : sub.ignored }}, { $set: {ignored : true}}, {multi : true});
+		ChatMessage.update({rid: sub.rid, t: {$ne: 'command'}, 'u._id': { $in : sub.ignored }}, { $set: {ignored : true}}, {multi : true});
 	}
 });

From 05f4336ee701960cad39d3d254a44d1b0b331c35 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 17:38:03 -0300
Subject: [PATCH 06/20] Add i18n for ignored message

---
 packages/rocketchat-i18n/i18n/en.i18n.json         | 1 +
 packages/rocketchat-ui-message/client/message.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index a71bd093cddac..92cfde6e27a50 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1317,6 +1317,7 @@
   "Message_HideType_ru": "Hide \"User Removed\" messages",
   "Message_HideType_uj": "Hide \"User Join\" messages",
   "Message_HideType_ul": "Hide \"User Leave\" messages",
+  "Message_Ignored": "This message was ignored",
   "Message_info": "Message info",
   "Message_KeepHistory": "Keep Per Message Editing History",
   "Message_MaxAll": "Maximum Channel Size for ALL Message",
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index df7dd0b1c3714..bc14740efc012 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -56,7 +56,7 @@
 			</span>
 		{{/if}}
 		{{#if isIgnored}}
-			<span class="toggle-hidden icon-right-dir" data-message="{{_id}}"> This message was ignored </span>
+			<span class="toggle-hidden icon-right-dir" data-message="{{_id}}"> {{_ "Message_Ignored"}} </span>
 		{{/if}}
 		<div class="body color-primary-font-color {{system true}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
 			{{#if isSnippet}}

From 47588731b5931319a2e8392d4c175d78af4cf4a4 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 18:10:12 -0300
Subject: [PATCH 07/20] Adds translations and fixes access to undefined
 subscriptions

---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 +
 .../rocketchat-lib/client/MessageAction.js    | 16 ++++----
 .../client/tabs/membersList.js                |  2 +-
 .../client/tabs/userActions.js                | 38 +++++++++----------
 .../rocketchat-ui/client/lib/RoomManager.js   |  2 +-
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 92cfde6e27a50..78185faaa5356 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -889,6 +889,7 @@
   "Iframe_Integration_send_enable_Description": "Send events to parent window",
   "Iframe_Integration_send_target_origin": "Send Target Origin",
   "Iframe_Integration_send_target_origin_Description": "Origin with protocol prefix, which commands are sent to e.g. 'https://localhost', or * to allow sending to anywhere.",
+  "Ignore": "Ignore",
   "IMAP_intercepter_already_running": "IMAP intercepter already running",
   "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
   "Impersonate_next_agent_from_queue": "Impersonate next agent from queue",
@@ -2036,6 +2037,7 @@
   "unarchive-room_description": "Permission to unarchive channels",
   "Unblock_User": "Unblock User",
   "Uninstall": "Uninstall",
+  "Unignore": "Unignore",
   "Unmute_someone_in_room": "Unmute someone in the room",
   "Unmute_user": "Unmute user",
   "Unnamed": "Unnamed",
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 954d268808c72..225baa5f4eb17 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -295,12 +295,12 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'ignore-user',
-		icon: 'quote',
-		label: 'Ignore user',
+		icon: 'ban',
+		label: t('Ignore'),
 		context: ['message', 'message-mobile'],
 		action() {
 			const [, {rid, u: {_id}}] = this._arguments;
-			Meteor.call('ignoreUser', { rid, userId:_id, ignore: true}, success(() => toastr.success(t('ignored'))));
+			Meteor.call('ignoreUser', { rid, userId:_id, ignore: true}, success(() => toastr.success(t('User_has_been_ignored'))));
 		},
 		condition(message) {
 			const subscription = RocketChat.models.Subscriptions.findOne({rid: message.rid});
@@ -310,15 +310,15 @@ Meteor.startup(function() {
 		order: 20,
 		group: 'menu'
 	});
-	// TODO: i18n icon
+
 	RocketChat.MessageAction.addButton({
-		id: 'remove-igonore-user',
-		icon: 'quote',
-		label: 'Remove Ignore user',
+		id: 'unignore-user',
+		icon: 'ban',
+		label: t('Unignore'),
 		context: ['message', 'message-mobile'],
 		action() {
 			const [, {rid, u: {_id}}] = this._arguments;
-			Meteor.call('ignoreUser', { rid, userId:_id, ignore: false}, success(() => toastr.success(t('ignored no more'))));
+			Meteor.call('ignoreUser', { rid, userId:_id, ignore: false}, success(() => toastr.success(t('User_has_been_unignored'))));
 
 		},
 		condition(message) {
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
index 8f08c27d41a6b..acea218bcec4e 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -6,7 +6,7 @@ Template.membersList.helpers({
 	ignored() {
 		const {user} = this;
 		const sub = RocketChat.models.Subscriptions.findOne({rid: Session.get('openedRoom')});
-		return sub.ignored && sub.ignored.indexOf(user._id) > -1 ? '(ignorado)' : '';
+		return sub && sub.ignored && sub.ignored.indexOf(user._id) > -1 ? '(ignorado)' : '';
 	},
 	tAddUsers() {
 		return t('Add_users');
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
index d7aeec6e40dec..d2340c3e92f28 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
@@ -8,7 +8,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 	const hasPermission = RocketChat.authz.hasAllPermission;
 	const isIgnored = () => {
 		const sub = RocketChat.models.Subscriptions.findOne({rid : Session.get('openedRoom')});
-		return sub.ignored && sub.ignored.indexOf(user._id) > -1;
+		return sub && sub.ignored && sub.ignored.indexOf(user._id) > -1;
 	};
 	const canSetLeader= () => {
 		return RocketChat.authz.hasAllPermission('set-leader', Session.get('openedRoom'));
@@ -305,6 +305,24 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 					}));
 				})
 			};
+		}, () => {
+			if (user._id === Meteor.userId()) {
+				return;
+			}
+			if (isIgnored()) {
+				return {
+					group: 'channel',
+					icon : 'ban',
+					name: t('Unignore'),
+					action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: false}, success(() => toastr.success(t('User_has_been_unignored')))))
+				};
+			}
+			return {
+				group: 'channel',
+				icon : 'ban',
+				name: t('Ignore'),
+				action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: true}, success(() => toastr.success(t('User_has_been_ignored')))))
+			};
 		}, () => {
 			if (!directActions || !canMuteUser()) {
 				return;
@@ -472,24 +490,6 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 				name: t('Activate'),
 				action: prevent(getUser, ({_id}) => Meteor.call('setUserActiveStatus', _id, true, success(() => toastr.success(t('User_has_been_activated')))))
 			};
-		}, () => {
-			if (user._id === Meteor.userId()) {
-				return;
-			}
-			if (isIgnored()) {
-				return {
-					group: 'channel',
-					icon : 'ban',
-					name: 'Unignore',
-					action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: false}, success(() => toastr.success(t('User_has_been_unignored')))))
-				};
-			}
-			return {
-				group: 'channel',
-				icon : 'ban',
-				name: 'ignore',
-				action: prevent(getUser, ({_id}) => Meteor.call('ignoreUser', { rid: Session.get('openedRoom'), userId:_id, ignore: true}, success(() => toastr.success(t('User_has_been_ignored')))))
-			};
 		}];
 	return actions;
 };
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index 905f16281aee6..382ddc6f42710 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -303,7 +303,7 @@ RocketChat.callbacks.add('afterLogoutCleanUp', () => RoomManager.closeAllRooms()
 
 RocketChat.Notifications.onUser('subscriptions-changed', (action, sub) => {
 	ChatMessage.update({rid: sub.rid}, {$unset : {ignored : ''}}, {multi : true});
-	if (sub.ignored) {
+	if (sub && sub.ignored) {
 		ChatMessage.update({rid: sub.rid, t: {$ne: 'command'}, 'u._id': { $in : sub.ignored }}, { $set: {ignored : true}}, {multi : true});
 	}
 });

From b8ab420f1b187f5136f95835b11abc14866c20b0 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Apr 2018 18:44:12 -0300
Subject: [PATCH 08/20] removed file

---
 .meteor/.id | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .meteor/.id

diff --git a/.meteor/.id b/.meteor/.id
deleted file mode 100644
index 6f1382cfd6492..0000000000000
--- a/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-phfaicehb4q6.hf9cxa7uy1ph

From 09fbfcec7211bc567c412e3edb42c98e527e1a7b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Apr 2018 19:30:11 -0300
Subject: [PATCH 09/20] ignored title i18n and fix popover on member list

---
 packages/rocketchat-ui-flextab/client/tabs/membersList.js | 4 +++-
 packages/rocketchat-ui/client/views/app/room.js           | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
index acea218bcec4e..a63db3624981e 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -6,7 +6,7 @@ Template.membersList.helpers({
 	ignored() {
 		const {user} = this;
 		const sub = RocketChat.models.Subscriptions.findOne({rid: Session.get('openedRoom')});
-		return sub && sub.ignored && sub.ignored.indexOf(user._id) > -1 ? '(ignorado)' : '';
+		return sub && sub.ignored && sub.ignored.indexOf(user._id) > -1 ? `(${ t('Ignored') })` : '';
 	},
 	tAddUsers() {
 		return t('Add_users');
@@ -234,7 +234,9 @@ Template.membersList.events({
 				username: instance.data.username,
 				instance
 			},
+			offsetHorizontal: 15,
 			activeElement: e.currentTarget,
+			currentTarget: e.currentTarget,
 			onDestroyed:() => {
 				e.currentTarget.parentElement.classList.remove('active');
 			}
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 272fef58ed066..10833072b0fa3 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -111,6 +111,7 @@ const mountPopover = (e, i, outerContext) => {
 			}
 		],
 		instance: i,
+		currentTarget: e.currentTarget,
 		data: outerContext,
 		activeElement: $(e.currentTarget).parents('.message')[0],
 		onRendered: () => new Clipboard('.rc-popover__item')

From fd18b2b733530fa2813bc16b1df685a0422768dc Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Apr 2018 19:30:52 -0300
Subject: [PATCH 10/20] i18n

---
 packages/rocketchat-i18n/i18n/en.i18n.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 78185faaa5356..60161c16aef3c 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -890,6 +890,7 @@
   "Iframe_Integration_send_target_origin": "Send Target Origin",
   "Iframe_Integration_send_target_origin_Description": "Origin with protocol prefix, which commands are sent to e.g. 'https://localhost', or * to allow sending to anywhere.",
   "Ignore": "Ignore",
+  "Ignored": "Ignored",
   "IMAP_intercepter_already_running": "IMAP intercepter already running",
   "IMAP_intercepter_Not_running": "IMAP intercepter Not running",
   "Impersonate_next_agent_from_queue": "Impersonate next agent from queue",

From bfcf0ff06461b5a6102a4fd6be7096ddc98d20ea Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Apr 2018 20:05:43 -0300
Subject: [PATCH 11/20] do not allow ignore user on DM

---
 packages/rocketchat-ui-flextab/client/tabs/userActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
index d2340c3e92f28..3b9a2096949e7 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js
@@ -306,7 +306,7 @@ export const getActions = function({ user, directActions, hideAdminControls }) {
 				})
 			};
 		}, () => {
-			if (user._id === Meteor.userId()) {
+			if (!directActions || user._id === Meteor.userId()) {
 				return;
 			}
 			if (isIgnored()) {

From e592bf5504b50899472fc2e136683ac849619eb2 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Apr 2018 22:15:45 -0300
Subject: [PATCH 12/20] ignore user rest method

---
 packages/rocketchat-api/server/v1/chat.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
index 6e3486ca34ab4..c0879121518c7 100644
--- a/packages/rocketchat-api/server/v1/chat.js
+++ b/packages/rocketchat-api/server/v1/chat.js
@@ -317,3 +317,23 @@ RocketChat.API.v1.addRoute('chat.reportMessage', { authRequired: true }, {
 		return RocketChat.API.v1.success();
 	}
 });
+
+RocketChat.API.v1.addRoute('chat.ignoreUser', { authRequired: true }, {
+	get() {
+		const { rid, userId } = this.queryParams;
+		let { ignore = false } = this.queryParams;
+
+ 		ignore = typeof ignore === typeof '' ? /true|1/.test(ignore) : ignore;
+
+		if (!rid || !rid.trim()) {
+			throw new Meteor.Error('error-room-id-param-not-provided', 'The required "rid" param is missing.');
+		}
+		if (!userId || !userId.trim()) {
+			throw new Meteor.Error('error-user-id-param-not-provided', 'The required "userId" param is missing.');
+		}
+
+		Meteor.runAsUser(this.userId, () => Meteor.call('ignoreUser', { rid, userId, ignore}));
+
+		return RocketChat.API.v1.success();
+	}
+});

From a2c630db6108769a0f61985311362e3c854da52d Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 23:38:20 -0300
Subject: [PATCH 13/20] Remove mixed tabs and spaces

---
 packages/rocketchat-api/server/v1/chat.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
index c0879121518c7..c852f1ae60138 100644
--- a/packages/rocketchat-api/server/v1/chat.js
+++ b/packages/rocketchat-api/server/v1/chat.js
@@ -322,8 +322,8 @@ RocketChat.API.v1.addRoute('chat.ignoreUser', { authRequired: true }, {
 	get() {
 		const { rid, userId } = this.queryParams;
 		let { ignore = false } = this.queryParams;
-
- 		ignore = typeof ignore === typeof '' ? /true|1/.test(ignore) : ignore;
+		
+		ignore = typeof ignore === typeof '' ? /true|1/.test(ignore) : ignore;
 
 		if (!rid || !rid.trim()) {
 			throw new Meteor.Error('error-room-id-param-not-provided', 'The required "rid" param is missing.');

From 11feb13b4d354ae3aa806f824e4b5d7ba6973c47 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Thu, 19 Apr 2018 23:41:47 -0300
Subject: [PATCH 14/20] Remove trailing space

---
 packages/rocketchat-api/server/v1/chat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
index c852f1ae60138..5f7bbce045f7c 100644
--- a/packages/rocketchat-api/server/v1/chat.js
+++ b/packages/rocketchat-api/server/v1/chat.js
@@ -322,7 +322,7 @@ RocketChat.API.v1.addRoute('chat.ignoreUser', { authRequired: true }, {
 	get() {
 		const { rid, userId } = this.queryParams;
 		let { ignore = false } = this.queryParams;
-		
+
 		ignore = typeof ignore === typeof '' ? /true|1/.test(ignore) : ignore;
 
 		if (!rid || !rid.trim()) {

From b5ad5ad182ba1832a37dac868d7b49efb6e5287d Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 20 Apr 2018 01:04:16 -0300
Subject: [PATCH 15/20] fix review

---
 .meteor/.id                                               | 7 +++++++
 packages/rocketchat-api/server/v1/chat.js                 | 7 ++++---
 .../server/lib/sendNotificationsOnMessage.js              | 2 +-
 packages/rocketchat-ui-flextab/client/tabs/membersList.js | 2 +-
 packages/rocketchat-ui/client/lib/RoomHistoryManager.js   | 8 ++++++--
 packages/rocketchat-ui/client/lib/RoomManager.js          | 4 +---
 6 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 .meteor/.id

diff --git a/.meteor/.id b/.meteor/.id
new file mode 100644
index 0000000000000..4e5f3362f72d1
--- /dev/null
+++ b/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+u4k2dnt1ek.uewj3t4xsn4
diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
index 5f7bbce045f7c..c53f25f8b251c 100644
--- a/packages/rocketchat-api/server/v1/chat.js
+++ b/packages/rocketchat-api/server/v1/chat.js
@@ -321,18 +321,19 @@ RocketChat.API.v1.addRoute('chat.reportMessage', { authRequired: true }, {
 RocketChat.API.v1.addRoute('chat.ignoreUser', { authRequired: true }, {
 	get() {
 		const { rid, userId } = this.queryParams;
-		let { ignore = false } = this.queryParams;
+		let { ignore = true } = this.queryParams;
 
-		ignore = typeof ignore === typeof '' ? /true|1/.test(ignore) : ignore;
+		ignore = typeof ignore === 'string' ? /true|1/.test(ignore) : ignore;
 
 		if (!rid || !rid.trim()) {
 			throw new Meteor.Error('error-room-id-param-not-provided', 'The required "rid" param is missing.');
 		}
+
 		if (!userId || !userId.trim()) {
 			throw new Meteor.Error('error-user-id-param-not-provided', 'The required "userId" param is missing.');
 		}
 
-		Meteor.runAsUser(this.userId, () => Meteor.call('ignoreUser', { rid, userId, ignore}));
+		Meteor.runAsUser(this.userId, () => Meteor.call('ignoreUser', { rid, userId, ignore }));
 
 		return RocketChat.API.v1.success();
 	}
diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index 59aacad37d177..33532cb036a9c 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -222,7 +222,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room, userId) {
 			return;
 		}
 
-		if (subscription.ignored && subscription.ignored.find(message.u._id)) {
+		if (Array.isArray(subscription.ignored) && subscription.ignored.find(message.u._id)) {
 			return;
 		}
 
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
index a63db3624981e..1a9f8ec571d71 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -81,7 +81,7 @@ Template.membersList.helpers({
 		}
 		// show online users first.
 		// sortBy is stable, so we can do this
-		users = _.sortBy(users, u => u.status ===	 'offline');
+		users = _.sortBy(users, u => u.status === 'offline');
 
 		let hasMore = undefined;
 		const usersLimit = Template.instance().usersLimit.get();
diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
index 5075e6230b2a9..13388570c6462 100644
--- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
@@ -132,7 +132,9 @@ export const RoomHistoryManager = new class {
 		if (ts) {
 			return Meteor.call('loadNextMessages', rid, ts, limit, function(err, result) {
 				for (const msg of Array.from((result != null ? result.messages : undefined) || [])) {
-					if (msg.t !== 'command') { upsertMessage({msg, subscription}); }
+					if (msg.t !== 'command') {
+						upsertMessage({msg, subscription});
+					}
 				}
 
 				Meteor.defer(() => RoomManager.updateMentionsMarksOfRoom(typeName));
@@ -189,7 +191,9 @@ export const RoomHistoryManager = new class {
 
 			return Meteor.call('loadSurroundingMessages', message, limit, function(err, result) {
 				for (const msg of Array.from((result != null ? result.messages : undefined) || [])) {
-					if (msg.t !== 'command') { upsertMessage({msg, subscription}); }
+					if (msg.t !== 'command') {
+						upsertMessage({msg, subscription});
+					}
 				}
 
 				Meteor.defer(function() {
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index 382ddc6f42710..42342cc5361ea 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -224,9 +224,7 @@ const loadMissedMessages = function(rid) {
 	}
 	const subscription = ChatSubscription.findOne({rid});
 	return Meteor.call('loadMissedMessages', rid, lastMessage.ts, (err, result) =>
-		Array.from(result).map(item =>
-			RocketChat.promises.run('onClientMessageReceived', item).then(msg => upsertMessage({msg, subscription})
-			))
+		Array.from(result).map(item => RocketChat.promises.run('onClientMessageReceived', item).then(msg => upsertMessage({msg, subscription})))
 	);
 };
 

From c84cc2840abc94e1bb3c6b2b55cb52e9a440ce0c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 20 Apr 2018 01:04:48 -0300
Subject: [PATCH 16/20] fix review

---
 .meteor/.id | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .meteor/.id

diff --git a/.meteor/.id b/.meteor/.id
deleted file mode 100644
index 4e5f3362f72d1..0000000000000
--- a/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-u4k2dnt1ek.uewj3t4xsn4

From 14927de55640afc927b61a6d682090246574ac4d Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 20 Apr 2018 04:11:35 -0300
Subject: [PATCH 17/20] fix css identation

---
 .../rocketchat-theme/client/imports/components/messages.css     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 954a02ed52f21..8f1af7f5ac623 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -54,7 +54,7 @@
 			display: block;
 		}
 		& + .message--ignored.sequential {
-	    display: none;
+	    		display: none;
 		}
 	}
 

From 2ab6f5e561b9d35f1c7009839fd4ecce3ccead41 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 20 Apr 2018 04:12:08 -0300
Subject: [PATCH 18/20] fix more css identation

---
 .../rocketchat-theme/client/imports/components/messages.css     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 8f1af7f5ac623..1c76d40f33656 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -54,7 +54,7 @@
 			display: block;
 		}
 		& + .message--ignored.sequential {
-	    		display: none;
+			display: none;
 		}
 	}
 

From b564b203ba337e3810eaa736b8f1f0e002ccb6f5 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 20 Apr 2018 09:59:54 -0300
Subject: [PATCH 19/20] check if ignore param is a boolean

---
 .meteor/.id                  | 7 +++++++
 server/methods/ignoreUser.js | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 .meteor/.id

diff --git a/.meteor/.id b/.meteor/.id
new file mode 100644
index 0000000000000..a8a7371230363
--- /dev/null
+++ b/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+uv023yqxe89l.pp6vn0zgr0oi
diff --git a/server/methods/ignoreUser.js b/server/methods/ignoreUser.js
index 72bf53e41a1c3..15b738d3571c4 100644
--- a/server/methods/ignoreUser.js
+++ b/server/methods/ignoreUser.js
@@ -4,6 +4,7 @@ Meteor.methods({
 	ignoreUser({rid, userId: ignoredUser, ignore = true}) {
 		check(ignoredUser, String);
 		check(rid, String);
+		check(ignore, Boolean);
 
 		const userId = Meteor.userId();
 		if (!userId) {

From 2867de75274c6ec2f97522829817ee9c42b5d044 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 20 Apr 2018 18:53:21 -0300
Subject: [PATCH 20/20] remove file metor.id

---
 .meteor/.id | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .meteor/.id

diff --git a/.meteor/.id b/.meteor/.id
deleted file mode 100644
index a8a7371230363..0000000000000
--- a/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-uv023yqxe89l.pp6vn0zgr0oi