andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Add support for messages without sender.

Browse Source 
GitOrigin-RevId: a153b17b8ffa0dab998dcb911cdba8af78130b83
This commit is contained in:
levlam 2019-05-29 05:05:51 +03:00
parent dfa183a358
commit 575c3dfe4d
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/generate/scheme/td_api.tl
View File

@ -484,8 +484,8 @@ messageForwardOriginChannel chat_id:int53 message_id:int53 author_signature:stri
//@description Contains information about a forwarded message //@description Contains information about a forwarded message
//@origin Origin of a forwarded message //@origin Origin of a forwarded message
//@date Point in time (Unix timestamp) when the message was originally sent //@date Point in time (Unix timestamp) when the message was originally sent
//@from_chat_id For messages forwarded to the chat with the current user (saved messages), the identifier of the chat from which the message was forwarded last time; 0 if unknown //@from_chat_id For messages forwarded to the chat with the current user (saved messages) or to the channel discussion supergroup, the identifier of the chat from which the message was forwarded last time; 0 if unknown
//@from_message_id For messages forwarded to the chat with the current user (saved messages), the identifier of the original message from which the new message was forwarded last time; 0 if unknown //@from_message_id For messages forwarded to the chat with the current user (saved messages) or to the channel discussion supergroup, the identifier of the original message from which the new message was forwarded last time; 0 if unknown
messageForwardInfo origin:MessageForwardOrigin date:int32 from_chat_id:int53 from_message_id:int53 = MessageForwardInfo; messageForwardInfo origin:MessageForwardOrigin date:int32 from_chat_id:int53 from_message_id:int53 = MessageForwardInfo;
@ -500,7 +500,7 @@ messageSendingStateFailed = MessageSendingState;
//@description Describes a message //@description Describes a message
//@id Message identifier, unique for the chat to which the message belongs //@id Message identifier, unique for the chat to which the message belongs
//@sender_user_id Identifier of the user who sent the message; 0 if unknown. It is unknown for channel posts //@sender_user_id Identifier of the user who sent the message; 0 if unknown. Currently, it is unknown for channel posts and for channel posts automatically forwarded to discussion group
//@chat_id Chat identifier //@chat_id Chat identifier
//@sending_state Information about the sending state of the message; may be null //@sending_state Information about the sending state of the message; may be null
//@is_outgoing True, if the message is outgoing //@is_outgoing True, if the message is outgoing

58
td/telegram/MessagesManager.cpp
View File

@ -5478,6 +5478,7 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
auto channel_id = dialog_id.get_channel_id(); auto channel_id = dialog_id.get_channel_id();
if (!td_->contacts_manager_->have_channel(channel_id)) { if (!td_->contacts_manager_->have_channel(channel_id)) {
// do not create dialog if there is no info about the channel // do not create dialog if there is no info about the channel
LOG(WARNING) << "There is no info about " << channel_id << ", so ignore " << to_string(update);
return; return;
} }
@ -5530,6 +5531,7 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
LOG_IF(WARNING, new_pts == old_pts && pts_count == 0) LOG_IF(WARNING, new_pts == old_pts && pts_count == 0)
<< "Receive from " << source << " useless channel update " << oneline(to_string(update)); << "Receive from " << source << " useless channel update " << oneline(to_string(update));
LOG(INFO) << "Skip already applied channel update";
return; return;
} }
@ -5537,6 +5539,7 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
if (pts_count > 0) { if (pts_count > 0) {
d->postponed_channel_updates.emplace(new_pts, PendingPtsUpdate(std::move(update), new_pts, pts_count)); d->postponed_channel_updates.emplace(new_pts, PendingPtsUpdate(std::move(update), new_pts, pts_count));
} }
LOG(INFO) << "Postpone channel update, because getChannelDifference is run";
return; return;
} }
@ -5564,7 +5567,7 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
if (d == nullptr) { if (d == nullptr) {
d = get_dialog(dialog_id); d = get_dialog(dialog_id);
if (d == nullptr) { if (d == nullptr) {
// dialog was not created by the update LOG(INFO) << "Update didn't created " << dialog_id;
return; return;
} }
} }
@ -9786,24 +9789,17 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
CHECK(message_info.content != nullptr); CHECK(message_info.content != nullptr);
auto dialog_type = dialog_id.get_type();
UserId sender_user_id = message_info.sender_user_id; UserId sender_user_id = message_info.sender_user_id;
if (!sender_user_id.is_valid()) { if (!sender_user_id.is_valid()) {
if (!is_broadcast_channel(dialog_id)) { if (!is_broadcast_channel(dialog_id) && td_->auth_manager_->is_bot()) {
LOG(ERROR) << "Invalid " << sender_user_id << " specified to be a sender of the " << message_id << " in " sender_user_id = td_->contacts_manager_->get_service_notifications_user_id();
<< dialog_id; } else if (sender_user_id != UserId()) {
return {DialogId(), nullptr};
}
if (sender_user_id != UserId()) {
LOG(ERROR) << "Receive invalid " << sender_user_id; LOG(ERROR) << "Receive invalid " << sender_user_id;
sender_user_id = UserId(); sender_user_id = UserId();
} }
} }
auto dialog_type = dialog_id.get_type();
LOG_IF(ERROR, is_channel_message && dialog_type != DialogType::Channel)
<< "is_channel_message is true for message received in the " << dialog_id;
int32 flags = message_info.flags; int32 flags = message_info.flags;
if (flags & ~(MESSAGE_FLAG_IS_OUT | MESSAGE_FLAG_IS_FORWARDED | MESSAGE_FLAG_IS_REPLY | MESSAGE_FLAG_HAS_MENTION | if (flags & ~(MESSAGE_FLAG_IS_OUT | MESSAGE_FLAG_IS_FORWARDED | MESSAGE_FLAG_IS_REPLY | MESSAGE_FLAG_HAS_MENTION |
MESSAGE_FLAG_HAS_UNREAD_CONTENT | MESSAGE_FLAG_HAS_REPLY_MARKUP | MESSAGE_FLAG_HAS_ENTITIES | MESSAGE_FLAG_HAS_UNREAD_CONTENT | MESSAGE_FLAG_HAS_REPLY_MARKUP | MESSAGE_FLAG_HAS_ENTITIES |
@ -9817,6 +9813,11 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
bool is_silent = (flags & MESSAGE_FLAG_IS_SILENT) != 0; bool is_silent = (flags & MESSAGE_FLAG_IS_SILENT) != 0;
bool is_channel_post = (flags & MESSAGE_FLAG_IS_POST) != 0; bool is_channel_post = (flags & MESSAGE_FLAG_IS_POST) != 0;
LOG_IF(ERROR, is_channel_message && dialog_type != DialogType::Channel)
<< "is_channel_message is true for message received in the " << dialog_id;
LOG_IF(ERROR, is_channel_post && !is_broadcast_channel(dialog_id))
<< "is_channel_post is true for message received in the " << dialog_id;
UserId my_id = td_->contacts_manager_->get_my_id(); UserId my_id = td_->contacts_manager_->get_my_id();
DialogId my_dialog_id = DialogId(my_id); DialogId my_dialog_id = DialogId(my_id);
if (dialog_id == my_dialog_id) { if (dialog_id == my_dialog_id) {
@ -18071,19 +18072,23 @@ Result<vector<MessageId>> MessagesManager::forward_messages(DialogId to_dialog_i
forward_info->from_message_id = saved_from_message_id; forward_info->from_message_id = saved_from_message_id;
} else { } else {
if (from_dialog_id != DialogId(my_id)) { if (from_dialog_id != DialogId(my_id)) {
if (!forwarded_message->is_channel_post) { if (forwarded_message->is_channel_post) {
if (is_broadcast_channel(from_dialog_id)) {
auto author_signature = forwarded_message->sender_user_id.is_valid()
? td_->contacts_manager_->get_user_title(forwarded_message->sender_user_id)
: forwarded_message->author_signature;
forward_info = td::make_unique<MessageForwardInfo>(
UserId(), forwarded_message->date, from_dialog_id, forwarded_message->message_id,
std::move(author_signature), saved_from_dialog_id, saved_from_message_id);
} else {
LOG(ERROR) << "Don't know how to forward a channel post not from a channel";
}
} else if (forwarded_message->sender_user_id.is_valid()) {
forward_info = forward_info =
make_unique<MessageForwardInfo>(forwarded_message->sender_user_id, forwarded_message->date, DialogId(), make_unique<MessageForwardInfo>(forwarded_message->sender_user_id, forwarded_message->date, DialogId(),
MessageId(), "", saved_from_dialog_id, saved_from_message_id); MessageId(), "", saved_from_dialog_id, saved_from_message_id);
} else { } else {
CHECK(from_dialog_id.get_type() == DialogType::Channel); LOG(ERROR) << "Don't know how to forward a non-channel post message without forward info and sender";
MessageId forwarded_message_id = forwarded_message->message_id;
auto author_signature = forwarded_message->sender_user_id.is_valid()
? td_->contacts_manager_->get_user_title(forwarded_message->sender_user_id)
: forwarded_message->author_signature;
forward_info = td::make_unique<MessageForwardInfo>(UserId(), forwarded_message->date, from_dialog_id,
forwarded_message_id, std::move(author_signature),
saved_from_dialog_id, saved_from_message_id);
} }
} }
} }
@ -18319,7 +18324,7 @@ Result<MessageId> MessagesManager::add_local_message(
TRY_RESULT(message_content, process_input_message_content(dialog_id, std::move(input_message_content))); TRY_RESULT(message_content, process_input_message_content(dialog_id, std::move(input_message_content)));
bool is_channel_post = is_broadcast_channel(dialog_id); bool is_channel_post = is_broadcast_channel(dialog_id);
if (!td_->contacts_manager_->have_user_force(sender_user_id) && !(is_channel_post && sender_user_id == UserId())) { if (sender_user_id != UserId() && !td_->contacts_manager_->have_user_force(sender_user_id)) {
return Status::Error(400, "User not found"); return Status::Error(400, "User not found");
} }
@ -20673,7 +20678,8 @@ void MessagesManager::on_dialog_bots_updated(DialogId dialog_id, vector<UserId>
return; return;
} }
const Message *m = get_message_force(d, d->reply_markup_message_id, "on_dialog_bots_updated"); const Message *m = get_message_force(d, d->reply_markup_message_id, "on_dialog_bots_updated");
if (m == nullptr || std::find(bot_user_ids.begin(), bot_user_ids.end(), m->sender_user_id) == bot_user_ids.end()) { if (m == nullptr || (m->sender_user_id.is_valid() &&
std::find(bot_user_ids.begin(), bot_user_ids.end(), m->sender_user_id) == bot_user_ids.end())) {
LOG(INFO) << "Remove reply markup in " << dialog_id << ", because bot " LOG(INFO) << "Remove reply markup in " << dialog_id << ", because bot "
<< (m == nullptr ? UserId() : m->sender_user_id) << " isn't a member of the chat"; << (m == nullptr ? UserId() : m->sender_user_id) << " isn't a member of the chat";
set_dialog_reply_markup(d, MessageId()); set_dialog_reply_markup(d, MessageId());
@ -22436,7 +22442,8 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
if (*need_update && message->reply_markup->is_personal) { // if this keyboard is for us if (*need_update && message->reply_markup->is_personal) { // if this keyboard is for us
if (d->reply_markup_message_id != MessageId()) { if (d->reply_markup_message_id != MessageId()) {
const Message *old_message = get_message_force(d, d->reply_markup_message_id, "add_message_to_dialog 1"); const Message *old_message = get_message_force(d, d->reply_markup_message_id, "add_message_to_dialog 1");
if (old_message == nullptr || old_message->sender_user_id == message->sender_user_id) { if (old_message == nullptr ||
(old_message->sender_user_id.is_valid() && old_message->sender_user_id == message->sender_user_id)) {
set_dialog_reply_markup(d, MessageId()); set_dialog_reply_markup(d, MessageId());
} }
} }
@ -22887,7 +22894,8 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
add_message_file_sources(dialog_id, m); add_message_file_sources(dialog_id, m);
register_message_content(td_, m->content.get(), {dialog_id, message_id}); register_message_content(td_, m->content.get(), {dialog_id, message_id});
if (from_update && message_id.is_server() && dialog_id.get_type() == DialogType::Channel) { if (from_update && message_id.is_server() && dialog_id.get_type() == DialogType::Channel &&
m->sender_user_id.is_valid()) {
switch (message_content_type) { switch (message_content_type) {
case MessageContentType::ChatAddUsers: case MessageContentType::ChatAddUsers:
td_->contacts_manager_->speculative_add_channel_participants( td_->contacts_manager_->speculative_add_channel_participants(