diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml
index 5b002f5..c025ab3 100644
--- a/qml/components/MessageListViewItem.qml
+++ b/qml/components/MessageListViewItem.qml
@@ -279,8 +279,8 @@ ListItem {
forwardedThumbnail.photoData = (typeof otherUserInformation.profile_photo !== "undefined") ? otherUserInformation.profile_photo.small : "";
forwardedChannelText.text = Emoji.emojify(Functions.getUserName(otherUserInformation), Theme.fontSizeExtraSmall);
} else {
- forwardedThumbnail.photoData = "";
- forwardedChannelText.text = Emoji.emojify(myMessage.forward_info.origin.sender_user_name, Theme.fontSizeExtraSmall);
+ forwardedChannelText.text = Emoji.emojify(myMessage.forward_info.origin.sender_name, Theme.fontSizeExtraSmall);
+ forwardedThumbnail.photoData = {};
}
}
@@ -293,7 +293,7 @@ ListItem {
Column {
spacing: Theme.paddingSmall
- width: parent.width
+ width: parent.width - forwardedThumbnail.width - Theme.paddingSmall
Text {
font.pixelSize: Theme.fontSizeExtraSmall
color: Theme.primaryColor
diff --git a/qml/components/VideoPreview.qml b/qml/components/VideoPreview.qml
index 9ef5e9b..1e6ae62 100644
--- a/qml/components/VideoPreview.qml
+++ b/qml/components/VideoPreview.qml
@@ -27,7 +27,7 @@ Item {
property ListItem messageListItem
property var rawMessage: messageListItem.myMessage
- property var videoData: ( rawMessage.content['@type'] === "messageVideo" ) ? rawMessage.content.video : ( ( rawMessage.content['@type'] === "messageAnimation" ) ? rawMessage.content.animation : "")
+ property var videoData: ( rawMessage.content['@type'] === "messageVideo" ) ? rawMessage.content.video : ( ( rawMessage.content['@type'] === "messageAnimation" ) ? rawMessage.content.animation : rawMessage.content.video_note )
property string videoUrl;
property int previewFileId;
property int videoFileId;
@@ -37,7 +37,7 @@ Item {
property bool playRequested: false;
width: parent.width
- height: Functions.getVideoHeight(width, videoData)
+ height: ( rawMessage.content['@type'] === "messageVideoNote" ) ? width : Functions.getVideoHeight(width, videoData)
Timer {
id: screensaverTimer
@@ -78,7 +78,11 @@ Item {
function updateVideoThumbnail() {
if (videoData) {
- videoType = videoData['@type'];
+ if (rawMessage.content['@type'] === "messageVideoNote") {
+ videoType = "video";
+ } else {
+ videoType = videoData['@type'];
+ }
videoFileId = videoData[videoType].id;
if (typeof videoData.thumbnail !== "undefined") {
previewFileId = videoData.thumbnail.photo.id;
diff --git a/qml/js/functions.js b/qml/js/functions.js
index c2ce688..5a71999 100644
--- a/qml/js/functions.js
+++ b/qml/js/functions.js
@@ -48,6 +48,9 @@ function getMessageText(message, simple, myself) {
return simple ? (myself ? qsTr("sent a video", "myself") : qsTr("sent a video")) : "";
}
}
+ if (message.content['@type'] === 'messageVideoNote') {
+ return simple ? (myself ? qsTr("sent a video note", "myself") : qsTr("sent a video note")) : "";
+ }
if (message.content['@type'] === 'messageAnimation') {
if (message.content.caption.text !== "") {
return simple ? qsTr("Animation: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption)
diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index a4efe3f..afaa176 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -590,6 +590,7 @@ Page {
messageSticker: "StickerPreview",
messagePhoto: "ImagePreview",
messageVideo: "VideoPreview",
+ messageVideoNote: "VideoPreview",
messageAnimation: "VideoPreview",
messageAudio: "AudioPreview",
messageVoiceNote: "AudioPreview",
@@ -605,7 +606,7 @@ Page {
case "LocationPreview":
return parentWidth * 0.66666666; // 2 / 3;
case "VideoPreview":
- return Functions.getVideoHeight(parentWidth, ( content['@type'] === "messageVideo" ) ? content.video : content.animation);
+ return ( content['@type'] === "messageVideoNote" ) ? content.video_note.length : ( Functions.getVideoHeight(parentWidth, ( content['@type'] === "messageVideo" ) ? content.video : content.animation) );
case "AudioPreview":
return parentWidth / 2;
case "DocumentPreview":
@@ -615,7 +616,21 @@ Page {
}
}
- readonly property var simpleDelegateMessages: ["messageBasicGroupChatCreate", "messageChatAddMembers", "messageChatChangePhoto", "messageChatChangeTitle", "messageChatDeleteMember", "messageChatDeletePhoto", "messageChatJoinByLink", "messageChatSetTtl", "messageChatUpgradeFrom", "messageChatUpgradeTo", "messageCustomServiceAction", "messagePinMessage", "messageScreenshotTaken", "messageSupergroupChatCreate", "messageUnsupported"]
+ readonly property var simpleDelegateMessages: ["messageBasicGroupChatCreate",
+ "messageChatAddMembers",
+ "messageChatChangePhoto",
+ "messageChatChangeTitle",
+ "messageChatDeleteMember",
+ "messageChatDeletePhoto",
+ "messageChatJoinByLink",
+ "messageChatSetTtl",
+ "messageChatUpgradeFrom",
+ "messageChatUpgradeTo",
+ "messageCustomServiceAction",
+ "messagePinMessage",
+ "messageScreenshotTaken",
+ "messageSupergroupChatCreate",
+ "messageUnsupported"]
delegate: Loader {
width: chatView.width
Component {
diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index 78ac36b..464503a 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -1468,5 +1468,14 @@
Unable to find user %1
Konnte Benutzer %1 nicht finden
+
+ sent a video note
+ myself
+ haben eine Videonachricht geschicht
+
+
+ sent a video note
+ hat eine Videonachricht geschickt
+
diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index 8118e2d..31f588a 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -1462,5 +1462,14 @@
Unable to find user %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts
index 712f457..8b22cc1 100644
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@@ -1469,5 +1469,14 @@
Unable to find user %1
Käyttäjää ei löydy: %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index ad8486a..2f53bd1 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -1462,5 +1462,14 @@
Unable to find user %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts
index 013e9d6..3438ce5 100644
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@@ -1468,5 +1468,14 @@
Unable to find user %1
Impossibile trovare l'utente %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index 4719639..a455839 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -1474,5 +1474,14 @@
Unable to find user %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts
index 8d6857f..1f4e1ab 100644
--- a/translations/harbour-fernschreiber-ru.ts
+++ b/translations/harbour-fernschreiber-ru.ts
@@ -1474,5 +1474,14 @@
Unable to find user %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts
index 726a1ed..8d1d2bc 100644
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@@ -1468,5 +1468,14 @@
Unable to find user %1
Kan inte hitta användare %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts
index 4e066b1..9885cb8 100644
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@@ -1462,5 +1462,14 @@
Unable to find user %1
无法找到用户 %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index 3f022d5..fc853ed 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -1462,5 +1462,14 @@
Unable to find user %1
+
+ sent a video note
+ myself
+
+
+
+ sent a video note
+
+