Merge pull request #5817 from vector-im/ismail/5816_reply_fallback

Extend Reply Fallbacks to non-thread Events
element-hq · Mar 15, 2022 · 0d5bd23 · 0d5bd23
2 parents a0f45a2 + 07d734b
commit 0d5bd23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1261,7 +1261,7 @@ - (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event withRoomState
                     isHTML =YES;
                     MXJSONModelSetString(body, event.content[@"formatted_body"]);
                 }
-                else if (eventThreadId && !RiotSettings.shared.enableThreads)
+                else if (event.isReplyEvent || (eventThreadId && !RiotSettings.shared.enableThreads))
                 {
                     NSString *repliedEventId = event.relatesTo.inReplyTo.eventId ?: eventThreadId;
                     isHTML = YES;
@@ -2067,7 +2067,7 @@ - (UIColor*)textColorForEvent:(MXEvent*)event
         textColor = _errorTextColor;
     }
     // Check whether the message is highlighted.
-    else if (event.mxkIsHighlighted || (!RiotSettings.shared.enableThreads && event.isInThread && [event shouldBeHighlightedInSession:mxSession]))
+    else if (event.mxkIsHighlighted || (mxSession && [event shouldBeHighlightedInSession:mxSession]))
     {
         textColor = _bingTextColor;
     }
@@ -2132,7 +2132,7 @@ - (UIFont*)fontForEvent:(MXEvent*)event string:(NSString*)string
     {
         font = _callNoticesTextFont;
     }
-    else if (event.mxkIsHighlighted || (!RiotSettings.shared.enableThreads && event.isInThread && [event shouldBeHighlightedInSession:mxSession]))
+    else if (event.mxkIsHighlighted || (mxSession && [event shouldBeHighlightedInSession:mxSession]))
     {
         font = _bingTextFont;
     }

diff --git a/changelog.d/5816.change b/changelog.d/5816.change
@@ -0,0 +1 @@
+MXKEventFormatter: Extend reply fallback for also non-thread events.