tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support chats as recent repliers.

Browse Source 
GitOrigin-RevId: 6da36600e99c655f4484f09fc787382481a3148b
This commit is contained in:
levlam 2020-09-09 02:32:07 +03:00
parent f05b8cec61
commit 4d47247fc1
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
td/telegram/MessageReplyInfo.cpp
View File

@ -6,8 +6,6 @@
// //
#include "td/telegram/MessageReplyInfo.h" #include "td/telegram/MessageReplyInfo.h"
#include "td/telegram/DialogId.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
namespace td { namespace td {
@ -27,9 +25,7 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr<telegram_api::messageReplies> &
for (auto &peer : reply_info->recent_repliers_) { for (auto &peer : reply_info->recent_repliers_) {
DialogId dialog_id(peer); DialogId dialog_id(peer);
if (dialog_id.is_valid()) { if (dialog_id.is_valid()) {
if (dialog_id.get_type() == DialogType::User) { recent_replier_dialog_ids.push_back(dialog_id);
recent_replier_user_ids.push_back(dialog_id.get_user_id());
}
} else { } else {
LOG(ERROR) << "Receive " << dialog_id << " as a recent replier"; LOG(ERROR) << "Receive " << dialog_id << " as a recent replier";
} }
@ -54,7 +50,7 @@ bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
} }
StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo &reply_info) { StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo &reply_info) {
return string_builder << reply_info.reply_count << " replies by " << reply_info.recent_replier_user_ids; return string_builder << reply_info.reply_count << " replies by " << reply_info.recent_replier_dialog_ids;
} }
} // namespace td } // namespace td

20
td/telegram/MessageReplyInfo.h
View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#include "td/telegram/ChannelId.h" #include "td/telegram/ChannelId.h"
#include "td/telegram/DialogId.h"
#include "td/telegram/telegram_api.h" #include "td/telegram/telegram_api.h"
#include "td/telegram/UserId.h"
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/StringBuilder.h" #include "td/utils/StringBuilder.h"
@ -19,7 +19,7 @@ namespace td {
struct MessageReplyInfo { struct MessageReplyInfo {
int32 reply_count = -1; int32 reply_count = -1;
int32 pts = -1; int32 pts = -1;
vector<UserId> recent_replier_user_ids; vector<DialogId> recent_replier_dialog_ids;
ChannelId channel_id; ChannelId channel_id;
bool is_comment = false; bool is_comment = false;
@ -36,17 +36,17 @@ struct MessageReplyInfo {
template <class StorerT> template <class StorerT>
void store(StorerT &storer) const { void store(StorerT &storer) const {
CHECK(!is_empty()); CHECK(!is_empty());
bool has_recent_replier_user_ids = !recent_replier_user_ids.empty(); bool has_recent_replier_dialog_ids = !recent_replier_dialog_ids.empty();
bool has_channel_id = channel_id.is_valid(); bool has_channel_id = channel_id.is_valid();
BEGIN_STORE_FLAGS(); BEGIN_STORE_FLAGS();
STORE_FLAG(is_comment); STORE_FLAG(is_comment);
STORE_FLAG(has_recent_replier_user_ids); STORE_FLAG(has_recent_replier_dialog_ids);
STORE_FLAG(has_channel_id); STORE_FLAG(has_channel_id);
END_STORE_FLAGS(); END_STORE_FLAGS();
td::store(reply_count, storer); td::store(reply_count, storer);
td::store(pts, storer); td::store(pts, storer);
if (has_recent_replier_user_ids) { if (has_recent_replier_dialog_ids) {
td::store(recent_replier_user_ids, storer); td::store(recent_replier_dialog_ids, storer);
} }
if (has_channel_id) { if (has_channel_id) {
td::store(channel_id, storer); td::store(channel_id, storer);
@ -55,17 +55,17 @@ struct MessageReplyInfo {
template <class ParserT> template <class ParserT>
void parse(ParserT &parser) { void parse(ParserT &parser) {
bool has_recent_replier_user_ids = !recent_replier_user_ids.empty(); bool has_recent_replier_dialog_ids = !recent_replier_dialog_ids.empty();
bool has_channel_id = channel_id.is_valid(); bool has_channel_id = channel_id.is_valid();
BEGIN_PARSE_FLAGS(); BEGIN_PARSE_FLAGS();
PARSE_FLAG(is_comment); PARSE_FLAG(is_comment);
PARSE_FLAG(has_recent_replier_user_ids); PARSE_FLAG(has_recent_replier_dialog_ids);
PARSE_FLAG(has_channel_id); PARSE_FLAG(has_channel_id);
END_PARSE_FLAGS(); END_PARSE_FLAGS();
td::parse(reply_count, parser); td::parse(reply_count, parser);
td::parse(pts, parser); td::parse(pts, parser);
if (has_recent_replier_user_ids) { if (has_recent_replier_dialog_ids) {
td::parse(recent_replier_user_ids, parser); td::parse(recent_replier_dialog_ids, parser);
} }
if (has_channel_id) { if (has_channel_id) {
td::parse(channel_id, parser); td::parse(channel_id, parser);

15
td/telegram/MessagesManager.cpp
View File

@ -6132,10 +6132,15 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
return nullptr; return nullptr;
} }
vector<UserId> recent_replier_user_ids;
for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
if (dialog_id.get_type() == DialogType::User) {
recent_replier_user_ids.push_back(recent_replier_dialog_id.get_user_id());
}
}
return td_api::make_object<td_api::messageInteractionInfo>( return td_api::make_object<td_api::messageInteractionInfo>(
m->view_count, m->forward_count, m->reply_info.reply_count, m->view_count, m->forward_count, m->reply_info.reply_count,
td_->contacts_manager_->get_user_ids_object(m->reply_info.recent_replier_user_ids, td_->contacts_manager_->get_user_ids_object(recent_replier_user_ids, "get_message_interaction_info_object"));
"get_message_interaction_info_object"));
} }
bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Message *m, int32 view_count, bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Message *m, int32 view_count,
@ -20876,8 +20881,10 @@ void MessagesManager::add_message_dependencies(Dependencies &dependencies, Dialo
add_dialog_dependencies(dependencies, m->forward_info->from_dialog_id); add_dialog_dependencies(dependencies, m->forward_info->from_dialog_id);
} }
} }
for (auto recent_replier_user_id : m->reply_info.recent_replier_user_ids) { for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
dependencies.user_ids.insert(recent_replier_user_id); if (dialog_id.get_type() == DialogType::User) {
dependencies.user_ids.insert(recent_replier_dialog_id.get_user_id());
}
} }
add_message_content_dependencies(dependencies, m->content.get()); add_message_content_dependencies(dependencies, m->content.get());
} }