medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #485 from monich/view-mess

Browse source 
Adapt handling of sponsored messages to the new format
This commit is contained in:
Sebastian Wolf 2022-04-21 22:57:36 +02:00 committed by GitHub
commit e40cf02baa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chatmodel.cpp
View file

@ -558,7 +558,7 @@ void ChatModel::handleMessageSendSucceeded(qlonglong messageId, qlonglong oldMes
const QModelIndex messageIndex(index(pos)); const QModelIndex messageIndex(index(pos));
emit dataChanged(messageIndex, messageIndex, changedRoles); emit dataChanged(messageIndex, messageIndex, changedRoles);
emit lastReadSentMessageUpdated(calculateLastReadSentMessageId()); emit lastReadSentMessageUpdated(calculateLastReadSentMessageId());
tdLibWrapper->viewMessage(QString::number(this->chatId), QString::number(messageId), false); tdLibWrapper->viewMessage(this->chatId, messageId, false);
} }
} }

15
src/tdlibwrapper.cpp
View file

@ -333,7 +333,7 @@ void TDLibWrapper::getChatHistory(qlonglong chatId, qlonglong fromMessageId, int
this->sendRequest(requestObject); this->sendRequest(requestObject);
} }
void TDLibWrapper::viewMessage(const QString &chatId, const QString &messageId, bool force) void TDLibWrapper::viewMessage(qlonglong chatId, qlonglong messageId, bool force)
{ {
LOG("Mark message as viewed" << chatId << messageId); LOG("Mark message as viewed" << chatId << messageId);
QVariantMap requestObject; QVariantMap requestObject;
@ -346,17 +346,6 @@ void TDLibWrapper::viewMessage(const QString &chatId, const QString &messageId,
this->sendRequest(requestObject); this->sendRequest(requestObject);
} }
void TDLibWrapper::viewSponsoredMessage(qlonglong chatId, qlonglong messageId)
{
LOG("Mark sponsored message as viewed" << chatId << messageId);
QVariantMap requestObject;
requestObject.insert(_TYPE, "viewSponsoredMessage");
requestObject.insert(CHAT_ID, chatId);
requestObject.insert("sponsored_message_id", messageId);
requestObject.insert(_EXTRA, "viewSponsoredMessage");
this->sendRequest(requestObject);
}
void TDLibWrapper::pinMessage(const QString &chatId, const QString &messageId, bool disableNotification) void TDLibWrapper::pinMessage(const QString &chatId, const QString &messageId, bool disableNotification)
{ {
LOG("Pin message to chat" << chatId << messageId << disableNotification); LOG("Pin message to chat" << chatId << messageId << disableNotification);
@ -1890,7 +1879,7 @@ void TDLibWrapper::handleSponsoredMessage(qlonglong chatId, const QVariantMap &m
break; break;
case AppSettings::SponsoredMessAutoView: case AppSettings::SponsoredMessAutoView:
LOG("Auto-viewing sponsored message"); LOG("Auto-viewing sponsored message");
viewSponsoredMessage(chatId, message.value(ID).toULongLong()); viewMessage(chatId, message.value(MESSAGE_ID).toULongLong(), false);
break; break;
case AppSettings::SponsoredMessIgnore: case AppSettings::SponsoredMessIgnore:
LOG("Ignoring sponsored message"); LOG("Ignoring sponsored message");

3
src/tdlibwrapper.h
View file

@ -158,8 +158,7 @@ public:
Q_INVOKABLE void leaveChat(const QString &chatId); Q_INVOKABLE void leaveChat(const QString &chatId);
Q_INVOKABLE void deleteChat(qlonglong chatId); Q_INVOKABLE void deleteChat(qlonglong chatId);
Q_INVOKABLE void getChatHistory(qlonglong chatId, qlonglong fromMessageId = 0, int offset = -1, int limit = 50, bool onlyLocal = false); Q_INVOKABLE void getChatHistory(qlonglong chatId, qlonglong fromMessageId = 0, int offset = -1, int limit = 50, bool onlyLocal = false);
Q_INVOKABLE void viewMessage(const QString &chatId, const QString &messageId, bool force); Q_INVOKABLE void viewMessage(qlonglong chatId, qlonglong messageId, bool force);
Q_INVOKABLE void viewSponsoredMessage(qlonglong chatId, qlonglong messageId);
Q_INVOKABLE void pinMessage(const QString &chatId, const QString &messageId, bool disableNotification = false); Q_INVOKABLE void pinMessage(const QString &chatId, const QString &messageId, bool disableNotification = false);
Q_INVOKABLE void unpinMessage(const QString &chatId, const QString &messageId); Q_INVOKABLE void unpinMessage(const QString &chatId, const QString &messageId);
Q_INVOKABLE void sendTextMessage(const QString &chatId, const QString &message, const QString &replyToMessageId = "0"); Q_INVOKABLE void sendTextMessage(const QString &chatId, const QString &message, const QString &replyToMessageId = "0");