Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Don't group blank membership changes #4160

Merged
merged 2 commits into from
Mar 4, 2020
Merged

Don't group blank membership changes #4160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d95f843
Don't group blank membership changes
turt2live Mar 3, 2020
b06a82e
Use textForEvent to determine if an event is worth rendering
turt2live Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/components/structures/MessagePanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {MatrixClientPeg} from '../../MatrixClientPeg';
import SettingsStore from '../../settings/SettingsStore';
import {_t} from "../../languageHandler";
import {haveTileForEvent} from "../views/rooms/EventTile";
import {textForEvent} from "../../TextForEvent";

const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
const continuedTypes = ['m.sticker', 'm.room.message'];
Expand Down Expand Up @@ -962,6 +963,13 @@ class MemberGrouper {
}

add(ev) {
if (ev.getType() === 'm.room.member') {
// We'll just double check that it's worth our time to do so, through an
// ugly hack. If textForEvent returns something, we should group it for
// rendering but if it doesn't then we'll exclude it.
const renderText = textForEvent(ev);
if (!renderText || renderText.trim().length === 0) return; // quietly ignore
}
this.readMarker = this.readMarker || this.panel._readMarkerForEvent(ev.getId());
this.events.push(ev);
}
Expand Down