Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Event/RoomDelegate: consider RoomEncrypted- events

Browse Source
This commit is contained in:
miruka 2019-11-04 14:45:20 -04:00
parent 2d682516e8
commit 6586403985
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qml/Chat/Timeline/EventDelegate.qml
View File

@ -37,14 +37,18 @@ Column {
readonly property bool smallAvatar: readonly property bool smallAvatar:
eventList.canCombine(model, nextItem) && eventList.canCombine(model, nextItem) &&
(model.event_type === "RoomMessageEmote" || (model.event_type === "RoomMessageEmote" ||
! model.event_type.startsWith("RoomMessage")) ! (model.event_type.startsWith("RoomMessage") ||
model.event_type.startsWith("RoomEncrypted")))
readonly property bool collapseAvatar: combine readonly property bool collapseAvatar: combine
readonly property bool hideAvatar: onRight readonly property bool hideAvatar: onRight
readonly property bool hideNameLine: readonly property bool hideNameLine:
model.event_type === "RoomMessageEmote" || model.event_type === "RoomMessageEmote" ||
! model.event_type.startsWith("RoomMessage") || ! (
model.event_type.startsWith("RoomMessage") ||
model.event_type.startsWith("RoomEncrypted")
) ||
onRight || onRight ||
combine combine

3
src/qml/SidePane/RoomDelegate.qml
View File

@ -73,7 +73,8 @@ HTileDelegate {
// If it's an emote or non-message/media event // If it's an emote or non-message/media event
if (ev.event_type === "RoomMessageEmote" || if (ev.event_type === "RoomMessageEmote" ||
! ev.event_type.startsWith("RoomMessage")) { (! ev.event_type.startsWith("RoomMessage") &&
! ev.event_type.startsWith("RoomEncrypted"))) {
return Utils.processedEventText(ev) return Utils.processedEventText(ev)
} }