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

Add source to get_chat_member_object.

Browse Source
This commit is contained in:
levlam 2023-10-24 15:17:18 +03:00
parent 7152a5c2e1
commit f0382d8789
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/ContactsManager.cpp
View File

@ -14289,17 +14289,17 @@ const DialogParticipant *ContactsManager::get_chat_full_participant(const ChatFu
return nullptr;
}
tl_object_ptr<td_api::chatMember> ContactsManager::get_chat_member_object(
const DialogParticipant &dialog_participant) const {
tl_object_ptr<td_api::chatMember> ContactsManager::get_chat_member_object(const DialogParticipant &dialog_participant,
const char *source) const {
DialogId dialog_id = dialog_participant.dialog_id_;
UserId participant_user_id;
if (dialog_id.get_type() == DialogType::User) {
participant_user_id = dialog_id.get_user_id();
} else {
td_->messages_manager_->force_create_dialog(dialog_id, "get_chat_member_object", true);
td_->messages_manager_->force_create_dialog(dialog_id, source, true);
}
return td_api::make_object<td_api::chatMember>(
get_message_sender_object_const(td_, dialog_id, "get_chat_member_object"),
get_message_sender_object_const(td_, dialog_id, source),
get_user_id_object(dialog_participant.inviter_user_id_, "chatMember.inviter_user_id"),
dialog_participant.joined_date_, dialog_participant.status_.get_chat_member_status_object());
}
@ -16487,7 +16487,8 @@ void ContactsManager::send_update_chat_member(DialogId dialog_id, UserId agent_u
td_->messages_manager_->get_chat_id_object(dialog_id, "updateChatMember"),
get_user_id_object(agent_user_id, "send_update_chat_member"), date,
invite_link.get_chat_invite_link_object(this), via_dialog_filter_invite_link,
get_chat_member_object(old_dialog_participant), get_chat_member_object(new_dialog_participant)));
get_chat_member_object(old_dialog_participant, "send_update_chat_member old"),
get_chat_member_object(new_dialog_participant, "send_update_chat_member new")));
}
void ContactsManager::on_update_bot_stopped(UserId user_id, int32 date, bool is_stopped) {
@ -18047,7 +18048,7 @@ void ContactsManager::finish_get_dialog_participant(DialogParticipant &&dialog_p
return promise.set_error(Status::Error(400, "Member not found"));
}
promise.set_value(get_chat_member_object(dialog_participant));
promise.set_value(get_chat_member_object(dialog_participant, "finish_get_dialog_participant"));
}
void ContactsManager::do_get_dialog_participant(DialogId dialog_id, DialogId participant_dialog_id,
@ -19314,7 +19315,7 @@ tl_object_ptr<td_api::basicGroupFullInfo> ContactsManager::get_basic_group_full_
return commands.get_bot_commands_object(td);
});
auto members = transform(chat_full->participants, [this](const DialogParticipant &dialog_participant) {
return get_chat_member_object(dialog_participant);
return get_chat_member_object(dialog_participant, "get_basic_group_full_info_object");
});
return make_tl_object<td_api::basicGroupFullInfo>(
get_chat_photo_object(td_->file_manager_.get(), chat_full->photo), chat_full->description,

3
td/telegram/ContactsManager.h
View File

@ -707,7 +707,8 @@ class ContactsManager final : public Actor {
bool is_outbound, int32 ttl, int32 date, string key_hash, int32 layer,
FolderId initial_folder_id);
tl_object_ptr<td_api::chatMember> get_chat_member_object(const DialogParticipant &dialog_participant) const;
tl_object_ptr<td_api::chatMember> get_chat_member_object(const DialogParticipant &dialog_participant,
const char *source) const;
tl_object_ptr<td_api::chatInviteLinkInfo> get_chat_invite_link_info_object(const string &invite_link);

4
td/telegram/DialogParticipant.cpp
View File

@ -814,11 +814,11 @@ StringBuilder &operator<<(StringBuilder &string_builder, const DialogParticipant
<< ']';
}
td_api::object_ptr<td_api::chatMembers> DialogParticipants::get_chat_members_object(Td *td) const {
td_api::object_ptr<td_api::chatMembers> DialogParticipants::get_chat_members_object(Td *td, const char *source) const {
vector<tl_object_ptr<td_api::chatMember>> chat_members;
chat_members.reserve(participants_.size());
for (auto &participant : participants_) {
chat_members.push_back(td->contacts_manager_->get_chat_member_object(participant));
chat_members.push_back(td->contacts_manager_->get_chat_member_object(participant, source));
}
return td_api::make_object<td_api::chatMembers>(total_count_, std::move(chat_members));

2
td/telegram/DialogParticipant.h
View File

@ -685,7 +685,7 @@ struct DialogParticipants {
: total_count_(total_count), participants_(std::move(participants)) {
}
td_api::object_ptr<td_api::chatMembers> get_chat_members_object(Td *td) const;
td_api::object_ptr<td_api::chatMembers> get_chat_members_object(Td *td, const char *source) const;
};
DialogParticipantStatus get_dialog_participant_status(const td_api::object_ptr<td_api::ChatMemberStatus> &status,

4
td/telegram/Td.cpp
View File

@ -6833,7 +6833,7 @@ void Td::on_request(uint64 id, td_api::searchChatMembers &request) {
if (result.is_error()) {
promise.set_error(result.move_as_error());
} else {
promise.set_value(result.ok().get_chat_members_object(td));
promise.set_value(result.ok().get_chat_members_object(td, "searchChatMembers"));
}
});
contacts_manager_->search_dialog_participants(DialogId(request.chat_id_), request.query_, request.limit_,
@ -7674,7 +7674,7 @@ void Td::on_request(uint64 id, td_api::getSupergroupMembers &request) {
if (result.is_error()) {
promise.set_error(result.move_as_error());
} else {
promise.set_value(result.ok().get_chat_members_object(td));
promise.set_value(result.ok().get_chat_members_object(td, "getSupergroupMembers"));
}
});
contacts_manager_->get_channel_participants(ChannelId(request.supergroup_id_), std::move(request.filter_), string(),