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

make hide joins/parts work for MELS and highlighted/permalink event

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2017-06-15 19:53:34 +01:00
parent c1cbdbcc4f
commit a0a4fe62d5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,12 +241,15 @@ module.exports = React.createClass({
// TODO: Implement granular (per-room) hide options // TODO: Implement granular (per-room) hide options
_shouldShowEvent: function(mxEv) { _shouldShowEvent: function(mxEv) {
console.log("_shouldShowEvent " + mxEv.getId()); console.log("_shouldShowEvent ", mxEv.getId(), mxEv);
const EventTile = sdk.getComponent('rooms.EventTile'); const EventTile = sdk.getComponent('rooms.EventTile');
if (!EventTile.haveTileForEvent(mxEv)) { if (!EventTile.haveTileForEvent(mxEv)) {
return false; // no tile = no show return false; // no tile = no show
} }
// Always show highlighted event
if (this.props.highlightedEventId === mxEv.getId()) return true;
const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined; const isMemberEvent = mxEv.getType() === "m.room.member" && mxEv.getStateKey() !== undefined;
if (!isMemberEvent) { if (!isMemberEvent) {
return true; // bail early: all the checks below concern member events only return true; // bail early: all the checks below concern member events only
@ -365,7 +368,7 @@ module.exports = React.createClass({
let collapsedMxEv = this.props.events[i + 1]; let collapsedMxEv = this.props.events[i + 1];
// Ignore redacted member events // Ignore redacted member events
if (!EventTile.haveTileForEvent(collapsedMxEv)) { if (!EventTile.haveTileForEvent(collapsedMxEv) || !this._shouldShowEvent(collapsedMxEv)) {
continue; continue;
} }