From bdb8618a3a227ce80ec8e45bfd8a420f74938e81 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 24 Nov 2022 13:25:47 -0700 Subject: [PATCH] Flip condition around for finding `m.markup` --- synapse/push/bulk_push_rule_evaluator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index af397e2baae3..ad20269422fb 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -450,9 +450,9 @@ def _flatten_dict( ): # Room supports extensible events: replace `content.body` with the plain text # representation from `m.markup`, as per MSC1767. - markup = d.get("content").get("org.matrix.msc1767.markup") - if room_version.disposition == RoomDisposition.STABLE: - markup = d.get("content").get("m.markup") + markup = d.get("content").get("m.markup") + if room_version.identifier.startswith("org.matrix.msc1767."): + markup = d.get("content").get("org.matrix.msc1767.markup") if markup is not None and isinstance(markup, list): text = "" for rep in markup: