diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 2340b146..c7f5164a 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -606,12 +606,6 @@ ChatPage::resetUI() showUnreadMessageNotification(0); } -void -ChatPage::reactMessage(const QString &id) -{ - view_manager_->queueReactionMessage(current_room_, id, "👀"); -} - void ChatPage::focusMessageInput() { diff --git a/src/ChatPage.h b/src/ChatPage.h index b6b72319..83b4e76d 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -87,7 +87,6 @@ public: //! Show the room/group list (if it was visible). void showSideBars(); void initiateLogout(); - void reactMessage(const QString &eventId); void focusMessageInput(); public slots: diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 95997eb8..16e4f207 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -961,13 +961,6 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEventreactMessage(id); -} - void TimelineModel::replyAction(QString id) { diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 3b01781f..a3b92f83 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -126,8 +126,6 @@ class TimelineModel : public QAbstractListModel int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) Q_PROPERTY(std::vector typingUsers READ typingUsers WRITE updateTypingUsers NOTIFY typingUsersChanged) - Q_PROPERTY(QString reaction READ reaction WRITE setReaction NOTIFY reactionChanged RESET - resetReaction) Q_PROPERTY(QString reply READ reply WRITE setReply NOTIFY replyChanged RESET resetReply) Q_PROPERTY( bool paginationInProgress READ paginationInProgress NOTIFY paginationInProgressChanged) @@ -191,7 +189,6 @@ public: Q_INVOKABLE void viewRawMessage(QString id) const; Q_INVOKABLE void viewDecryptedRawMessage(QString id) const; Q_INVOKABLE void openUserProfile(QString userid) const; - Q_INVOKABLE void reactAction(QString id); Q_INVOKABLE void replyAction(QString id); Q_INVOKABLE void readReceiptsAction(QString id) const; Q_INVOKABLE void redactEvent(QString id); @@ -220,21 +217,6 @@ public slots: } std::vector typingUsers() const { return typingUsers_; } bool paginationInProgress() const { return m_paginationInProgress; } - QString reaction() const { return reaction_; } - void setReaction(QString reaction) - { - if (reaction_ != reaction) { - reaction_ = reaction; - emit reactionChanged(reaction_); - } - } - void resetReaction() - { - if (!reaction_.isEmpty()) { - reaction_ = ""; - emit reactionChanged(reaction_); - } - } QString reply() const { return reply_; } void setReply(QString newReply) { @@ -271,7 +253,6 @@ signals: void newEncryptedImage(mtx::crypto::EncryptedFile encryptionInfo); void eventFetched(QString requestingEvent, mtx::events::collections::TimelineEvents event); void typingUsersChanged(std::vector users); - void reactionChanged(QString reaction); void replyChanged(QString reply); void paginationInProgressChanged(const bool); @@ -305,7 +286,6 @@ private: bool m_paginationInProgress = false; QString currentId; - QString reaction_; QString reply_; std::vector typingUsers_;