diff options
| author | dec05eba <dec05eba@protonmail.com> | 2021-01-25 00:27:52 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2021-01-25 00:27:52 +0100 |
| commit | 82d4273e445b85e15fe12caaa52c301fa77aaa6c (patch) | |
| tree | 3420ee2dbba9c294ce4770927f5aeeef91bb98c3 /src/QuickMedia.cpp | |
| parent | 6a6d55fa1ba3797fb854ed2335129917f58c9d6a (diff) | |
Matrix: edited message replies to user should still be red... and join event more blalbalba whatever
Diffstat (limited to 'src/QuickMedia.cpp')
| -rw-r--r-- | src/QuickMedia.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 4cf4b09..41c2c6e 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -3231,6 +3231,7 @@ namespace QuickMedia { body_item->set_description("Message deleted"); body_item->set_description_color(sf::Color::White); body_item->thumbnail_size = sf::Vector2i(32, 32); + body_item->url.clear(); }; // TODO: Optimize with hash map? @@ -3251,8 +3252,9 @@ namespace QuickMedia { if(message->related_event_type == RelatedEventType::REDACTION) { set_body_as_deleted(message.get(), body_item.get()); } else { + Message *orig_message = static_cast<Message*>(body_item->userdata); body_item->set_description(message_get_body_remove_formatting(message.get())); - if(message_contains_user_mention(message->body, my_display_name) || message_contains_user_mention(message->body, me->user_id)) + if(message_contains_user_mention(message->body, my_display_name) || message_contains_user_mention(message->body, me->user_id) || (orig_message && orig_message->user == me)) body_item->set_description_color(sf::Color(255, 100, 100)); else body_item->set_description_color(sf::Color::White); @@ -3285,8 +3287,9 @@ namespace QuickMedia { if(message->related_event_type == RelatedEventType::REDACTION) { set_body_as_deleted(message.get(), body_item.get()); } else { + Message *orig_message = static_cast<Message*>(body_item->userdata); body_item->set_description(message_get_body_remove_formatting(message.get())); - if(message_contains_user_mention(message->body, my_display_name) || message_contains_user_mention(message->body, me->user_id)) + if(message_contains_user_mention(message->body, my_display_name) || message_contains_user_mention(message->body, me->user_id) || (orig_message && orig_message->user == me)) body_item->set_description_color(sf::Color(255, 100, 100)); else body_item->set_description_color(sf::Color::White); |