Merge remote-tracking branch 'origin/master' into new-event-store

Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp

1 files changed, 18 insertions, 0 deletions

diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml

index 9630ae3a..7b6e0703 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -97,6 +97,24 @@ Item {
 			}
 		}
 		DelegateChoice {
+			roleValue: MtxEvent.CallInvite
+			NoticeMessage {
+				text: qsTr("%1 placed a %2 call.").arg(model.data.userName).arg(model.data.callType)
+			}
+		}
+		DelegateChoice {
+			roleValue: MtxEvent.CallAnswer
+			NoticeMessage {
+				text: qsTr("%1 answered the call.").arg(model.data.userName)
+			}
+		}
+		DelegateChoice {
+			roleValue: MtxEvent.CallHangUp
+			NoticeMessage {
+				text: qsTr("%1 ended the call.").arg(model.data.userName)
+			}
+		}
+		DelegateChoice {
 			// TODO: make a more complex formatter for the power levels.
 			roleValue: MtxEvent.PowerLevels
 			NoticeMessage {