From 33885cb864512e12df55d5dbb66a02565cfe9d4b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 15 May 2019 13:46:32 +0100 Subject: [PATCH] Use `getRelation` helper Use the `getRelation` helper to ensure we always read relation info from the wire content as required in E2E rooms. --- src/components/views/elements/ReplyThread.js | 5 +++++ src/components/views/messages/ReactionDimension.js | 2 +- src/components/views/messages/ReactionsRow.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js index f3cd6e144d..ab7b1abb1c 100644 --- a/src/components/views/elements/ReplyThread.js +++ b/src/components/views/elements/ReplyThread.js @@ -63,6 +63,11 @@ export default class ReplyThread extends React.Component { static getParentEventId(ev) { if (!ev || ev.isRedacted()) return; + // XXX: For newer relations (annotations, replacements, etc.), we now + // have a `getRelation` helper on the event, and you might assume it + // could be used here for replies as well... However, the helper + // currently assumes the relation has a `rel_type`, which older replies + // do not, so this block is left as-is for now. const mRelatesTo = ev.getWireContent()['m.relates_to']; if (mRelatesTo && mRelatesTo['m.in_reply_to']) { const mInReplyTo = mRelatesTo['m.in_reply_to']; diff --git a/src/components/views/messages/ReactionDimension.js b/src/components/views/messages/ReactionDimension.js index a0cf5a86ec..aa3813c30d 100644 --- a/src/components/views/messages/ReactionDimension.js +++ b/src/components/views/messages/ReactionDimension.js @@ -82,7 +82,7 @@ export default class ReactionDimension extends React.PureComponent { if (mxEvent.isRedacted()) { return false; } - return mxEvent.getContent()["m.relates_to"].key === option; + return mxEvent.getRelation().key === option; }); if (!reactionForOption) { continue; diff --git a/src/components/views/messages/ReactionsRow.js b/src/components/views/messages/ReactionsRow.js index ffb81e1a38..f4bd9781bc 100644 --- a/src/components/views/messages/ReactionsRow.js +++ b/src/components/views/messages/ReactionsRow.js @@ -101,7 +101,7 @@ export default class ReactionsRow extends React.PureComponent { if (mxEvent.isRedacted()) { return false; } - return mxEvent.getContent()["m.relates_to"].key === content; + return mxEvent.getRelation().key === content; }); return