imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use updates stable relations from js-sdk (#8715)

Browse source 
* Use updates stable relations from js-sdk

* Relations is now accessible on the Room instead

* Reuse more existing code and ditch confusing `isThreadRelation`

* Fix last usage of removed `isThreadRelation`

* Update tests to match removal of isThreadRelation

* Tweak method naming to closer match spec

* Fix missing method name change
This commit is contained in:
Michael Telatynski 2022-06-07 11:16:54 +01:00 • committed by GitHub
parent 56b0b79fb7
commit 21d0aaf524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/components/structures/MessagePanel.tsx
View file

@ -469,12 +469,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
// TODO: Implement granular (per-room) hide options
public shouldShowEvent(mxEv: MatrixEvent, forceHideEvents = false): boolean {
if (this.props.hideThreadedMessages && this.threadsEnabled) {
if (mxEv.isThreadRelation) {
return false;
}
if (this.shouldLiveInThreadOnly(mxEv)) {
if (this.props.hideThreadedMessages && this.threadsEnabled && this.props.room) {
const { shouldLiveInRoom } = this.props.room.eventShouldLiveIn(mxEv, this.props.events);
if (!shouldLiveInRoom) {
return false;
}
}
@ -497,24 +494,6 @@ export default class MessagePanel extends React.Component<IProps, IState> {
return !shouldHideEvent(mxEv, this.context);
}
private shouldLiveInThreadOnly(event: MatrixEvent): boolean {
const associatedId = event.getAssociatedId();
const targetsThreadRoot = event.threadRootId === associatedId;
if (event.isThreadRoot || targetsThreadRoot || !event.isThreadRelation) {
return false;
}
// If this is a reply, then we use the associated event to decide whether
// this should be thread only or not
const parentEvent = this.props.room.findEventById(associatedId);
if (parentEvent) {
return this.shouldLiveInThreadOnly(parentEvent);
} else {
return true;
}
}
public readMarkerForEvent(eventId: string, isLastEvent: boolean): ReactNode {
const visible = !isLastEvent && this.props.readMarkerVisible;