{{#if isSnippet}}
{{_ "Snippet_name"}}: {{snippetName}}
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index 220ff95b5c90a..14e376b2f842f 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -6,6 +6,12 @@ Template.message.helpers({
encodeURI(text) {
return encodeURI(text);
},
+ isIgnored() {
+ return this.ignored;
+ },
+ ignoredClass() {
+ return this.ignored ? 'message--ignored' : '';
+ },
isBot() {
if (this.bot != null) {
return 'bot';
@@ -47,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/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
index 6be9d25efcf55..13388570c6462 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,14 +131,9 @@ 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});
}
}
@@ -190,14 +190,9 @@ 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});
}
}
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index 89348ba0a0221..42342cc5361ea 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,9 @@ 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 +297,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 && sub.ignored) {
+ ChatMessage.update({rid: sub.rid, t: {$ne: 'command'}, 'u._id': { $in : sub.ignored }}, { $set: {ignored : true}}, {multi : true});
+ }
+});
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 2d2dc51f6b898..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')
@@ -722,9 +723,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');
}
});
diff --git a/server/methods/ignoreUser.js b/server/methods/ignoreUser.js
new file mode 100644
index 0000000000000..15b738d3571c4
--- /dev/null
+++ b/server/methods/ignoreUser.js
@@ -0,0 +1,30 @@
+/* globals RocketChat */
+
+Meteor.methods({
+ ignoreUser({rid, userId: ignoredUser, ignore = true}) {
+ check(ignoredUser, String);
+ check(rid, String);
+ check(ignore, Boolean);
+
+ 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({