qml/components/MessageListViewItem.qml

@@ -115,19 +115,6 @@ ListItem {
         return interactionText;
     }
 
-    function openReactions() {
-        if (messageListItem.chatReactions) {
-            Debug.log("Using chat reactions")
-            messageListItem.messageReactions = chatReactions
-            showItemCompletelyTimer.requestedIndex = index;
-            showItemCompletelyTimer.start();
-        } else {
-            Debug.log("Obtaining message reactions")
-            tdLibWrapper.getMessageAvailableReactions(messageListItem.chatId, messageListItem.messageId);
-        }
-        selectReactionBubble.visible = false;
-    }
-
     onClicked: {
         if (messageListItem.precalculatedValues.pageIsSelecting) {
             page.toggleMessageSelection(myMessage);
@@ -145,17 +132,20 @@ ListItem {
 
             if (messageListItem.messageReactions) {
                 messageListItem.messageReactions = null;
-                selectReactionBubble.visible = false;
-            } else {
-                if (messageListItem.chatReactions) {
-                    selectReactionBubble.visible = !selectReactionBubble.visible;
-                }
             }
         }
     }
 
     onDoubleClicked: {
-        openReactions();
+        if (messageListItem.chatReactions) {
+            Debug.log("Using chat reactions")
+            messageListItem.messageReactions = chatReactions
+            showItemCompletelyTimer.requestedIndex = index;
+            showItemCompletelyTimer.start();
+        } else {
+            Debug.log("Obtaining message reactions")
+            tdLibWrapper.getMessageAvailableReactions(messageListItem.chatId, messageListItem.messageId);
+        }
     }
 
     onPressAndHold: {
@@ -662,50 +652,12 @@ ListItem {
                             textFormat: Text.StyledText
                             maximumLineCount: 1
                             elide: Text.ElideRight
-                            MouseArea {
-                                anchors.fill: parent
-                                onClicked: {
-                                    if (messageListItem.messageReactions) {
-                                        messageListItem.messageReactions = null;
-                                        selectReactionBubble.visible = false;
-                                    } else {
-                                        openReactions();
-                                    }
-                                }
-                            }
                         }
                     }
                 }
 
             }
 
-            Rectangle {
-                id: selectReactionBubble
-                visible: false
-                opacity: visible ? 0.5 : 0.0
-                Behavior on opacity { NumberAnimation {} }
-                anchors {
-                    horizontalCenter: messageListItem.isOwnMessage ? messageBackground.left : messageBackground.right
-                    verticalCenter: messageBackground.verticalCenter
-                }
-                height: Theme.itemSizeExtraSmall
-                width: Theme.itemSizeExtraSmall
-                color: Theme.primaryColor
-                radius: parent.width / 2
-            }
-
-            IconButton {
-                id: selectReactionButton
-                visible: selectReactionBubble.visible
-                opacity: visible ? 1.0 : 0.0
-                Behavior on opacity { NumberAnimation {} }
-                icon.source: "image://theme/icon-s-favorite"
-                anchors.centerIn: selectReactionBubble
-                onClicked: {
-                    openReactions();
-                }
-            }
-
         }
 
     }
@@ -714,7 +666,7 @@ ListItem {
         id: reactionsColumn
         width: parent.width - ( 2 * Theme.horizontalPageMargin )
         anchors.top: messageTextRow.bottom
-        anchors.topMargin: Theme.paddingMedium
+        anchors.topMargin: Theme.paddingSmall
         anchors.horizontalCenter: parent.horizontalCenter
         visible: messageListItem.messageReactions ? ( messageListItem.messageReactions.length > 0 ? true : false ) : false
         opacity: messageListItem.messageReactions ? ( messageListItem.messageReactions.length > 0 ? 1 : 0 ) : 0
@@ -723,7 +675,7 @@ ListItem {
 
         Flickable {
             width: parent.width
-            height: reactionsResultRow.height + 2 * Theme.paddingMedium
+            height: reactionsResultRow.height + Theme.paddingSmall
             anchors.horizontalCenter: parent.horizontalCenter
             contentWidth: reactionsResultRow.width
             clip: true
@@ -739,13 +691,13 @@ ListItem {
 
                         Row {
                             id: singleReactionRow
-                            spacing: Theme.paddingMedium
+                            spacing: Theme.paddingSmall
 
                             Image {
                                 id: emojiPicture
                                 source: Emoji.getEmojiPath(modelData)
-                                width: status === Image.Ready ? Theme.fontSizeExtraLarge : 0
-                                height: Theme.fontSizeExtraLarge
+                                width: status === Image.Ready ? Theme.fontSizeLarge : 0
+                                height: Theme.fontSizeLarge
                             }
 
                         }
@@ -753,26 +705,12 @@ ListItem {
                         MouseArea {
                             anchors.fill: parent
                             onClicked: {
-                                for (var i = 0; i < reactions.length; i++) {
-                                    var reaction = reactions[i]
-                                    var reactionText = reaction.reaction ? reaction.reaction : (reaction.type && reaction.type.emoji) ? reaction.type.emoji : ""
-                                    if (reactionText === modelData) {
-                                        if (reaction.is_chosen) {
-                                            // Reaction is already selected
-                                            tdLibWrapper.removeMessageReaction(chatId, messageId, reactionText)
-                                            messageReactions = null
-                                            return
-                                        }
-                                        break
-                                    }
-                                }
-                                // Reaction is not yet selected
-                                tdLibWrapper.addMessageReaction(chatId, messageId, modelData)
-                                messageReactions = null
-                                selectReactionBubble.visible = false
+                                tdLibWrapper.setMessageReaction(messageListItem.chatId, messageListItem.messageId, modelData);
+                                messageListItem.messageReactions = null;
                             }
                         }
                     }
+
                 }
             }
         }

qml/js/functions.js

@@ -448,12 +448,7 @@ function handleLink(link) {
         } else if (link.indexOf(tMePrefixHttp) === 0) {
             handleTMeLink(link, tMePrefixHttp);
         } else {
-            Debug.log("Trying to open URL externally: " + link)
-            if (link.indexOf("://") === -1) {
-                Qt.openUrlExternally("https://" + link)
-            } else {
-                Qt.openUrlExternally(link);
-            }
+            Qt.openUrlExternally(link);
         }
     }
 }

qml/pages/ChatPage.qml

@@ -576,9 +576,6 @@ Page {
         onSponsoredMessageReceived: {
             chatPage.containsSponsoredMessages = true;
         }
-        onReactionsUpdated: {
-            availableReactions = tdLibWrapper.getChatReactions(chatInformation.id);
-        }
     }
 
     Connections {
@@ -613,8 +610,6 @@ Page {
             chatViewCooldownTimer.restart();
             chatViewStartupReadTimer.restart();
 
-            /*
-            // Double-tap for reactions is currently disabled, let's see if we'll ever need it again
             var remainingDoubleTapHints = appSettings.remainingDoubleTapHints;
             Debug.log("Remaining double tap hints: " + remainingDoubleTapHints);
             if (remainingDoubleTapHints > 0) {
@@ -623,8 +618,6 @@ Page {
                 tapHintLabel.visible = true;
                 appSettings.remainingDoubleTapHints = remainingDoubleTapHints - 1;
             }
-             */
-
         }
         onNewMessageReceived: {
             if (( chatView.manuallyScrolledToBottom && Qt.application.state === Qt.ApplicationActive ) || message.sender_id.user_id === chatPage.myUserId) {

rpm/harbour-fernschreiber.spec

@@ -12,7 +12,7 @@ Name:       harbour-fernschreiber
 
 Summary:    Fernschreiber is a Telegram client for Aurora OS
 Version:    0.17
-Release:    8
+Release:    7
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://werkwolf.eu/
@@ -70,7 +70,7 @@ desktop-file-install --delete-original       \
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/%{name}
+%{_bindir}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png

src/tdlibwrapper.cpp

@@ -1462,8 +1462,9 @@ void TDLibWrapper::getPageSource(const QString &address)
     connect(reply, SIGNAL(finished()), this, SLOT(handleGetPageSourceFinished()));
 }
 
-void TDLibWrapper::addMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction)
+void TDLibWrapper::setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction)
 {
+    LOG("Set message reaction" << chatId << messageId << reaction);
     QVariantMap requestObject;
     requestObject.insert(CHAT_ID, chatId);
     requestObject.insert(MESSAGE_ID, messageId);
@@ -1478,35 +1479,9 @@ void TDLibWrapper::addMessageReaction(qlonglong chatId, qlonglong messageId, con
         reactionType.insert(EMOJI, reaction);
         requestObject.insert(REACTION_TYPE, reactionType);
         requestObject.insert(_TYPE, "addMessageReaction");
-        LOG("Add message reaction" << chatId << messageId << reaction);
     } else {
         requestObject.insert("reaction", reaction);
         requestObject.insert(_TYPE, "setMessageReaction");
-        LOG("Toggle message reaction" << chatId << messageId << reaction);
-    }
-    this->sendRequest(requestObject);
-}
-
-void TDLibWrapper::removeMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction)
-{
-    QVariantMap requestObject;
-    requestObject.insert(CHAT_ID, chatId);
-    requestObject.insert(MESSAGE_ID, messageId);
-    if (versionNumber > VERSION_NUMBER(1,8,5)) {
-        // "reaction_type": {
-        //     "@type": "reactionTypeEmoji",
-        //     "emoji": "..."
-        // }
-        QVariantMap reactionType;
-        reactionType.insert(_TYPE, REACTION_TYPE_EMOJI);
-        reactionType.insert(EMOJI, reaction);
-        requestObject.insert(REACTION_TYPE, reactionType);
-        requestObject.insert(_TYPE, "removeMessageReaction");
-        LOG("Remove message reaction" << chatId << messageId << reaction);
-    } else {
-        requestObject.insert("reaction", reaction);
-        requestObject.insert(_TYPE, "setMessageReaction");
-        LOG("Toggle message reaction" << chatId << messageId << reaction);
     }
     this->sendRequest(requestObject);
 }
@@ -2093,7 +2068,6 @@ void TDLibWrapper::handleActiveEmojiReactionsUpdated(const QStringList& emojis)
     if (activeEmojiReactions != emojis) {
         activeEmojiReactions = emojis;
         LOG(emojis.count() << "reaction(s) available");
-        emit reactionsUpdated();
     }
 }
 

src/tdlibwrapper.h

@@ -249,8 +249,7 @@ public:
     Q_INVOKABLE void terminateSession(const QString &sessionId);
     Q_INVOKABLE void getMessageAvailableReactions(qlonglong chatId, qlonglong messageId);
     Q_INVOKABLE void getPageSource(const QString &address);
-    Q_INVOKABLE void addMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
-    Q_INVOKABLE void removeMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
+    Q_INVOKABLE void setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
     Q_INVOKABLE void setNetworkType(NetworkType networkType);
     Q_INVOKABLE void setInactiveSessionTtl(int days);
 
@@ -339,7 +338,6 @@ signals:
     void chatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
     void chatUnreadReactionCountUpdated(qlonglong chatId, int unreadReactionCount);
     void tgUrlFound(const QString &tgUrl);
-    void reactionsUpdated();
 
 public slots:
     void handleVersionDetected(const QString &version);