Merge remote-tracking branch 'origin/master' into cross-signing

1 files changed, 6 insertions, 2 deletions

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

index ff025730..a5cb2ae7 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -36,7 +36,7 @@ Item {
 		DelegateChoice {
 			roleValue: MtxEvent.EmoteMessage
 			NoticeMessage {
-				formatted: chat.model.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
+				formatted: TimelineManager.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
 				color: TimelineManager.userColor(modelData.userId, colors.window)
 			}
 		}
@@ -99,7 +99,11 @@ Item {
 		DelegateChoice {
 			roleValue: MtxEvent.CallInvite
 			NoticeMessage {
-				text: qsTr("%1 placed a %2 call.").arg(model.data.userName).arg(model.data.callType)
+				text: switch(model.data.callType) {
+					case "voice": return qsTr("%1 placed a voice call.").arg(model.data.userName)
+					case "video": return qsTr("%1 placed a video call.").arg(model.data.userName)
+					default: return qsTr("%1 placed a call.").arg(model.data.userName)
+				}
 			}
 		}
 		DelegateChoice {