MarcoBuster/tdlight-telegram-bot-api
1
0
Fork 0
mirror of https://github.com/tdlight-team/tdlight-telegram-bot-api.git synced 2024-11-30 15:42:54 +01:00
Code Issues Releases Wiki Activity

Store td_api::MessageOrigin in MessageInfo.

Browse Source
This commit is contained in:
levlam 2023-11-13 22:41:02 +03:00 committed by David Guillen Fandos
parent c3999a2144
commit 05d9cd05b7
2 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
telegram-bot-api/Client.cpp
View File

@ -2150,23 +2150,39 @@ void Client::JsonMessage::store(td::JsonValueScope *scope) const {
object("message_thread_id", as_client_message_id(message_->message_thread_id)); object("message_thread_id", as_client_message_id(message_->message_thread_id));
} }
if (message_->initial_send_date > 0) { if (message_->initial_send_date > 0) {
if (message_->initial_sender_user_id != 0) { CHECK(message_->forward_origin != nullptr);
object("forward_from", JsonUser(message_->initial_sender_user_id, client_)); switch (message_->forward_origin->get_id()) {
case td_api::messageOriginUser::ID: {
auto forward_info = static_cast<const td_api::messageOriginUser *>(message_->forward_origin.get());
object("forward_from", JsonUser(forward_info->sender_user_id_, client_));
break;
} }
if (message_->initial_sender_chat_id != 0) { case td_api::messageOriginChat::ID: {
object("forward_from_chat", JsonChat(message_->initial_sender_chat_id, false, client_)); auto forward_info = static_cast<const td_api::messageOriginChat *>(message_->forward_origin.get());
object("forward_from_chat", JsonChat(forward_info->sender_chat_id_, false, client_));
if (!forward_info->author_signature_.empty()) {
object("forward_signature", forward_info->author_signature_);
} }
if (message_->initial_chat_id != 0) { break;
object("forward_from_chat", JsonChat(message_->initial_chat_id, false, client_));
if (message_->initial_message_id != 0) {
object("forward_from_message_id", as_client_message_id(message_->initial_message_id));
} }
case td_api::messageOriginHiddenUser::ID: {
auto forward_info = static_cast<const td_api::messageOriginHiddenUser *>(message_->forward_origin.get());
if (!forward_info->sender_name_.empty()) {
object("forward_sender_name", forward_info->sender_name_);
} }
if (!message_->initial_author_signature.empty()) { break;
object("forward_signature", message_->initial_author_signature);
} }
if (!message_->initial_sender_name.empty()) { case td_api::messageOriginChannel::ID: {
object("forward_sender_name", message_->initial_sender_name); auto forward_info = static_cast<const td_api::messageOriginChannel *>(message_->forward_origin.get());
object("forward_from_chat", JsonChat(forward_info->chat_id_, false, client_));
object("forward_from_message_id", as_client_message_id(forward_info->message_id_));
if (!forward_info->author_signature_.empty()) {
object("forward_signature", forward_info->author_signature_);
}
break;
}
default:
UNREACHABLE();
} }
if (message_->is_automatic_forward) { if (message_->is_automatic_forward) {
object("is_automatic_forward", td::JsonTrue()); object("is_automatic_forward", td::JsonTrue());
@ -13243,51 +13259,20 @@ Client::FullMessageId Client::add_message(object_ptr<td_api::message> &&message,
message_info->via_bot_user_id = message->via_bot_user_id_; message_info->via_bot_user_id = message->via_bot_user_id_;
message_info->message_thread_id = message->message_thread_id_; message_info->message_thread_id = message->message_thread_id_;
message_info->initial_chat_id = 0;
message_info->initial_sender_user_id = 0;
message_info->initial_sender_chat_id = 0;
message_info->initial_send_date = 0;
message_info->initial_message_id = 0;
message_info->initial_author_signature = td::string();
message_info->initial_sender_name = td::string();
message_info->is_automatic_forward = false;
if (message->forward_info_ != nullptr) { if (message->forward_info_ != nullptr) {
message_info->initial_send_date = message->forward_info_->date_; message_info->initial_send_date = message->forward_info_->date_;
auto origin = std::move(message->forward_info_->origin_); message_info->forward_origin = std::move(message->forward_info_->origin_);
switch (origin->get_id()) {
case td_api::messageOriginUser::ID: {
auto forward_info = move_object_as<td_api::messageOriginUser>(origin);
message_info->initial_sender_user_id = forward_info->sender_user_id_;
break;
}
case td_api::messageOriginChat::ID: {
auto forward_info = move_object_as<td_api::messageOriginChat>(origin);
message_info->initial_sender_chat_id = forward_info->sender_chat_id_;
message_info->initial_author_signature = std::move(forward_info->author_signature_);
break;
}
case td_api::messageOriginHiddenUser::ID: {
auto forward_info = move_object_as<td_api::messageOriginHiddenUser>(origin);
message_info->initial_sender_name = std::move(forward_info->sender_name_);
break;
}
case td_api::messageOriginChannel::ID: {
auto forward_info = move_object_as<td_api::messageOriginChannel>(origin);
message_info->initial_chat_id = forward_info->chat_id_;
message_info->initial_message_id = forward_info->message_id_;
message_info->initial_author_signature = std::move(forward_info->author_signature_);
break;
}
default:
UNREACHABLE();
}
auto from_chat_id = message->forward_info_->from_chat_id_; auto from_chat_id = message->forward_info_->from_chat_id_;
message_info->is_automatic_forward = message_info->is_automatic_forward =
from_chat_id != 0 && from_chat_id != chat_id && message->forward_info_->from_message_id_ != 0 && from_chat_id != 0 && from_chat_id != chat_id && message->forward_info_->from_message_id_ != 0 &&
get_chat_type(chat_id) == ChatType::Supergroup && get_chat_type(from_chat_id) == ChatType::Channel; get_chat_type(chat_id) == ChatType::Supergroup && get_chat_type(from_chat_id) == ChatType::Channel;
} else if (message->import_info_ != nullptr) { } else if (message->import_info_ != nullptr) {
message_info->initial_send_date = message->import_info_->date_; message_info->initial_send_date = message->import_info_->date_;
message_info->initial_sender_name = std::move(message->import_info_->sender_name_); message_info->forward_origin = make_object<td_api::messageOriginHiddenUser>(message->import_info_->sender_name_);
} else {
message_info->initial_send_date = 0;
message_info->forward_origin = nullptr;
} }
CHECK(message->sender_id_ != nullptr); CHECK(message->sender_id_ != nullptr);

7
telegram-bot-api/Client.h
View File

@ -932,13 +932,8 @@ class Client final : public WebhookActor::Callback {
int64 message_thread_id = 0; int64 message_thread_id = 0;
int32 date = 0; int32 date = 0;
int32 edit_date = 0; int32 edit_date = 0;
int64 initial_chat_id = 0;
int64 initial_sender_user_id = 0;
int64 initial_sender_chat_id = 0;
int32 initial_send_date = 0; int32 initial_send_date = 0;
int64 initial_message_id = 0; object_ptr<td_api::MessageOrigin> forward_origin;
td::string initial_author_signature;
td::string initial_sender_name;
td::string author_signature; td::string author_signature;
object_ptr<td_api::messageReplyToMessage> reply_to_message; object_ptr<td_api::messageReplyToMessage> reply_to_message;
int64 media_album_id = 0; int64 media_album_id = 0;