Support for animated emoji

harbour-fernschreiber.pro

@@ -93,6 +93,7 @@ DISTFILES += qml/harbour-fernschreiber.qml \
     qml/components/inlineQueryResults/InlineQueryResultVenue.qml \
     qml/components/inlineQueryResults/InlineQueryResultVideo.qml \
     qml/components/inlineQueryResults/InlineQueryResultVoiceNote.qml \
+    qml/components/messageContent/MessageAnimatedEmoji.qml \
     qml/components/messageContent/MessageAnimation.qml \
     qml/components/messageContent/MessageAudio.qml \
     qml/components/messageContent/MessageContentBase.qml \

qml/components/messageContent/MessageAnimatedEmoji.qml

@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2020-21 Sebastian J. Wolf and other contributors
+
+    This file is part of Fernschreiber.
+
+    Fernschreiber is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Fernschreiber is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
+*/
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import WerkWolf.Fernschreiber 1.0
+import "../"
+import "../../js/twemoji.js" as Emoji
+
+MessageSticker {
+    stickerData: messageListItem ? messageListItem.myMessage.content.animated_emoji.sticker : overlayFlickable.overlayMessage.content.animated_emoji.sticker;
+}

qml/components/messageContent/MessageSticker.qml

@@ -25,7 +25,7 @@ import "../../js/twemoji.js" as Emoji
 MessageContentBase {
     id: thisItem
 
-    readonly property var stickerData: messageListItem ? messageListItem.myMessage.content.sticker : overlayFlickable.overlayMessage.content.sticker;
+    property var stickerData: messageListItem ? messageListItem.myMessage.content.sticker : overlayFlickable.overlayMessage.content.sticker;
     readonly property bool asEmoji: appSettings.showStickersAsEmojis
     readonly property bool animated: stickerData.is_animated && appSettings.animateStickers
     readonly property bool stickerVisible: staticStickerLoader.item ? staticStickerLoader.item.visible :
@@ -44,6 +44,7 @@ MessageContentBase {
     }
 
     Item {
+
         width: Math.min( stickerData.width, parent.width )
         height: width * aspectRatio
         // (centered in image mode, text-like in sticker mode)

qml/js/functions.js

@@ -45,6 +45,8 @@ function getMessageText(message, simple, currentUserId, ignoreEntities) {
         }
     case 'messageSticker':
         return simple ? qsTr("Sticker: %1").arg(message.content.sticker.emoji) : "";
+    case 'messageAnimatedEmoji':
+        return simple ? qsTr("Animated Emoji: %1").arg(message.content.animated_emoji.sticker.emoji) : "";
     case 'messagePhoto':
         if (message.content.caption.text !== "") {
             return simple ? qsTr("Picture: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities)

qml/pages/AboutPage.qml

@@ -59,7 +59,7 @@ Page {
             }
 
             Label {
-                text: "Fernschreiber 0.10.1"
+                text: "Fernschreiber 0.11"
                 horizontalAlignment: Text.AlignHCenter
                 font.pixelSize: Theme.fontSizeExtraLarge
                 anchors {

qml/pages/ChatPage.qml

@@ -1220,6 +1220,8 @@ Page {
 
                         function getContentComponentHeight(contentType, content, parentWidth) {
                             switch(contentType) {
+                            case "messageAnimatedEmoji":
+                                return content.animated_emoji.sticker.height;
                             case "messageAnimation":
                                 return Functions.getVideoHeight(parentWidth, content.animation);
                             case "messageAudio":
@@ -1247,6 +1249,7 @@ Page {
                         }
 
                         readonly property var delegateMessagesContent: [
+                            "messageAnimatedEmoji",
                             "messageAnimation",
                             "messageAudio",
                             // "messageContact",

rpm/harbour-fernschreiber.spec

@@ -11,7 +11,7 @@ Name:       harbour-fernschreiber
 # << macros
 
 Summary:    Fernschreiber is a Telegram client for Sailfish OS
-Version:    0.10.1
+Version:    0.11
 Release:    1
 Group:      Qt/Qt
 License:    LICENSE

rpm/harbour-fernschreiber.yaml

@@ -1,6 +1,6 @@
 Name: harbour-fernschreiber
 Summary: Fernschreiber is a Telegram client for Sailfish OS
-Version: 0.10.1
+Version: 0.11
 Release: 1
 # The contents of the Group field should be one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS

src/fernschreiberutils.cpp

@@ -93,6 +93,9 @@ QString FernschreiberUtils::getMessageShortText(TDLibWrapper *tdLibWrapper, cons
     if (contentType == "messageSticker") {
         return tr("Sticker: %1").arg(messageContent.value("sticker").toMap().value("emoji").toString());
     }
+    if (contentType == "messageAnimatedEmoji") {
+        return tr("Animated Emoji: %1").arg(messageContent.value("animated_emoji").toMap().value("sticker").toMap().value("emoji").toString());
+    }
     if (contentType == "messagePhoto") {
         return myself ? tr("sent a picture", "myself") : tr("sent a picture");
     }

src/tdlibwrapper.cpp

@@ -1853,7 +1853,7 @@ void TDLibWrapper::setInitialParameters()
     QSettings hardwareSettings("/etc/hw-release", QSettings::NativeFormat);
     initialParameters.insert("device_model", hardwareSettings.value("NAME", "Unknown Mobile Device").toString());
     initialParameters.insert("system_version", QSysInfo::prettyProductName());
-    initialParameters.insert("application_version", "0.10.1");
+    initialParameters.insert("application_version", "0.11");
     initialParameters.insert("enable_storage_optimizer", appSettings->storageOptimizer());
     // initialParameters.insert("use_test_dc", true);
     requestObject.insert("parameters", initialParameters);

translations/harbour-fernschreiber-de.ts

@@ -934,6 +934,10 @@
         <source>sent a video note</source>
         <translation>hat eine Videonachricht geschickt</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation>Animiertes Emoji: %1</translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2255,5 +2259,9 @@
         <source>sent a game</source>
         <translation>hat ein Spiel gesendet</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation>Animiertes Emoji: %1</translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-en.ts

@@ -936,6 +936,10 @@ messages</numerusform>
         <source>sent a video note</source>
         <translation>sent a video note</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation>Animated Emoji: %1</translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2257,5 +2261,9 @@ messages</numerusform>
         <source>sent a game</source>
         <translation>sent a game</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation>Animated Emoji: %1</translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-es.ts

@@ -934,6 +934,10 @@
         <source>sent a video note</source>
         <translation>envió una nota de video</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2255,5 +2259,9 @@
         <source>sent a game</source>
         <translation>envió un juego</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-fi.ts

@@ -935,6 +935,10 @@
         <source>sent a video note</source>
         <translation>lähetti videoviestin</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2256,5 +2260,9 @@
         <source>sent a game</source>
         <translation>lähetti pelin</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-fr.ts

@@ -934,6 +934,10 @@
         <source>sent a video note</source>
         <translation>a envoyé une note vidéo</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2255,5 +2259,9 @@
         <source>sent a game</source>
         <translation>a envoyé un jeu</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-hu.ts

@@ -920,6 +920,10 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2227,5 +2231,9 @@
         <source>sent a game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-it.ts

@@ -934,6 +934,10 @@
         <source>sent a video note</source>
         <translation>ha inviato un videomessaggio</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2255,5 +2259,9 @@
         <source>sent a game</source>
         <translation>ha inviato un gioco</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-pl.ts

@@ -948,6 +948,10 @@
         <source>sent a video note</source>
         <translation>wysłał notatkę video</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2283,5 +2287,9 @@
         <source>sent a game</source>
         <translation>wysłał grę</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-ru.ts

@@ -951,6 +951,10 @@
         <source>sent a video note</source>
         <translation>отправил(а) видео заметку</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2286,5 +2290,9 @@
         <source>sent a game</source>
         <translation>отправил(а) игру</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-sk.ts

@@ -948,6 +948,10 @@
         <source>sent a video note</source>
         <translation>poslal video-poznámku</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2283,5 +2287,9 @@
         <source>sent a game</source>
         <translation>poslal hru</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-sv.ts

@@ -934,6 +934,10 @@
         <source>sent a video note</source>
         <translation>skickade ett videomeddelande</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2255,5 +2259,9 @@
         <source>sent a game</source>
         <translation>skickade ett spel</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber-zh_CN.ts

@@ -921,6 +921,10 @@
         <source>sent a video note</source>
         <translation>发送视频消息</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2228,5 +2232,9 @@
         <source>sent a game</source>
         <translation>发送游戏</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-fernschreiber.ts

@@ -934,6 +934,10 @@
         <source>sent a video note</source>
         <translation type="unfinished">sent a video note</translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImagePage</name>
@@ -2255,5 +2259,9 @@
         <source>sent a game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Animated Emoji: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>