apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BREAK] Hide system messages (#16243)

Browse Source
pull/16388/head
Maria Eduarda Cunha 6 years ago committed by GitHub
parent 060bf9fb3e
commit abccdb09f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 223 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 30
      app/lib/server/functions/loadMessageHistory.js
  2. 3
      app/lib/server/methods/saveSettings.js
  3. 64
      app/lib/server/startup/settings.js
  4. 27
      app/ui/client/views/app/room.js
  5. 2
      client/components/admin/settings/Setting.js
  6. 58
      client/components/admin/settings/inputs/MultiSelectSettingInput.js
  7. 57
      client/components/admin/settings/inputs/MultiSelectSettingInput.stories.js
  8. 17
      package-lock.json
  9. 9
      packages/rocketchat-i18n/i18n/en.i18n.json
  10. 21
      server/methods/loadHistory.js
  11. 1
      server/startup/migrations/index.js
  12. 17
      server/startup/migrations/v172.js

30
app/lib/server/functions/loadMessageHistory.js
Unescape View File

@ -2,23 +2,12 @@ import { settings } from '../../../settings';
import { Messages } from '../../../models';
import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
const hideMessagesOfType = [];
const hideMessagesOfType = new Set();
settings.get(/Message_HideType_.+/, function(key, value) {
const type = key.replace('Message_HideType_', '');
const types = type === 'mute_unmute' ? ['user-muted', 'user-unmuted'] : [type];
return types.forEach((type) => {
const index = hideMessagesOfType.indexOf(type);
if (value === true && index === -1) {
return hideMessagesOfType.push(type);
}
if (index > -1) {
return hideMessagesOfType.splice(index, 1);
}
});
settings.get('Hide_System_Messages', function(key, values) {
const hiddenTypes = values.reduce((array, value) => [...array, ...value === 'mute_unmute' ? ['user-muted', 'user-unmuted'] : [value]], []);
hideMessagesOfType.clear();
hiddenTypes.forEach((item) => hideMessagesOfType.add(item));
});
export const loadMessageHistory = function loadMessageHistory({ userId, rid, end, limit = 20, ls }) {
@ -35,12 +24,7 @@ export const loadMessageHistory = function loadMessageHistory({ userId, rid, end
};
}
let records;
if (end != null) {
records = Messages.findVisibleByRoomIdBeforeTimestampNotContainingTypes(rid, end, hideMessagesOfType, options).fetch();
} else {
records = Messages.findVisibleByRoomIdNotContainingTypes(rid, hideMessagesOfType, options).fetch();
}
const records = end != null ? Messages.findVisibleByRoomIdBeforeTimestampNotContainingTypes(rid, end, Array.from(hideMessagesOfType.values()), options).fetch() : Messages.findVisibleByRoomIdNotContainingTypes(rid, Array.from(hideMessagesOfType.values()), options).fetch();
const messages = normalizeMessagesForUser(records, userId);
let unreadNotLoaded = 0;
let firstUnread;
@ -51,7 +35,7 @@ export const loadMessageHistory = function loadMessageHistory({ userId, rid, end
if ((firstMessage != null ? firstMessage.ts : undefined) > ls) {
delete options.limit;
const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestampsNotContainingTypes(rid, ls, firstMessage.ts, hideMessagesOfType, {
const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestampsNotContainingTypes(rid, ls, firstMessage.ts, Array.from(hideMessagesOfType.values()), {
limit: 1,
sort: {
ts: 1,

3
app/lib/server/methods/saveSettings.js
Unescape View File

@ -37,6 +37,9 @@ Meteor.methods({
case 'int':
check(value, Number);
break;
case 'multiSelect':
check(value, Array);
break;
default:
check(value, String);
break;

64
app/lib/server/startup/settings.js
Unescape View File

@ -1093,28 +1093,56 @@ settings.addGroup('Message', function() {
type: 'int',
public: true,
});
this.add('Message_HideType_uj', false, {
type: 'boolean',
public: true,
});
this.add('Message_HideType_ul', false, {
type: 'boolean',
public: true,
});
this.add('Message_HideType_ru', false, {
type: 'boolean',
public: true,
});
this.add('Message_HideType_au', false, {
type: 'boolean',
public: true,
});
this.add('Message_HideType_mute_unmute', false, {
type: 'boolean',
this.add('Hide_System_Messages', [], {
type: 'multiSelect',
public: true,
values: [
{
key: 'uj',
i18nLabel: 'Message_HideType_uj',
}, {
key: 'ul',
i18nLabel: 'Message_HideType_ul',
}, {
key: 'ru',
i18nLabel: 'Message_HideType_ru',
}, {
key: 'au',
i18nLabel: 'Message_HideType_au',
}, {
key: 'mute_unmute',
i18nLabel: 'Message_HideType_mute_unmute',
}, {
key: 'r',
i18nLabel: 'Message_HideType_r',
}, {
key: 'ut',
i18nLabel: 'Message_HideType_ut',
}, {
key: 'wm',
i18nLabel: 'Message_HideType_wm',
}, {
key: 'rm',
i18nLabel: 'Message_HideType_rm',
}, {
key: 'subscription_role_added',
i18nLabel: 'Message_HideType_subscription_role_added',
}, {
key: 'subscription_role_removed',
i18nLabel: 'Message_HideType_subscription_role_removed',
}, {
key: 'room_archived',
i18nLabel: 'Message_HideType_room_archived',
}, {
key: 'room_unarchived',
i18nLabel: 'Message_HideType_room_unarchived',
},
],
});
this.add('Message_ErasureType', 'Delete', {
type: 'select',
public: true,

27
app/ui/client/views/app/room.js
Unescape View File

@ -296,27 +296,8 @@ Template.room.helpers({
messagesHistory() {
const { rid } = Template.instance();
const hideMessagesOfType = [];
settings.collection.find({ _id: /Message_HideType_.+/ }).forEach(function(record) {
let types;
const type = record._id.replace('Message_HideType_', '');
switch (type) {
case 'mute_unmute':
types = ['user-muted', 'user-unmuted'];
break;
default:
types = [type];
}
return types.forEach(function(type) {
const index = hideMessagesOfType.indexOf(type);
if ((record.value === true) && (index === -1)) {
hideMessagesOfType.push(type);
} else if (index > -1) {
hideMessagesOfType.splice(index, 1);
}
});
});
const { value: settingValues = [] } = settings.collection.findOne('Hide_System_Messages') || {};
const hideMessagesOfType = new Set(settingValues.reduce((array, value) => [...array, ...value === 'mute_unmute' ? ['user-muted', 'user-unmuted'] : [value]], []));
const modes = ['', 'cozy', 'compact'];
const viewMode = getUserPreference(Meteor.userId(), 'messageViewMode');
@ -326,8 +307,8 @@ Template.room.helpers({
...(ignoreReplies || modes[viewMode] === 'compact') && { tmid: { $exists: 0 } },
};
if (hideMessagesOfType.length > 0) {
query.t = { $nin: hideMessagesOfType };
if (hideMessagesOfType.size) {
query.t = { $nin: Array.from(hideMessagesOfType.values()) };
}
const options = {

2
client/components/admin/settings/Setting.js
Unescape View File

@ -11,6 +11,7 @@ import { RelativeUrlSettingInput } from './inputs/RelativeUrlSettingInput';
import { PasswordSettingInput } from './inputs/PasswordSettingInput';
import { IntSettingInput } from './inputs/IntSettingInput';
import { SelectSettingInput } from './inputs/SelectSettingInput';
import { MultiSelectSettingInput } from './inputs/MultiSelectSettingInput';
import { LanguageSettingInput } from './inputs/LanguageSettingInput';
import { ColorSettingInput } from './inputs/ColorSettingInput';
import { FontSettingInput } from './inputs/FontSettingInput';
@ -37,6 +38,7 @@ export const MemoizedSetting = memo(function MemoizedSetting({
password: PasswordSettingInput,
int: IntSettingInput,
select: SelectSettingInput,
multiSelect: MultiSelectSettingInput,
language: LanguageSettingInput,
color: ColorSettingInput,
font: FontSettingInput,

58
client/components/admin/settings/inputs/MultiSelectSettingInput.js
Unescape View File

@ -0,0 +1,58 @@
import { Field, Flex, Box, MultiSelectFiltered, MultiSelect } from '@rocket.chat/fuselage';
import React from 'react';
import { useTranslation } from '../../../../contexts/TranslationContext';
import { ResetSettingButton } from '../ResetSettingButton';
export function MultiSelectSettingInput({
_id,
label,
value = [],
placeholder,
readonly,
disabled,
values = [],
hasResetButton,
onChangeValue,
onResetButtonClick,
autocomplete,
}) {
const t = useTranslation();
const handleChange = (value) => {
onChangeValue && onChangeValue(value);
// onChangeValue && onChangeValue([...event.currentTarget.querySelectorAll('option')].filter((e) => e.selected).map((el) => el.value));
};
const Component = autocomplete ? MultiSelectFiltered : MultiSelect;
return (
<>
<Flex.Container>
<Box>
<Field.Label htmlFor={_id} title={_id}>
{label}
</Field.Label>
{hasResetButton && (
<ResetSettingButton
data-qa-reset-setting-id={_id}
onClick={onResetButtonClick}
/>
)}
</Box>
</Flex.Container>
<Component
data-qa-setting-id={_id}
id={_id}
value={value}
placeholder={placeholder}
disabled={disabled}
readOnly={readonly}
// autoComplete={autocomplete === false ? 'off' : undefined}
onChange={handleChange}
options={values.map(({ key, i18nLabel }) => [
key,
t(i18nLabel),
])}
/>
</>
);
}

57
client/components/admin/settings/inputs/MultiSelectSettingInput.stories.js
Unescape View File

@ -0,0 +1,57 @@
import { Field } from '@rocket.chat/fuselage';
import { action } from '@storybook/addon-actions';
import React from 'react';
import { MultiSelectSettingInput } from './MultiSelectSettingInput';
export default {
title: 'admin/settings/inputs/MultiSelectSettingInput',
component: MultiSelectSettingInput,
decorators: [
(storyFn) => <Field>{storyFn()}</Field>,
],
};
const options = [
{ key: '1', i18nLabel: '1' },
{ key: '2', i18nLabel: '2' },
{ key: '3', i18nLabel: '3' },
];
export const _default = () =>
<MultiSelectSettingInput
_id='setting_id'
label='Label'
placeholder='Placeholder'
values={options}
onChangeValue={action('changeValue')}
onChangeEditor={action('changeEditor')}
/>;
export const disabled = () =>
<MultiSelectSettingInput
_id='setting_id'
label='Label'
placeholder='Placeholder'
values={options}
disabled
/>;
export const withValue = () =>
<MultiSelectSettingInput
_id='setting_id'
label='Label'
placeholder='Placeholder'
value='1'
values={options}
/>;
export const withResetButton = () =>
<MultiSelectSettingInput
_id='setting_id'
label='Label'
placeholder='Placeholder'
values={options}
hasResetButton
onChangeValue={action('changeValue')}
onResetButtonClick={action('resetButtonClick')}
/>;

17
package-lock.json generated
Unescape View File

@ -26800,9 +26800,9 @@
"dev": true
},
"prismjs": {
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz",
"integrity": "sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==",
"version": "1.18.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.18.0.tgz",
"integrity": "sha512-N0r3i/Cto516V8+GKKamhsPVZSFcO0TMUBtIDW6uq6BVqoC3FNtZVZ+cmH16N2XtGQlgRN+sFUTjOdCsEP51qw==",
"dev": true,
"requires": {
"clipboard": "^2.0.0"
@ -28145,6 +28145,17 @@
"hastscript": "^5.0.0",
"parse-entities": "^1.1.2",
"prismjs": "~1.17.0"
},
"dependencies": {
"prismjs": {
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz",
"integrity": "sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==",
"dev": true,
"requires": {
"clipboard": "^2.0.0"
}
}
}
},
"regenerate": {

9
packages/rocketchat-i18n/i18n/en.i18n.json
Unescape View File

@ -2215,6 +2215,15 @@
"Message_HideType_ru": "Hide \"User Removed\" messages",
"Message_HideType_uj": "Hide \"User Join\" messages",
"Message_HideType_ul": "Hide \"User Leave\" messages",
"Message_HideType_r": "Hide \"Room Name Changed\" messages",
"Message_HideType_ut": "Hide \"User Joined Conversation\" messages",
"Message_HideType_wm": "Hide \"Welcome\" messages",
"Message_HideType_rm": "Hide \"Message Removed\" messages",
"Message_HideType_subscription_role_added": "Hide \"Was Set Role\" messages",
"Message_HideType_subscription_role_removed": "Hide \"Role No Longer Defined\" messages",
"Message_HideType_room_archived": "Hide \"Room Archived\" messages",
"Message_HideType_room_unarchived": "Hide \"Room Unarchived\" messages",
"Hide_System_Messages": "Hide System Messages",
"Message_Id": "Message Id",
"Message_Ignored": "This message was ignored",
"Message_info": "Message info",

21
server/methods/loadHistory.js
Unescape View File

@ -6,23 +6,12 @@ import { hasPermission } from '../../app/authorization';
import { settings } from '../../app/settings';
import { loadMessageHistory } from '../../app/lib';
const hideMessagesOfType = [];
const hideMessagesOfType = new Set();
settings.get(/Message_HideType_.+/, function(key, value) {
const type = key.replace('Message_HideType_', '');
const types = type === 'mute_unmute' ? ['user-muted', 'user-unmuted'] : [type];
return types.forEach((type) => {
const index = hideMessagesOfType.indexOf(type);
if (value === true && index === -1) {
return hideMessagesOfType.push(type);
}
if (index > -1) {
return hideMessagesOfType.splice(index, 1);
}
});
settings.get('Hide_System_Messages', function(key, values) {
const hiddenTypes = values.reduce((array, value) => [...array, ...value === 'mute_unmute' ? ['user-muted', 'user-unmuted'] : [value]], []);
hideMessagesOfType.clear();
hiddenTypes.forEach((item) => hideMessagesOfType.add(item));
});
Meteor.methods({

1
server/startup/migrations/index.js
Unescape View File

@ -169,4 +169,5 @@ import './v168';
import './v169';
import './v170';
import './v171';
import './v172';
import './xrun';

17
server/startup/migrations/v172.js
Unescape View File

@ -0,0 +1,17 @@
import {
Migrations,
} from '../../../app/migrations';
import {
Settings,
} from '../../../app/models';
Migrations.add({
version: 172,
up() {
const settings = Settings.find({ _id: /Message_HideType_.*/i }).fetch();
Settings.update({ _id: 'Hide_System_Messages' }, { $set: { value: settings.filter((setting) => setting.value).map((setting) => setting._id.replace('Message_HideType_')) } });
Settings.remove({ _id: /Message_HideType_.*/i }, { multi: true });
},
});
Write Preview
Loading…
Cancel
Save