matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

Fix the MessagePanel test

Browse Source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
turt2live
2017-09-14 20:47:24 -06:00
parent 3c71898237
commit 0363f73e28
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/autocomplete/CommandProvider.js
View File

@@ -97,12 +97,12 @@ const COMMANDS = [
{
command: '/ignore',
args: '<user-id>',
description: 'Ignores a user, hiding their messages from you'
description: 'Ignores a user, hiding their messages from you',
},
{
command: '/unignore',
args: '<user-id>',
description: 'Stops ignoring a user, showing their messages going forward'
description: 'Stops ignoring a user, showing their messages going forward',
},
// Omitting `/markdown` as it only seems to apply to OldComposer
];

2
src/components/structures/MessagePanel.js
View File

@@ -241,7 +241,7 @@ module.exports = React.createClass({
// TODO: Implement granular (per-room) hide options
_shouldShowEvent: function(mxEv) {
if (MatrixClientPeg.get().isUserIgnored(mxEv.sender.userId)) {
if (mxEv.sender && MatrixClientPeg.get().isUserIgnored(mxEv.sender.userId)) {
return false; // ignored = no show (only happens if the ignore happens after an event was received)
}