Merge pull request 'upstream_fixes_28112023' (#15 ) from upstream_fixes_28112023 into master

Reviewed-on: #15
Open URLs without prefix
2023-11-29 02:10:12 +03:00 · 2023-11-28 20:34:53 +03:00 · 2023-11-28 20:34:51 +03:00 · 2023-11-28 20:34:46 +03:00 · 2023-11-28 20:34:45 +03:00 · 2023-11-28 20:34:20 +03:00
33 changed files with 139 additions and 392 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -84,7 +84,7 @@ jobs:
          assets+=("-a" "$asset")
        done
        tag_name="${GITHUB_REF##*/}"
-        gh release create "$tag_name" "${assets[@]}" 
+        hub release create "${assets[@]}" -m "$tag_name" "$tag_name"
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        
@ -97,6 +97,6 @@ jobs:
          assets+=("-a" "$asset")
        done
        tag_name="${GITHUB_REF##*/}"
-        gh release create "$tag_name" -p -n "This is a pre-release for testing purposes only. It may or may not be unstable." "${assets[@]}"
+        hub release create -p "${assets[@]}" -m "$tag_name" -m "This is a pre-release for testing purposes only. It may or may not be unstable." -m "Join the Telegram group to help out: https://github.com/Wunderfitz/harbour-fernschreiber/issues/162" "$tag_name"
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/README.md
+++ b/README.md
@ -14,11 +14,7 @@ Fernschreiber wouldn't be the same without all the people helping in making it b
 - Chat info page, performance improvements to chat page, location support, app initialization/registration with Telegram, project dependencies, emoji handling, qml/js optimizations, multi-message actions, i18n fixes, chat permission handling, code reviews, logging categories, bot support, github build: [jgibbon](https://github.com/jgibbon)
 - Copy message to clipboard: [Christian Stemmle](https://github.com/chstem)
 - Hide send message button if send-by-enter is switched on, focus text input on entering a chat: [santhoshmanikandan](https://github.com/santhoshmanikandan)
- Integration of logout and sesison options to settings page, search results optimization, highlight unread conversations: [Peter G.](https://github.com/nephros)
- Option to always append last message in notifications: [Johannes Bachmann](https://github.com/dscheinah)
- Option to jump to quoted message, widescreen UI adjustments: [Mikhail Barashkov](https://github.com/mbarashkov)
-
-This list might not be complete. In case I forgot something/somebody, please let me know or create a PR, thanks! :)
+- Integration of logout and sesison options to settings page: [Peter G.](https://github.com/nephros)

 ### Logo/Icon
 - Designed by [Matteo](https://github.com/iamnomeutente), adjustments by [Slava Monich](https://github.com/monich)
@ -52,7 +48,7 @@ const char TDLIB_API_HASH[] = "1234567890abcdef1234567890abcdef";

 You get the Telegram API ID and hash as soon as you've registered your own application on [https://my.telegram.org](https://my.telegram.org).

-Moreover, you need to have a compiled version of [TDLib 1.8.21](https://github.com/tdlib/td) or higher in the sub-directory `tdlib`. This sub-directory must contain another sub-directory that fits to the target device architecture (e.g. armv7hl, i486). Within this directory, there needs to be a folder called `lib` that contains at least `libtdjson.so`. For armv7hl the relative path would consequently be `tdlib/armv7hl/lib`.
+Moreover, you need to have a compiled version of [TDLib 1.8.3](https://github.com/tdlib/td) or higher in the sub-directory `tdlib`. This sub-directory must contain another sub-directory that fits to the target device architecture (e.g. armv7hl, i486). Within this directory, there needs to be a folder called `lib` that contains at least `libtdjson.so`. For armv7hl the relative path would consequently be `tdlib/armv7hl/lib`.

 You may just want to download the [tdlib.zip from our fork](https://github.com/Wunderfitz/td/releases) to just use the exact version of the latest official Fernschreiber release. To use it, you need to extract it into your local `tdlib/` folder as described above. If so, you're done and can compile Fernschreiber using the Sailfish SDK. If you want to build TDLib for yourself, please keep on reading.

--- a/qml/components/MessageListViewItem.qml
+++ b/qml/components/MessageListViewItem.qml
@ -47,7 +47,6 @@ ListItem {
    readonly property bool canDeleteMessage: myMessage.can_be_deleted_for_all_users || (myMessage.can_be_deleted_only_for_self && myMessage.chat_id === page.myUserId)
    property bool hasContentComponent
    property bool additionalOptionsOpened
-    property bool wasNavigatedTo: false

    readonly property var additionalItemsModel: (extraContentLoader.item && ("extraContextMenuItems" in extraContentLoader.item)) ?
        extraContentLoader.item.extraContextMenuItems : 0
@ -68,7 +67,7 @@ ListItem {
    property var chatReactions
    property var messageReactions

-    highlighted: (down || isSelected || additionalOptionsOpened || wasNavigatedTo) && !menuOpen
+    highlighted: (down || isSelected || additionalOptionsOpened) && !menuOpen
    openMenuOnPressAndHold: !messageListItem.precalculatedValues.pageIsSelecting

    signal replyToMessage()
@ -129,10 +128,6 @@ ListItem {
        selectReactionBubble.visible = false;
    }

-    function getContentWidthMultiplier() {
-        return Functions.isWidescreen(appWindow) ? 0.4 : 1.0
-    }
-
    onClicked: {
        if (messageListItem.precalculatedValues.pageIsSelecting) {
            page.toggleMessageSelection(myMessage);
@ -152,22 +147,15 @@ ListItem {
                messageListItem.messageReactions = null;
                selectReactionBubble.visible = false;
            } else {
-                selectReactionBubble.visible = !selectReactionBubble.visible;
-                elementSelected(index);
+                if (messageListItem.chatReactions) {
+                    selectReactionBubble.visible = !selectReactionBubble.visible;
+                }
            }
        }
    }

    onDoubleClicked: {
-        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);
-        }
+        openReactions();
    }

    onPressAndHold: {
@ -193,25 +181,6 @@ ListItem {
        }
    }

-    Connections {
-        target: chatPage
-        onResetElements: {
-            messageListItem.messageReactions = null;
-            selectReactionBubble.visible = false;
-        }
-        onElementSelected: {
-            if (elementIndex !== index) {
-                selectReactionBubble.visible = false;
-            }
-        }
-        onNavigatedTo: {
-            if (targetIndex === index) {
-                messageListItem.wasNavigatedTo = true;
-                restoreNormalityTimer.start();
-            }
-        }
-    }
-
    Loader {
        id: contextMenuLoader
        active: false
@ -316,9 +285,6 @@ ListItem {
                messageListItem.messageReactions = null;
            }
        }
-        onReactionsUpdated: {
-            chatReactions = tdLibWrapper.getChatReactions(page.chatInformation.id);
-        }
    }

    Timer {
@ -333,32 +299,15 @@ ListItem {
        onTriggered: {
            Debug.log("Show item completely timer triggered, requested index: " + requestedIndex + ", current index: " + index)
            if (requestedIndex === index) {
-                var p = chatView.contentItem.mapFromItem(reactionsColumn, 0, 0)
-                if (chatView.contentY > p.y || p.y + reactionsColumn.height > chatView.contentY + chatView.height) {
-                    Debug.log("Moving reactions for item at", requestedIndex, "info the view")
-                    chatView.highlightMoveDuration = -1
-                    chatView.highlightResizeDuration = -1
-                    chatView.scrollToIndex(requestedIndex, height <= chatView.height ? ListView.Contain : ListView.End)
-                    chatView.highlightMoveDuration = 0
-                    chatView.highlightResizeDuration = 0
-                }
+                chatView.highlightMoveDuration = -1;
+                chatView.highlightResizeDuration = -1;
+                chatView.scrollToIndex(requestedIndex);
+                chatView.highlightMoveDuration = 0;
+                chatView.highlightResizeDuration = 0;
            }
        }
    }

-    Timer {
-        id: restoreNormalityTimer
-
-        repeat: false
-        running: false
-        interval: 1000
-        triggeredOnStart: false
-        onTriggered: {
-            Debug.log("Restore normality for index " + index);
-            messageListItem.wasNavigatedTo = false;
-        }
-    }
-
    Component.onCompleted: {
        delegateComponentLoadingTimer.start();
        if (myMessage.reply_to_message_id) {
@ -401,10 +350,8 @@ ListItem {
        id: messageTextRow
        spacing: Theme.paddingSmall
        width: precalculatedValues.entryWidth
-        anchors.horizontalCenter: Functions.isWidescreen(appWindow) ? undefined : parent.horizontalCenter
-        anchors.left: Functions.isWidescreen(appWindow) ? parent.left : undefined
+        anchors.horizontalCenter: parent.horizontalCenter
        y: Theme.paddingSmall
-        anchors.leftMargin: Functions.isWidescreen(appWindow) ? Theme.paddingMedium : undefined

        Loader {
            id: profileThumbnailLoader
@ -521,12 +468,8 @@ ListItem {
                                        page.toggleMessageSelection(myMessage)
                                    } else {
                                        messageOptionsDrawer.open = false
-                                        if(appSettings.goToQuotedMessage) {
-                                            chatPage.showMessage(messageInReplyToRow.inReplyToMessage.id, true)
-                                        } else {
-                                            messageOverlayLoader.active = true
-                                            messageOverlayLoader.overlayMessage = messageInReplyToRow.inReplyToMessage
-                                        }
+                                        messageOverlayLoader.overlayMessage = messageInReplyToRow.inReplyToMessage
+                                        messageOverlayLoader.active = true
                                    }
                                }
                                onPressAndHold: {
@ -638,7 +581,7 @@ ListItem {
                    id: webPagePreviewLoader
                    active: false
                    asynchronous: true
-                    width: parent.width * getContentWidthMultiplier()
+                    width: parent.width
                    height: (status === Loader.Ready) ? item.implicitHeight : myMessage.content.web_page ? precalculatedValues.webPagePreviewHeight : 0

                    sourceComponent: Component {
@ -652,7 +595,7 @@ ListItem {

                Loader {
                    id: extraContentLoader
-                    width: parent.width * getContentWidthMultiplier()
+                    width: parent.width
                    asynchronous: true
                    height: item ? item.height : (messageListItem.hasContentComponent ? chatView.getContentComponentHeight(model.content_type, myMessage.content, width) : 0)
                }
@ -719,12 +662,50 @@ 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();
+                }
+            }
+
        }

    }
@ -733,7 +714,7 @@ ListItem {
        id: reactionsColumn
        width: parent.width - ( 2 * Theme.horizontalPageMargin )
        anchors.top: messageTextRow.bottom
-        anchors.topMargin: Theme.paddingSmall
+        anchors.topMargin: Theme.paddingMedium
        anchors.horizontalCenter: parent.horizontalCenter
        visible: messageListItem.messageReactions ? ( messageListItem.messageReactions.length > 0 ? true : false ) : false
        opacity: messageListItem.messageReactions ? ( messageListItem.messageReactions.length > 0 ? 1 : 0 ) : 0
@ -742,7 +723,7 @@ ListItem {

        Flickable {
            width: parent.width
-            height: reactionsResultRow.height + Theme.paddingSmall
+            height: reactionsResultRow.height + 2 * Theme.paddingMedium
            anchors.horizontalCenter: parent.horizontalCenter
            contentWidth: reactionsResultRow.width
            clip: true
@ -758,13 +739,13 @@ ListItem {

                        Row {
                            id: singleReactionRow
-                            spacing: Theme.paddingSmall
+                            spacing: Theme.paddingMedium

                            Image {
                                id: emojiPicture
                                source: Emoji.getEmojiPath(modelData)
-                                width: status === Image.Ready ? Theme.fontSizeLarge : 0
-                                height: Theme.fontSizeLarge
+                                width: status === Image.Ready ? Theme.fontSizeExtraLarge : 0
+                                height: Theme.fontSizeExtraLarge
                            }

                        }
@ -772,12 +753,26 @@ ListItem {
                        MouseArea {
                            anchors.fill: parent
                            onClicked: {
-                                tdLibWrapper.setMessageReaction(messageListItem.chatId, messageListItem.messageId, modelData);
-                                messageListItem.messageReactions = null;
+                                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
                            }
                        }
                    }
-
                }
            }
        }
--- a/qml/components/settingsPage/ResponsiveGrid.qml
+++ b/qml/components/settingsPage/ResponsiveGrid.qml
@ -19,10 +19,9 @@

 import QtQuick 2.6
 import Sailfish.Silica 1.0
-import "../../js/functions.js" as Functions

 Grid {
    width: parent.width - ( 2 * x )
-    columns: Functions.isWidescreen(appWindow) ? 2 : 1
+    columns: (appWindow.deviceOrientation & Orientation.LandscapeMask) || Screen.sizeCategory === Screen.Large || Screen.sizeCategory === Screen.ExtraLarge ? 2 : 1
    readonly property real columnWidth: width/columns
 }
--- a/qml/components/settingsPage/SettingsBehavior.qml
+++ b/qml/components/settingsPage/SettingsBehavior.qml
@ -103,17 +103,6 @@ AccordionItem {
                }
            }

-            TextSwitch {
-                width: parent.columnWidth
-                checked: appSettings.goToQuotedMessage
-                text: qsTr("Go to quoted message")
-                description: qsTr("When tapping a quoted message, open it in chat instead of showing it in an overlay.")
-                automaticCheck: false
-                onClicked: {
-                    appSettings.goToQuotedMessage = !checked
-                }
-            }
-
            ComboBox {
                id: feedbackComboBox
                width: parent.columnWidth
--- a/qml/js/functions.js
+++ b/qml/js/functions.js
@ -448,7 +448,12 @@ function handleLink(link) {
        } else if (link.indexOf(tMePrefixHttp) === 0) {
            handleTMeLink(link, tMePrefixHttp);
        } else {
-            Qt.openUrlExternally(link);
+            Debug.log("Trying to open URL externally: " + link)
+            if (link.indexOf("://") === -1) {
+                Qt.openUrlExternally("https://" + link)
+            } else {
+                Qt.openUrlExternally(link);
+            }
        }
    }
 }
@ -535,7 +540,3 @@ function getMessagesNeededForwardPermissions(messages) {
    }
    return neededPermissions
 }
-
-function isWidescreen(appWindow) {
-    return (appWindow.deviceOrientation & Silica.Orientation.LandscapeMask) || Silica.Screen.sizeCategory === Silica.Screen.Large || Silica.Screen.sizeCategory === Silica.Screen.ExtraLarge
-}
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@ -54,7 +54,6 @@ Page {
    property bool iterativeInitialization: false;
    property var messageToShow;
    property string messageIdToShow;
-    property string messageIdToScrollTo;
    readonly property bool userIsMember: ((isPrivateChat || isSecretChat) && chatInformation["@type"]) || // should be optimized
                                (isBasicGroup || isSuperGroup) && (
                                    (chatGroupInformation.status["@type"] === "chatMemberStatusMember")
@ -68,9 +67,6 @@ Page {
    property bool doSendBotStartMessage
    property string sendBotStartMessageParameter
    property var availableReactions
-    signal resetElements()
-    signal elementSelected(int elementIndex)
-    signal navigatedTo(int targetIndex)

    states: [
        State {
@ -411,24 +407,6 @@ Page {
        chatPage.focus = true;
    }

-    function showMessage(messageId, initialRun) {
-        // Means we tapped a quoted message and had to load it.
-        if(initialRun) {
-            chatPage.messageIdToScrollTo = messageId
-        }
-        if (chatPage.messageIdToScrollTo && chatPage.messageIdToScrollTo != "") {
-            var index = chatModel.getMessageIndex(chatPage.messageIdToScrollTo);
-            if(index !== -1) {
-                chatPage.messageIdToScrollTo = "";
-                chatView.scrollToIndex(index);
-                navigatedTo(index);
-            } else if(initialRun) {
-                // we only want to do this once.
-                chatModel.triggerLoadHistoryForMessage(chatPage.messageIdToScrollTo)
-            }
-        }
-    }
-
    Timer {
        id: forwardMessagesTimer
        interval: 200
@ -502,10 +480,7 @@ Page {
            if (pageStack.depth === 1) {
                // Only clear chat model if navigated back to overview page. In other cases we keep the information...
                chatModel.clear();
-            } else {
-                resetElements();
            }
-
            break;
        }
    }
@ -601,6 +576,9 @@ Page {
        onSponsoredMessageReceived: {
            chatPage.containsSponsoredMessages = true;
        }
+        onReactionsUpdated: {
+            availableReactions = tdLibWrapper.getChatReactions(chatInformation.id);
+        }
    }

    Connections {
@ -635,6 +613,8 @@ 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) {
@ -643,6 +623,8 @@ Page {
                tapHintLabel.visible = true;
                appSettings.remainingDoubleTapHints = remainingDoubleTapHints - 1;
            }
+             */
+
        }
        onNewMessageReceived: {
            if (( chatView.manuallyScrolledToBottom && Qt.application.state === Qt.ApplicationActive ) || message.sender_id.user_id === chatPage.myUserId) {
@ -670,8 +652,6 @@ Page {
            if (chatView.height > chatView.contentHeight) {
                Debug.log("[ChatPage] Chat content quite small...");
                viewMessageTimer.queueViewMessage(chatView.count - 1);
-            } else if (chatPage.messageIdToScrollTo && chatPage.messageIdToScrollTo != "") {
-                showMessage(chatPage.messageIdToScrollTo, false)
            }
            chatViewCooldownTimer.restart();
            chatViewStartupReadTimer.restart();
@ -1208,7 +1188,7 @@ Page {
                            readonly property int profileThumbnailDimensions: showUserInfo ? Theme.itemSizeSmall : 0
                            readonly property int pageMarginDouble: 2 * Theme.horizontalPageMargin
                            readonly property int paddingMediumDouble: 2 * Theme.paddingMedium
-                            readonly property int entryWidth: chatView.width - pageMarginDouble
+                            readonly property int entryWidth: chatView.width - pageMarginDouble //ширина полной строки сообщения вместе с аватаркой
                            readonly property int textItemWidth: entryWidth - profileThumbnailDimensions - Theme.paddingSmall
                            readonly property int backgroundWidth: page.isPrivateChat ? textItemWidth - pageMarginDouble : textItemWidth  //уменьшенная ширина сообщений для приватных чатов
                            readonly property int backgroundRadius: textItemWidth/50
@ -1234,9 +1214,10 @@ Page {
                            manuallyScrolledToBottom = chatView.atYEnd
                        }

-                        function scrollToIndex(index, mode) {
+                        function scrollToIndex(index) {
                            if(index > 0 && index < chatView.count) {
-                                positionViewAtIndex(index, (mode === undefined) ? ListView.Contain : mode)
+                                positionViewAtIndex(index, ListView.Contain)
+    //                            currentIndex = index;
                                if(index === chatView.count - 1) {
                                    manuallyScrolledToBottom = true;
                                }
--- a/qml/pages/PollResultsPage.qml
+++ b/qml/pages/PollResultsPage.qml
@ -143,11 +143,10 @@ Page {

                        Connections {
                            target: tdLibWrapper
-                            onMessageSendersReceived: {
-                                Debug.log("Received poll users...")
+                            onUsersReceived: {
                                if(extra === optionDelegate.usersResponseIdentifierString) {
-                                    for(var i = 0; i < senders.length; i += 1) {
-                                        optionDelegate.users.append({id: senders[i].user_id, user:tdLibWrapper.getUserInformation(senders[i].user_id)});
+                                    for(var i = 0; i < userIds.length; i += 1) {
+                                        optionDelegate.users.append({id: userIds[i], user:tdLibWrapper.getUserInformation(userIds[i])});
                                    }
                                    loadUsersTimer.start();
                                }
--- a/rpm/harbour-fernschreiber.changes
+++ b/rpm/harbour-fernschreiber.changes
@ -12,26 +12,6 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes

-* Sun Dec 03 2023 Sebastian J. Wolf <sebastian@ygriega.de> 0.17
- Update to TDLib 1.8.21, expect some hiccups ;)
- Added contacts sync (OpenRepos builds only)
- Tweaks to reaction handling (opens now on double click or click + star)
- Option to jump to quoted message
- Option to highlight unread conversations
- Option to suppress notification previews
- Option to append last message content to notifications
- Added "unread mention" indicator to chat list
- Improve message when search yields no results
- New unread info for chats with high amount of unread messages
- Setting for session inactivity timeout
- UI improvements in landscape mode
- Fix: Restore video functionality on SFOS 4.5
- Fix: Chat list timestamp now updated more reliably
- Fix: Faster reconnect after network changes
- Fix: Some URLs couldn't be opened
- Updated translations for several languages
- Thanks to monich, nephros, arustg, jgibbon, carlosgonz0, okruhliak, dscheinah, pherjung and mbarashkov for your contributions
-
 * Sun Jun 12 2022 Sebastian J. Wolf <sebastian@ygriega.de> 0.16
 - Support message reactions
 - Support t.me/+... links
--- a/rpm/harbour-fernschreiber.spec
+++ b/rpm/harbour-fernschreiber.spec
@ -12,7 +12,7 @@ Name:       harbour-fernschreiber

 Summary:    Fernschreiber is a Telegram client for Aurora OS
 Version:    0.17
-Release:    12
+Release:    8
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://werkwolf.eu/
@ -70,7 +70,7 @@ desktop-file-install --delete-original       \

 %files
 %defattr(-,root,root,-)
-%{_bindir}
+%{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
--- a/src/appsettings.cpp
+++ b/src/appsettings.cpp
@ -32,7 +32,6 @@ namespace {
    const QString KEY_NOTIFICATION_SUPPRESS_ENABLED("notificationSuppressContent");
    const QString KEY_NOTIFICATION_FEEDBACK("notificationFeedback");
    const QString KEY_NOTIFICATION_ALWAYS_SHOW_PREVIEW("notificationAlwaysShowPreview");
-    const QString KEY_GO_TO_QUOTED_MESSAGE("goToQuotedMessage");
    const QString KEY_STORAGE_OPTIMIZER("useStorageOptimizer");
    const QString KEY_INLINEBOT_LOCATION_ACCESS("allowInlineBotLocationAccess");
    const QString KEY_REMAINING_INTERACTION_HINTS("remainingInteractionHints");
@ -202,20 +201,6 @@ void AppSettings::setNotificationAlwaysShowPreview(bool enable)
    }
 }

-bool AppSettings::goToQuotedMessage() const
-{
-    return settings.value(KEY_GO_TO_QUOTED_MESSAGE, false).toBool();
-}
-
-void AppSettings::setGoToQuotedMessage(bool enable)
-{
-    if (goToQuotedMessage() != enable) {
-        LOG(KEY_GO_TO_QUOTED_MESSAGE << enable);
-        settings.setValue(KEY_GO_TO_QUOTED_MESSAGE, enable);
-        emit goToQuotedMessageChanged();
-    }
-}
-
 bool AppSettings::storageOptimizer() const
 {
    return settings.value(KEY_STORAGE_OPTIMIZER, true).toBool();
--- a/src/appsettings.h
+++ b/src/appsettings.h
@ -35,7 +35,6 @@ class AppSettings : public QObject {
    Q_PROPERTY(bool notificationSuppressContent READ notificationSuppressContent WRITE setNotificationSuppressContent NOTIFY notificationSuppressContentChanged)
    Q_PROPERTY(NotificationFeedback notificationFeedback READ notificationFeedback WRITE setNotificationFeedback NOTIFY notificationFeedbackChanged)
    Q_PROPERTY(bool notificationAlwaysShowPreview READ notificationAlwaysShowPreview WRITE setNotificationAlwaysShowPreview NOTIFY notificationAlwaysShowPreviewChanged)
-    Q_PROPERTY(bool goToQuotedMessage READ goToQuotedMessage WRITE setGoToQuotedMessage NOTIFY goToQuotedMessageChanged)
    Q_PROPERTY(bool storageOptimizer READ storageOptimizer WRITE setStorageOptimizer NOTIFY storageOptimizerChanged)
    Q_PROPERTY(bool allowInlineBotLocationAccess READ allowInlineBotLocationAccess WRITE setAllowInlineBotLocationAccess NOTIFY allowInlineBotLocationAccessChanged)
    Q_PROPERTY(int remainingInteractionHints READ remainingInteractionHints WRITE setRemainingInteractionHints NOTIFY remainingInteractionHintsChanged)
@ -97,9 +96,6 @@ public:
    bool notificationAlwaysShowPreview() const;
    void setNotificationAlwaysShowPreview(bool enable);

-    bool goToQuotedMessage() const;
-    void setGoToQuotedMessage(bool enable);
-
    bool storageOptimizer() const;
    void setStorageOptimizer(bool enable);

@ -139,7 +135,6 @@ signals:
    void notificationSuppressContentChanged();
    void notificationFeedbackChanged();
    void notificationAlwaysShowPreviewChanged();
-    void goToQuotedMessageChanged();
    void storageOptimizerChanged();
    void allowInlineBotLocationAccessChanged();
    void remainingInteractionHintsChanged();
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@ -44,7 +44,6 @@ namespace {
    const QString UNREAD_COUNT("unread_count");
    const QString UNREAD_MENTION_COUNT("unread_mention_count");
    const QString UNREAD_REACTION_COUNT("unread_reaction_count");
-    const QString AVAILABLE_REACTIONS("available_reactions");
    const QString NOTIFICATION_SETTINGS("notification_settings");
    const QString LAST_READ_INBOX_MESSAGE_ID("last_read_inbox_message_id");
    const QString LAST_READ_OUTBOX_MESSAGE_ID("last_read_outbox_message_id");
@ -71,7 +70,6 @@ public:
    int unreadCount() const;
    int unreadMentionCount() const;
    int unreadReactionCount() const;
-    QVariant availableReactions() const;
    QVariant photoSmall() const;
    qlonglong lastReadInboxMessageId() const;
    qlonglong senderUserId() const;
@ -170,11 +168,6 @@ int ChatListModel::ChatData::unreadMentionCount() const
    return chatData.value(UNREAD_MENTION_COUNT).toInt();
 }

-QVariant ChatListModel::ChatData::availableReactions() const
-{
-    return chatData.value(AVAILABLE_REACTIONS);
-}
-
 int ChatListModel::ChatData::unreadReactionCount() const
 {
    return chatData.value(UNREAD_REACTION_COUNT).toInt();
@ -407,7 +400,6 @@ ChatListModel::ChatListModel(TDLibWrapper *tdLibWrapper, AppSettings *appSetting
    connect(tdLibWrapper, SIGNAL(chatDraftMessageUpdated(qlonglong, QVariantMap, QString)), this, SLOT(handleChatDraftMessageUpdated(qlonglong, QVariantMap, QString)));
    connect(tdLibWrapper, SIGNAL(chatUnreadMentionCountUpdated(qlonglong, int)), this, SLOT(handleChatUnreadMentionCountUpdated(qlonglong, int)));
    connect(tdLibWrapper, SIGNAL(chatUnreadReactionCountUpdated(qlonglong, int)), this, SLOT(handleChatUnreadReactionCountUpdated(qlonglong, int)));
-    connect(tdLibWrapper, SIGNAL(chatAvailableReactionsUpdated(qlonglong,QVariantMap)), this, SLOT(handleChatAvailableReactionsUpdated(qlonglong,QVariantMap)));

    // Don't start the timer until we have at least one chat
    relativeTimeRefreshTimer = new QTimer(this);
@ -444,7 +436,6 @@ QHash<int,QByteArray> ChatListModel::roleNames() const
    roles.insert(ChatListModel::RoleUnreadCount, "unread_count");
    roles.insert(ChatListModel::RoleUnreadMentionCount, "unread_mention_count");
    roles.insert(ChatListModel::RoleUnreadReactionCount, "unread_reaction_count");
-    roles.insert(ChatListModel::RoleAvailableReactions, "available_reactions");
    roles.insert(ChatListModel::RoleLastReadInboxMessageId, "last_read_inbox_message_id");
    roles.insert(ChatListModel::RoleLastMessageSenderId, "last_message_sender_id");
    roles.insert(ChatListModel::RoleLastMessageDate, "last_message_date");
@ -481,7 +472,6 @@ QVariant ChatListModel::data(const QModelIndex &index, int role) const
        case ChatListModel::RolePhotoSmall: return data->photoSmall();
        case ChatListModel::RoleUnreadCount: return data->unreadCount();
        case ChatListModel::RoleUnreadMentionCount: return data->unreadMentionCount();
-        case ChatListModel::RoleAvailableReactions: return data->availableReactions();
        case ChatListModel::RoleUnreadReactionCount: return data->unreadReactionCount();
        case ChatListModel::RoleLastReadInboxMessageId: return data->lastReadInboxMessageId();
        case ChatListModel::RoleLastMessageSenderId: return data->senderUserId();
@ -1046,26 +1036,6 @@ void ChatListModel::handleChatUnreadReactionCountUpdated(qlonglong chatId, int u
    }
 }

-void ChatListModel::handleChatAvailableReactionsUpdated(qlonglong chatId, const QVariantMap availableReactions)
-{
-    if (chatIndexMap.contains(chatId)) {
-        LOG("Updating available reaction type for" << chatId << availableReactions);
-        const int chatIndex = chatIndexMap.value(chatId);
-        ChatData *chat = chatList.at(chatIndex);
-        chat->chatData.insert(AVAILABLE_REACTIONS, availableReactions);
-        QVector<int> changedRoles;
-        changedRoles.append(ChatListModel::RoleAvailableReactions);
-        const QModelIndex modelIndex(index(chatIndex));
-        emit dataChanged(modelIndex, modelIndex, changedRoles);
-    } else {
-        ChatData *chat = hiddenChats.value(chatId);
-        if (chat) {
-            LOG("Updating available reaction type for hidden chat" << chatId << availableReactions);
-            chat->chatData.insert(AVAILABLE_REACTIONS, availableReactions);
-        }
-    }
-}
-
 void ChatListModel::handleRelativeTimeRefreshTimer()
 {
    LOG("Refreshing timestamps");
--- a/src/chatlistmodel.h
+++ b/src/chatlistmodel.h
@ -42,7 +42,6 @@ public:
        RoleUnreadCount,
        RoleUnreadMentionCount,
        RoleUnreadReactionCount,
-        RoleAvailableReactions,
        RoleLastReadInboxMessageId,
        RoleLastMessageSenderId,
        RoleLastMessageDate,
@ -94,7 +93,6 @@ private slots:
    void handleChatDraftMessageUpdated(qlonglong chatId, const QVariantMap &draftMessage, const QString &order);
    void handleChatUnreadMentionCountUpdated(qlonglong chatId, int unreadMentionCount);
    void handleChatUnreadReactionCountUpdated(qlonglong chatId, int unreadReactionCount);
-    void handleChatAvailableReactionsUpdated(qlonglong chatId, const QVariantMap availableReactions);
    void handleRelativeTimeRefreshTimer();

 signals:
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@ -363,15 +363,6 @@ void ChatModel::initialize(const QVariantMap &chatInformation)
    tdLibWrapper->getChatHistory(chatId, this->chatInformation.value(LAST_READ_INBOX_MESSAGE_ID).toLongLong());
 }

-void ChatModel::triggerLoadHistoryForMessage(qlonglong messageId)
-{
-    if (!this->inIncrementalUpdate && !messages.isEmpty()) {
-        LOG("Trigger loading message with id..." << messageId);
-        this->inIncrementalUpdate = true;
-        this->tdLibWrapper->getChatHistory(chatId, messageId);
-    }
-}
-
 void ChatModel::triggerLoadMoreHistory()
 {
    if (!this->inIncrementalUpdate && !messages.isEmpty()) {
@ -409,17 +400,6 @@ QVariantMap ChatModel::getMessage(int index)
    return QVariantMap();
 }

-int ChatModel::getMessageIndex(qlonglong messageId)
-{
-    if (messages.size() == 0) {
-        return -1;
-    }
-    if (messageIndexMap.contains(messageId)) {
-        return messageIndexMap.value(messageId);
-    }
-    return -1;
-}
-
 int ChatModel::getLastReadMessageIndex()
 {
    LOG("Obtaining last read message index");
--- a/src/chatmodel.h
+++ b/src/chatmodel.h
@ -40,14 +40,12 @@ public:
    Q_INVOKABLE void clear(bool contentOnly = false);
    Q_INVOKABLE void initialize(const QVariantMap &chatInformation);
    Q_INVOKABLE void triggerLoadMoreHistory();
-    Q_INVOKABLE void triggerLoadHistoryForMessage(qlonglong messageId);
    Q_INVOKABLE void triggerLoadMoreFuture();
    Q_INVOKABLE QVariantMap getChatInformation();
    Q_INVOKABLE QVariantMap getMessage(int index);
    Q_INVOKABLE int getLastReadMessageIndex();
    Q_INVOKABLE void setSearchQuery(const QString newSearchQuery);

-    Q_INVOKABLE int getMessageIndex(qlonglong messageId);
    QVariantMap smallPhoto() const;
    qlonglong getChatId() const;

--- a/src/tdlibreceiver.cpp
+++ b/src/tdlibreceiver.cpp
@ -46,7 +46,6 @@ namespace {
    const QString UNREAD_COUNT("unread_count");
    const QString UNREAD_MENTION_COUNT("unread_mention_count");
    const QString UNREAD_REACTION_COUNT("unread_reaction_count");
-    const QString AVAILABLE_REACTIONS("available_reactions");
    const QString TEXT("text");
    const QString LAST_READ_INBOX_MESSAGE_ID("last_read_inbox_message_id");
    const QString LAST_READ_OUTBOX_MESSAGE_ID("last_read_outbox_message_id");
@ -124,7 +123,6 @@ TDLibReceiver::TDLibReceiver(void *tdLibClient, QObject *parent) : QThread(paren
    handlers.insert("updateChatPosition", &TDLibReceiver::processUpdateChatPosition);
    handlers.insert("updateChatReadInbox", &TDLibReceiver::processUpdateChatReadInbox);
    handlers.insert("updateChatReadOutbox", &TDLibReceiver::processUpdateChatReadOutbox);
-    handlers.insert("updateChatAvailableReactions", &TDLibReceiver::processUpdateChatAvailableReactions);
    handlers.insert("updateBasicGroup", &TDLibReceiver::processUpdateBasicGroup);
    handlers.insert("updateSupergroup", &TDLibReceiver::processUpdateSuperGroup);
    handlers.insert("updateChatOnlineMemberCount", &TDLibReceiver::processChatOnlineMemberCountUpdated);
@ -162,7 +160,6 @@ TDLibReceiver::TDLibReceiver(void *tdLibClient, QObject *parent) : QThread(paren
    handlers.insert("updateChatPinnedMessage", &TDLibReceiver::processUpdateChatPinnedMessage);
    handlers.insert("updateMessageIsPinned", &TDLibReceiver::processUpdateMessageIsPinned);
    handlers.insert("users", &TDLibReceiver::processUsers);
-    handlers.insert("messageSenders", &TDLibReceiver::processMessageSenders);
    handlers.insert("error", &TDLibReceiver::processError);
    handlers.insert("ok", &TDLibReceiver::ok);
    handlers.insert("secretChat", &TDLibReceiver::processSecretChat);
@ -365,14 +362,6 @@ void TDLibReceiver::processUpdateChatReadOutbox(const QVariantMap &receivedInfor
    emit chatReadOutboxUpdated(chat_id, last_read_outbox_message_id);
 }

-void TDLibReceiver::processUpdateChatAvailableReactions(const QVariantMap &receivedInformation)
-{
-    const qlonglong chat_id(receivedInformation.value(CHAT_ID).toLongLong());
-    const QVariantMap available_reactions(receivedInformation.value(AVAILABLE_REACTIONS).toMap());
-    LOG("Available reactions updated for" << chat_id << "new information:" << available_reactions);
-    emit chatAvailableReactionsUpdated(chat_id, available_reactions);
-}
-
 void TDLibReceiver::processUpdateBasicGroup(const QVariantMap &receivedInformation)
 {
    const QVariantMap basicGroup(receivedInformation.value(BASIC_GROUP).toMap());
@ -645,12 +634,6 @@ void TDLibReceiver::processUsers(const QVariantMap &receivedInformation)
    emit usersReceived(receivedInformation.value(_EXTRA).toString(), receivedInformation.value("user_ids").toList(), receivedInformation.value(TOTAL_COUNT).toInt());
 }

-void TDLibReceiver::processMessageSenders(const QVariantMap &receivedInformation)
-{
-    LOG("Received Message Senders");
-    emit messageSendersReceived(receivedInformation.value(_EXTRA).toString(), receivedInformation.value("senders").toList(), receivedInformation.value(TOTAL_COUNT).toInt());
-}
-
 void TDLibReceiver::processError(const QVariantMap &receivedInformation)
 {
    LOG("Received an error");
--- a/src/tdlibreceiver.h
+++ b/src/tdlibreceiver.h
@ -52,7 +52,6 @@ signals:
    void chatPinnedUpdated(qlonglong chatId, bool isPinned);
    void chatReadInboxUpdated(const QString &chatId, const QString &lastReadInboxMessageId, int unreadCount);
    void chatReadOutboxUpdated(const QString &chatId, const QString &lastReadOutboxMessageId);
-    void chatAvailableReactionsUpdated(const qlonglong &chatId, const QVariantMap &availableReactions);
    void basicGroupUpdated(qlonglong groupId, const QVariantMap &groupInformation);
    void superGroupUpdated(qlonglong groupId, const QVariantMap &groupInformation);
    void chatOnlineMemberCountUpdated(const QString &chatId, int onlineMemberCount);
@ -89,8 +88,7 @@ signals:
    void chatTitleUpdated(const QString &chatId, const QString &title);
    void chatPinnedMessageUpdated(qlonglong chatId, qlonglong pinnedMessageId);
    void messageIsPinnedUpdated(qlonglong chatId, qlonglong messageId, bool isPinned);
-    void usersReceived(const QString &extra, const QVariantList &senders, int totalUsers);
-    void messageSendersReceived(const QString &extra, const QVariantList &userIds, int totalUsers);
+    void usersReceived(const QString &extra, const QVariantList &userIds, int totalUsers);
    void errorReceived(const int code, const QString &message, const QString &extra);
    void secretChat(qlonglong secretChatId, const QVariantMap &secretChat);
    void secretChatUpdated(qlonglong secretChatId, const QVariantMap &secretChat);
@ -137,7 +135,6 @@ private:
    void processUpdateChatPosition(const QVariantMap &receivedInformation);
    void processUpdateChatReadInbox(const QVariantMap &receivedInformation);
    void processUpdateChatReadOutbox(const QVariantMap &receivedInformation);
-    void processUpdateChatAvailableReactions(const QVariantMap &receivedInformation);
    void processUpdateBasicGroup(const QVariantMap &receivedInformation);
    void processUpdateSuperGroup(const QVariantMap &receivedInformation);
    void processChatOnlineMemberCountUpdated(const QVariantMap &receivedInformation);
@ -176,7 +173,6 @@ private:
    void processUpdateChatPinnedMessage(const QVariantMap &receivedInformation);
    void processUpdateMessageIsPinned(const QVariantMap &receivedInformation);
    void processUsers(const QVariantMap &receivedInformation);
-    void processMessageSenders(const QVariantMap &receivedInformation);
    void processError(const QVariantMap &receivedInformation);
    void processSecretChat(const QVariantMap &receivedInformation);
    void processUpdateSecretChat(const QVariantMap &receivedInformation);
--- a/src/tdlibwrapper.cpp
+++ b/src/tdlibwrapper.cpp
@ -137,7 +137,6 @@ void TDLibWrapper::initializeTDLibReceiver() {
    connect(this->tdLibReceiver, SIGNAL(chatOrderUpdated(QString, QString)), this, SIGNAL(chatOrderUpdated(QString, QString)));
    connect(this->tdLibReceiver, SIGNAL(chatReadInboxUpdated(QString, QString, int)), this, SIGNAL(chatReadInboxUpdated(QString, QString, int)));
    connect(this->tdLibReceiver, SIGNAL(chatReadOutboxUpdated(QString, QString)), this, SIGNAL(chatReadOutboxUpdated(QString, QString)));
-    connect(this->tdLibReceiver, SIGNAL(chatAvailableReactionsUpdated(qlonglong, QVariantMap)), this, SLOT(handleAvailableReactionsUpdated(qlonglong, QVariantMap)));
    connect(this->tdLibReceiver, SIGNAL(basicGroupUpdated(qlonglong, QVariantMap)), this, SLOT(handleBasicGroupUpdated(qlonglong, QVariantMap)));
    connect(this->tdLibReceiver, SIGNAL(superGroupUpdated(qlonglong, QVariantMap)), this, SLOT(handleSuperGroupUpdated(qlonglong, QVariantMap)));
    connect(this->tdLibReceiver, SIGNAL(chatOnlineMemberCountUpdated(QString, int)), this, SIGNAL(chatOnlineMemberCountUpdated(QString, int)));
@ -177,7 +176,6 @@ void TDLibWrapper::initializeTDLibReceiver() {
    connect(this->tdLibReceiver, SIGNAL(chatPinnedMessageUpdated(qlonglong, qlonglong)), this, SIGNAL(chatPinnedMessageUpdated(qlonglong, qlonglong)));
    connect(this->tdLibReceiver, SIGNAL(messageIsPinnedUpdated(qlonglong, qlonglong, bool)), this, SLOT(handleMessageIsPinnedUpdated(qlonglong, qlonglong, bool)));
    connect(this->tdLibReceiver, SIGNAL(usersReceived(QString, QVariantList, int)), this, SIGNAL(usersReceived(QString, QVariantList, int)));
-    connect(this->tdLibReceiver, SIGNAL(messageSendersReceived(QString, QVariantList, int)), this, SIGNAL(messageSendersReceived(QString, QVariantList, int)));
    connect(this->tdLibReceiver, SIGNAL(errorReceived(int, QString, QString)), this, SLOT(handleErrorReceived(int, QString, QString)));
    connect(this->tdLibReceiver, SIGNAL(contactsImported(QVariantList, QVariantList)), this, SIGNAL(contactsImported(QVariantList, QVariantList)));
    connect(this->tdLibReceiver, SIGNAL(messageEditedUpdated(qlonglong, qlonglong, QVariantMap)), this, SIGNAL(messageEditedUpdated(qlonglong, qlonglong, QVariantMap)));
@ -1464,9 +1462,8 @@ void TDLibWrapper::getPageSource(const QString &address)
    connect(reply, SIGNAL(finished()), this, SLOT(handleGetPageSourceFinished()));
 }

-void TDLibWrapper::setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction)
+void TDLibWrapper::addMessageReaction(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);
@ -1481,9 +1478,35 @@ void TDLibWrapper::setMessageReaction(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);
 }
@ -1608,15 +1631,12 @@ QVariantMap TDLibWrapper::getChat(const QString &chatId)

 QStringList TDLibWrapper::getChatReactions(const QString &chatId)
 {
-    LOG("Obtaining chat reactions for chat" << chatId);
    const QVariant available_reactions(chats.value(chatId).toMap().value(CHAT_AVAILABLE_REACTIONS));
    const QVariantMap map(available_reactions.toMap());
    const QString reactions_type(map.value(_TYPE).toString());
    if (reactions_type == CHAT_AVAILABLE_REACTIONS_ALL) {
-        LOG("Chat uses all available reactions, currently available number" << activeEmojiReactions.size());
        return activeEmojiReactions;
    } else if (reactions_type == CHAT_AVAILABLE_REACTIONS_SOME) {
-        LOG("Chat uses reduced set of reactions");
        const QVariantList reactions(map.value(REACTIONS).toList());
        const int n = reactions.count();
        QStringList emojis;
@ -1638,13 +1658,10 @@ QStringList TDLibWrapper::getChatReactions(const QString &chatId)
                }
            }
        }
-        LOG("Found emojis for this chat" << emojis.size());
        return emojis;
    } else if (reactions_type.isEmpty()) {
-        LOG("No chat reaction type specified, using all reactions");
        return available_reactions.toStringList();
    } else {
-        LOG("Unknown chat reaction type" << reactions_type);
        return QStringList();
    }
 }
@ -1914,17 +1931,6 @@ void TDLibWrapper::handleUnreadChatCountUpdated(const QVariantMap &chatCountInfo
    }
 }

-void TDLibWrapper::handleAvailableReactionsUpdated(qlonglong chatId, const QVariantMap &availableReactions)
-{
-    LOG("Updating available reactions for chat" << chatId << availableReactions);
-    QString chatIdString = QString::number(chatId);
-    QVariantMap chatInformation = this->getChat(chatIdString);
-    chatInformation.insert(CHAT_AVAILABLE_REACTIONS, availableReactions);
-    this->chats.insert(chatIdString, chatInformation);
-    emit chatAvailableReactionsUpdated(chatId, availableReactions);
-
-}
-
 void TDLibWrapper::handleBasicGroupUpdated(qlonglong groupId, const QVariantMap &groupInformation)
 {
    emit basicGroupUpdated(updateGroup(groupId, groupInformation, &basicGroups)->groupId);
@ -2087,6 +2093,7 @@ void TDLibWrapper::handleActiveEmojiReactionsUpdated(const QStringList& emojis)
    if (activeEmojiReactions != emojis) {
        activeEmojiReactions = emojis;
        LOG(emojis.count() << "reaction(s) available");
+        emit reactionsUpdated();
    }
 }

--- a/src/tdlibwrapper.h
+++ b/src/tdlibwrapper.h
@ -249,7 +249,8 @@ 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 setMessageReaction(qlonglong chatId, qlonglong messageId, const QString &reaction);
+    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 setNetworkType(NetworkType networkType);
    Q_INVOKABLE void setInactiveSessionTtl(int days);

@ -279,7 +280,6 @@ signals:
    void chatPinnedUpdated(qlonglong chatId, bool isPinned);
    void chatReadInboxUpdated(const QString &chatId, const QString &lastReadInboxMessageId, int unreadCount);
    void chatReadOutboxUpdated(const QString &chatId, const QString &lastReadOutboxMessageId);
-    void chatAvailableReactionsUpdated(const qlonglong &chatId, const QVariantMap &availableReactions);
    void userUpdated(const QString &userId, const QVariantMap &userInformation);
    void ownUserUpdated(const QVariantMap &userInformation);
    void basicGroupUpdated(qlonglong groupId);
@ -323,7 +323,6 @@ signals:
    void chatTitleUpdated(const QString &chatId, const QString &title);
    void chatPinnedMessageUpdated(qlonglong chatId, qlonglong pinnedMessageId);
    void usersReceived(const QString &extra, const QVariantList &userIds, int totalUsers);
-    void messageSendersReceived(const QString &extra, const QVariantList &senders, int totalUsers);
    void errorReceived(int code, const QString &message, const QString &extra);
    void contactsImported(const QVariantList &importerCount, const QVariantList &userIds);
    void messageNotFound(qlonglong chatId, qlonglong messageId);
@ -340,6 +339,7 @@ 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);
@ -353,7 +353,6 @@ public slots:
    void handleChatReceived(const QVariantMap &chatInformation);
    void handleUnreadMessageCountUpdated(const QVariantMap &messageCountInformation);
    void handleUnreadChatCountUpdated(const QVariantMap &chatCountInformation);
-    void handleAvailableReactionsUpdated(qlonglong chatId, const QVariantMap &availableReactions);
    void handleBasicGroupUpdated(qlonglong groupId, const QVariantMap &groupInformation);
    void handleSuperGroupUpdated(qlonglong groupId, const QVariantMap &groupInformation);
    void handleStickerSets(const QVariantList &stickerSets);
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@ -1599,14 +1599,6 @@
        <source>Hide content in notifications</source>
        <translation>Inhalte in Hinweisen verbergen</translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation>Zu zitierter Nachricht springen</translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation>Beim Tippen auf eine zitierte Nachricht zu dieser springen anstatt es in einem Overlay anzuzeigen.</translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-en.ts
+++ b/translations/harbour-fernschreiber-en.ts
@ -1601,14 +1601,6 @@ messages</numerusform>
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@ -1599,14 +1599,6 @@
        <source>Hide content in notifications</source>
        <translation>Ocultar contenido a notificaciones</translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation>Ir a mensaje citado</translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation>Al Pulsar mensaje citado, abrirá en Charla en lugar de mostrarlo en una superposición.</translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
@ -1718,9 +1710,9 @@
    </message>
    <message numerus="yes">
        <source>%1 day(s)</source>
-        <translation>
-            <numerusform>%1 dia</numerusform>
-            <numerusform>%1 dias</numerusform>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
        </translation>
    </message>
    <message>
@ -2344,11 +2336,11 @@
    <message>
        <source>sent a game</source>
        <comment>myself</comment>
-        <translation>envió un juego</translation>
+        <translation>envió juego</translation>
    </message>
    <message>
        <source>sent a game</source>
-        <translation>envió un juego</translation>
+        <translation>envió juego</translation>
    </message>
 </context>
 </TS>
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@ -1600,14 +1600,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-fr.ts
+++ b/translations/harbour-fernschreiber-fr.ts
@ -1599,14 +1599,6 @@
        <source>Hide content in notifications</source>
        <translation>Masquer le contenu dans les notifications</translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@ -1572,14 +1572,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@ -1599,14 +1599,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@ -1626,14 +1626,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-ru.ts
+++ b/translations/harbour-fernschreiber-ru.ts
@ -1629,14 +1629,6 @@
        <source>Hide content in notifications</source>
        <translation>Не показывать содержимое сообщений в уведомлениях</translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation>Переходить к цитируемому сообщению</translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation>По нажатию на цитируемое сообщение, переходить к нему в чате вместо отображения во всплывающем окне.</translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-sk.ts
+++ b/translations/harbour-fernschreiber-sk.ts
@ -1626,14 +1626,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@ -1599,14 +1599,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@ -1573,14 +1573,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@ -1599,14 +1599,6 @@
        <source>Hide content in notifications</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Go to quoted message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
Author	SHA1	Message	Date
medvedych	6616660849	Merge pull request 'upstream_fixes_28112023' (#15 ) from upstream_fixes_28112023 into master Reviewed-on: #15	2023-11-29 02:10:12 +03:00
Sebastian Wolf	1cddb7a766	Open URLs without prefix	2023-11-28 20:34:53 +03:00
Sebastian Wolf	ec972d7edc	More tweaks for reactions	2023-11-28 20:34:51 +03:00
Sebastian Wolf	1c9fcac9cd	Animate new reaction button	2023-11-28 20:34:46 +03:00
Sebastian Wolf	497bd78e58	Tweak reactions again...	2023-11-28 20:34:45 +03:00
Peter G	d522536604	[Trivial]: Don't own bindir (#534 ) * [Trivial]: Don't own bindir This may seem like nitpicking, but the package should not own /usr/bin * Update rpm/harbour-fernschreiber.spec Co-authored-by: Sebastian Wolf <sebastian@ygriega.de> --------- Co-authored-by: nephros <nemo@pgxperiiia10> Co-authored-by: Sebastian Wolf <sebastian@ygriega.de>	2023-11-28 20:34:20 +03:00
Slava Monich	580fad2d22	Allow to remove a reaction (#536 )	2023-11-28 20:33:58 +03:00