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

2
src/components/views/messages/MessageActionBar.tsx
View file

@ -189,7 +189,7 @@ const ReplyInThreadButton = ({ mxEvent }: IReplyInThreadButton) => {
action: Action.ViewUserSettings,
initialTabId: UserTab.Labs,
});
} else if (mxEvent.isThreadRelation) {
} else if (mxEvent.getThread() && !mxEvent.isThreadRoot) {
showThread({
rootEvent: mxEvent.getThread().rootEvent,
initialEvent: mxEvent,

4
src/components/views/rooms/SendMessageComposer.tsx
View file

@ -285,8 +285,8 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
let shouldReact = true;
const lastMessage = events[i];
const userId = MatrixClientPeg.get().getUserId();
const messageReactions = this.props.room.getUnfilteredTimelineSet()
.getRelationsForEvent(lastMessage.getId(), RelationType.Annotation, EventType.Reaction);
const messageReactions = this.props.room.relations
.getChildEventsForEvent(lastMessage.getId(), RelationType.Annotation, EventType.Reaction);
// if we have already sent this reaction, don't redact but don't re-send
if (messageReactions) {