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

Improve function and parameters names.

Browse Source
This commit is contained in:
levlam 2023-10-29 22:05:23 +03:00
parent 1b12428c9a
commit 0ad0f7cdcc
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
td/telegram/MessagesManager.cpp
View File

@ -27762,61 +27762,57 @@ Result<td_api::object_ptr<td_api::message>> MessagesManager::forward_message(
return std::move(result->messages_[0]); return std::move(result->messages_[0]);
} }
MessageOrigin MessagesManager::get_message_forward_origin(DialogId from_dialog_id, MessageOrigin MessagesManager::get_forwarded_message_origin(DialogId dialog_id, const Message *m) const {
const Message *forwarded_message) const { if (m->forward_info != nullptr) {
if (forwarded_message->forward_info != nullptr) { return m->forward_info->origin;
return forwarded_message->forward_info->origin;
} }
if (forwarded_message->is_channel_post) { if (m->is_channel_post) {
if (is_broadcast_channel(from_dialog_id)) { if (is_broadcast_channel(dialog_id)) {
auto author_signature = forwarded_message->sender_user_id.is_valid() auto author_signature = m->sender_user_id.is_valid() ? td_->contacts_manager_->get_user_title(m->sender_user_id)
? td_->contacts_manager_->get_user_title(forwarded_message->sender_user_id) : m->author_signature;
: forwarded_message->author_signature; return MessageOrigin{UserId(), dialog_id, m->message_id, std::move(author_signature), string()};
return MessageOrigin{UserId(), from_dialog_id, forwarded_message->message_id, std::move(author_signature),
string()};
} else { } else {
LOG(ERROR) << "Don't know how to forward a channel post not from a channel"; LOG(ERROR) << "Don't know how to forward a channel post not from a channel";
} }
} else if (forwarded_message->sender_user_id.is_valid() || forwarded_message->sender_dialog_id.is_valid()) { } else if (m->sender_user_id.is_valid() || m->sender_dialog_id.is_valid()) {
auto author_signature = forwarded_message->author_signature; auto author_signature = m->author_signature;
return MessageOrigin{forwarded_message->sender_user_id, forwarded_message->sender_dialog_id, MessageId(), string(), return MessageOrigin{m->sender_user_id, m->sender_dialog_id, MessageId(), string(), std::move(author_signature)};
std::move(author_signature)};
} else { } else {
LOG(ERROR) << "Don't know how to forward a non-channel post message without forward info and sender"; LOG(ERROR) << "Don't know how to forward a non-channel post message without forward info and sender";
} }
return {}; return {};
} }
unique_ptr<MessagesManager::MessageForwardInfo> MessagesManager::create_message_forward_info( unique_ptr<MessagesManager::MessageForwardInfo> MessagesManager::create_message_forward_info(DialogId from_dialog_id,
DialogId from_dialog_id, DialogId to_dialog_id, const Message *forwarded_message) const { DialogId to_dialog_id,
auto content_type = forwarded_message->content->get_type(); const Message *m) const {
auto content_type = m->content->get_type();
if (content_type == MessageContentType::Game || content_type == MessageContentType::Audio || if (content_type == MessageContentType::Game || content_type == MessageContentType::Audio ||
content_type == MessageContentType::Story) { content_type == MessageContentType::Story) {
return nullptr; return nullptr;
} }
auto my_id = td_->contacts_manager_->get_my_id(); auto my_dialog_id = get_my_dialog_id();
auto message_id = forwarded_message->message_id;
DialogId saved_from_dialog_id; DialogId saved_from_dialog_id;
MessageId saved_from_message_id; MessageId saved_from_message_id;
if (to_dialog_id == DialogId(my_id)) { if (to_dialog_id == my_dialog_id) {
saved_from_dialog_id = from_dialog_id; saved_from_dialog_id = from_dialog_id;
saved_from_message_id = message_id; saved_from_message_id = m->message_id;
} }
if (forwarded_message->forward_info != nullptr) { if (m->forward_info != nullptr) {
auto forward_info = make_unique<MessageForwardInfo>(*forwarded_message->forward_info); auto forward_info = make_unique<MessageForwardInfo>(*m->forward_info);
forward_info->from_dialog_id = saved_from_dialog_id; forward_info->from_dialog_id = saved_from_dialog_id;
forward_info->from_message_id = saved_from_message_id; forward_info->from_message_id = saved_from_message_id;
return forward_info; return forward_info;
} }
if (from_dialog_id != DialogId(my_id) || content_type == MessageContentType::Dice) { if (from_dialog_id != my_dialog_id || content_type == MessageContentType::Dice) {
auto origin = get_message_forward_origin(from_dialog_id, forwarded_message); auto origin = get_forwarded_message_origin(from_dialog_id, m);
if (!origin.is_empty()) { if (!origin.is_empty()) {
return td::make_unique<MessageForwardInfo>(std::move(origin), forwarded_message->date, saved_from_dialog_id, return td::make_unique<MessageForwardInfo>(std::move(origin), m->date, saved_from_dialog_id,
saved_from_message_id, "", false); saved_from_message_id, "", false);
} }
} }

4
td/telegram/MessagesManager.h
View File

@ -1882,10 +1882,10 @@ class MessagesManager final : public Actor {
bool in_game_share, bool in_game_share,
MessageCopyOptions &&copy_options) TD_WARN_UNUSED_RESULT; MessageCopyOptions &&copy_options) TD_WARN_UNUSED_RESULT;
MessageOrigin get_message_forward_origin(DialogId from_dialog_id, const Message *forwarded_message) const; MessageOrigin get_forwarded_message_origin(DialogId dialog_id, const Message *m) const;
unique_ptr<MessageForwardInfo> create_message_forward_info(DialogId from_dialog_id, DialogId to_dialog_id, unique_ptr<MessageForwardInfo> create_message_forward_info(DialogId from_dialog_id, DialogId to_dialog_id,
const Message *forwarded_message) const; const Message *m) const;
void fix_forwarded_message(Message *m, DialogId to_dialog_id, const Message *forwarded_message, int64 media_album_id, void fix_forwarded_message(Message *m, DialogId to_dialog_id, const Message *forwarded_message, int64 media_album_id,
bool drop_author) const; bool drop_author) const;