diff options
Diffstat (limited to 'protocols/Telegram/src')
| -rw-r--r-- | protocols/Telegram/src/proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/Telegram/src/proto.h | 2 | ||||
| -rw-r--r-- | protocols/Telegram/src/server.cpp | 16 | ||||
| -rw-r--r-- | protocols/Telegram/src/utils.cpp | 4 |
4 files changed, 11 insertions, 13 deletions
diff --git a/protocols/Telegram/src/proto.cpp b/protocols/Telegram/src/proto.cpp index 2dc3c0a908..c0e92ecc40 100644 --- a/protocols/Telegram/src/proto.cpp +++ b/protocols/Telegram/src/proto.cpp @@ -381,7 +381,6 @@ HANDLE CTelegramProto::SendFile(MCONTACT hContact, const wchar_t *szDescription, pContent->photo_ = makeFile(pTransfer->m_fileName); pContent->thumbnail_ = 0; pContent->caption_ = std::move(caption); - pContent->ttl_ = 0; pContent->height_ = 0; pContent->width_ = 0; pMessage->input_message_content_ = std::move(pContent); @@ -400,7 +399,6 @@ HANDLE CTelegramProto::SendFile(MCONTACT hContact, const wchar_t *szDescription, pContent->duration_ = 0; pContent->height_ = 0; pContent->width_ = 0; - pContent->ttl_ = 0; pMessage->input_message_content_ = std::move(pContent); } else return nullptr; diff --git a/protocols/Telegram/src/proto.h b/protocols/Telegram/src/proto.h index 7181a92bce..0e87fec62c 100644 --- a/protocols/Telegram/src/proto.h +++ b/protocols/Telegram/src/proto.h @@ -237,7 +237,7 @@ class CTelegramProto : public PROTO<CTelegramProto> void ProcessConnectionState(TD::updateConnectionState *pObj); void ProcessDeleteMessage(TD::updateDeleteMessages *pObj); void ProcessFile(TD::updateFile *pObj); - void ProcessGroups(TD::updateChatFilters *pObj); + void ProcessGroups(TD::updateChatFolders *pObj); void ProcessMarkRead(TD::updateChatReadInbox *pObj); void ProcessMessage(const TD::message *pMsg); void ProcessMessageContent(TD::updateMessageContent *pObj); diff --git a/protocols/Telegram/src/server.cpp b/protocols/Telegram/src/server.cpp index 2bd4283763..90fa86a76b 100644 --- a/protocols/Telegram/src/server.cpp +++ b/protocols/Telegram/src/server.cpp @@ -112,7 +112,7 @@ void CTelegramProto::SendMarkRead() m_impl.m_markRead.Stop();
mir_cslock lck(m_csMarkRead);
- SendQuery(new TD::viewMessages(m_markChatId, 0, std::move(m_markIds), true));
+ SendQuery(new TD::viewMessages(m_markChatId, std::move(m_markIds), 0, true));
m_markChatId = 0;
}
@@ -144,8 +144,8 @@ void CTelegramProto::ProcessResponse(td::ClientManager::Response response) ProcessBasicGroup((TD::updateBasicGroup*)response.object.get());
break;
- case TD::updateChatFilters::ID:
- ProcessGroups((TD::updateChatFilters *)response.object.get());
+ case TD::updateChatFolders::ID:
+ ProcessGroups((TD::updateChatFolders *)response.object.get());
break;
case TD::updateChatLastMessage::ID:
@@ -486,9 +486,9 @@ void CTelegramProto::ProcessChatPosition(TD::updateChatPosition *pObj) auto *pPos = (TD::chatPosition *)pObj->position_.get();
if (pPos->list_) {
- auto *pList = (TD::chatListFilter *)pPos->list_.get();
+ auto *pList = (TD::chatListFolder *)pPos->list_.get();
- CMStringA szSetting(FORMAT, "ChatFilter%d", pList->chat_filter_id_);
+ CMStringA szSetting(FORMAT, "ChatFilter%d", pList->chat_folder_id_);
CMStringW wszGroup(getMStringW(szSetting));
if (!wszGroup.IsEmpty()) {
ptrW pwszExistingGroup(Clist_GetGroup(pUser->hContact));
@@ -551,10 +551,10 @@ void CTelegramProto::ProcessDeleteMessage(TD::updateDeleteMessages *pObj) }
}
-void CTelegramProto::ProcessGroups(TD::updateChatFilters *pObj)
+void CTelegramProto::ProcessGroups(TD::updateChatFolders *pObj)
{
- for (auto &grp : pObj->chat_filters_) {
- if (grp->icon_name_ != "Custom")
+ for (auto &grp : pObj->chat_folders_) {
+ if (grp->icon_->name_!= "Custom")
continue;
CMStringA szSetting(FORMAT, "ChatFilter%d", grp->id_);
diff --git a/protocols/Telegram/src/utils.cpp b/protocols/Telegram/src/utils.cpp index cc8aff096e..6ed1bff00d 100644 --- a/protocols/Telegram/src/utils.cpp +++ b/protocols/Telegram/src/utils.cpp @@ -403,7 +403,7 @@ CMStringA CTelegramProto::GetMessageText(TG_USER *pUser, const TD::message *pMsg case TD::messageAnimatedEmoji::ID:
if (m_bSmileyAdd) {
auto *pSticker = ((TD::messageAnimatedEmoji *)pBody)->animated_emoji_->sticker_.get();
- if (pSticker->type_->get_id() != TD::stickerTypeRegular::ID)
+ if (pSticker->full_type_->get_id() != TD::stickerTypeRegular::ID)
break;
const char *pwszFileExt;
@@ -424,7 +424,7 @@ CMStringA CTelegramProto::GetMessageText(TG_USER *pUser, const TD::message *pMsg case TD::messageSticker::ID:
if (m_bSmileyAdd) {
auto *pSticker = ((TD::messageSticker *)pBody)->sticker_.get();
- if (pSticker->type_->get_id() != TD::stickerTypeRegular::ID)
+ if (pSticker->full_type_->get_id() != TD::stickerTypeRegular::ID)
break;
const char *pwszFileExt;
|