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

Make more functions static. 

GitOrigin-RevId: 70c3e1fee2af9620ef61e4d337ba8126ca41634c
This commit is contained in:
levlam 2018-09-28 02:16:49 +03:00
parent 8236bb8c0e
commit 9ec9377815
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/Game.cpp
View File

@ -83,11 +83,11 @@ UserId Game::get_bot_user_id() const {
return bot_user_id_;
}
void Game::set_message_text(FormattedText &&text) {
void Game::set_text(FormattedText &&text) {
text_ = std::move(text);
}
const FormattedText &Game::get_message_text() const {
const FormattedText &Game::get_text() const {
return text_;
}

4
td/telegram/Game.h
View File

@ -55,9 +55,9 @@ class Game {
UserId get_bot_user_id() const;
void set_message_text(FormattedText &&text);
void set_text(FormattedText &&text);
const FormattedText &get_message_text() const;
const FormattedText &get_text() const;
tl_object_ptr<td_api::game> get_game_object(Td *td) const;

12
td/telegram/InlineQueriesManager.cpp
View File

@ -384,11 +384,9 @@ InlineMessageContent InlineQueriesManager::create_inline_message_content(
}
case telegram_api::botInlineMessageMediaAuto::ID: {
auto input_message_media_auto = move_tl_object_as<telegram_api::botInlineMessageMediaAuto>(inline_message);
auto caption = td_->messages_manager_->get_message_text(input_message_media_auto->message_,
std::move(input_message_media_auto->entities_), 0,
"register_inline_message_content");
reply_markup = std::move(input_message_media_auto->reply_markup_);
auto caption = MessagesManager::get_message_text(td_->contacts_manager_.get(), input_message_media_auto->message_,
std::move(input_message_media_auto->entities_), 0,
"register_inline_message_content");
if (allowed_media_content_id == td_api::inputMessageAnimation::ID) {
result.message_content = make_unique<MessageAnimation>(file_id, std::move(caption));
} else if (allowed_media_content_id == td_api::inputMessageAudio::ID) {
@ -408,10 +406,10 @@ InlineMessageContent InlineQueriesManager::create_inline_message_content(
} else if (allowed_media_content_id == td_api::inputMessageVoiceNote::ID) {
result.message_content = make_unique<MessageVoiceNote>(file_id, std::move(caption), true);
} else {
input_message_media_auto->reply_markup_ = std::move(reply_markup);
input_message_media_auto->message_ = std::move(caption.text);
LOG(WARNING) << "Unallowed bot inline message " << to_string(input_message_media_auto);
}
reply_markup = std::move(input_message_media_auto->reply_markup_);
break;
}
default:

26
td/telegram/MessagesManager.cpp
View File

@ -5696,8 +5696,8 @@ void MessagesManager::on_update_service_notification(tl_object_ptr<telegram_api:
int32 ttl = 0;
auto content = get_message_content(
td_,
get_message_text(std::move(update->message_), std::move(update->entities_), update->inbox_date_,
"on_update_service_notification"),
get_message_text(td_->contacts_manager_.get(), std::move(update->message_), std::move(update->entities_),
update->inbox_date_, "on_update_service_notification"),
std::move(update->media_),
td_->auth_manager_->is_bot() ? DialogId() : get_service_notifications_dialog()->dialog_id, false, UserId(), &ttl);
bool is_content_secret = is_secret_message_content(ttl, content->get_type());
@ -10665,7 +10665,7 @@ MessagesManager::MessageInfo MessagesManager::parse_telegram_api_message(
}
message_info.content = get_message_content(
td_,
get_message_text(std::move(message->message_), std::move(message->entities_),
get_message_text(td_->contacts_manager_.get(), std::move(message->message_), std::move(message->entities_),
message_info.forward_header ? message_info.forward_header->date_ : message_info.date,
"parse_telegram_api_message"),
std::move(message->media_), message_info.dialog_id, is_content_read, message_info.via_bot_user_id,
@ -11217,8 +11217,8 @@ void MessagesManager::on_update_sent_text_message(int64 random_id,
auto new_content = get_message_content(
td_,
get_message_text(message_text->text.text, std::move(entities), m->forward_info ? m->forward_info->date : m->date,
"on_update_sent_text_message"),
get_message_text(td_->contacts_manager_.get(), message_text->text.text, std::move(entities),
m->forward_info ? m->forward_info->date : m->date, "on_update_sent_text_message"),
std::move(message_media), dialog_id, true /*likely ignored*/, UserId() /*likely ignored*/, nullptr /*ignored*/);
if (new_content->get_type() != MessageContentType::Text) {
LOG(ERROR) << "Text message content has changed to " << new_content->get_type();
@ -15730,13 +15730,13 @@ Result<Contact> MessagesManager::process_input_message_contact(
}
Result<Game> MessagesManager::process_input_message_game(
tl_object_ptr<td_api::InputMessageContent> &&input_message_content) const {
const ContactsManager *contacts_manager, tl_object_ptr<td_api::InputMessageContent> &&input_message_content) {
CHECK(input_message_content != nullptr);
CHECK(input_message_content->get_id() == td_api::inputMessageGame::ID);
auto input_message_game = move_tl_object_as<td_api::inputMessageGame>(input_message_content);
UserId bot_user_id(input_message_game->bot_user_id_);
if (!td_->contacts_manager_->have_input_user(bot_user_id)) {
if (!contacts_manager->have_input_user(bot_user_id)) {
return Status::Error(400, "Game owner bot is not accessible");
}
@ -16411,7 +16411,7 @@ FormattedText MessagesManager::get_message_content_text(const MessageContent *co
case MessageContentType::Text:
return static_cast<const MessageText *>(content)->text;
case MessageContentType::Game:
return static_cast<const MessageGame *>(content)->game.get_message_text();
return static_cast<const MessageGame *>(content)->game.get_text();
default:
return get_message_content_caption(content);
}
@ -17243,7 +17243,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
break;
}
case td_api::inputMessageGame::ID: {
TRY_RESULT(game, process_input_message_game(std::move(input_message_content)));
TRY_RESULT(game, process_input_message_game(td_->contacts_manager_.get(), std::move(input_message_content)));
via_bot_user_id = game.get_bot_user_id();
if (via_bot_user_id == td_->contacts_manager_->get_my_id("send_message")) {
via_bot_user_id = UserId();
@ -22387,10 +22387,10 @@ FormattedText MessagesManager::get_secret_media_caption(string &&message_text, s
return caption;
}
FormattedText MessagesManager::get_message_text(string message_text,
FormattedText MessagesManager::get_message_text(const ContactsManager *contacts_manager, string message_text,
vector<tl_object_ptr<telegram_api::MessageEntity>> &&server_entities,
int32 send_date, const char *source) const {
auto entities = get_message_entities(td_->contacts_manager_.get(), std::move(server_entities), source);
int32 send_date, const char *source) {
auto entities = get_message_entities(contacts_manager, std::move(server_entities), source);
auto status = fix_formatted_text(message_text, entities, true, true, true, false);
if (status.is_error()) {
if (send_date == 0 || send_date > 1497000000) { // approximate fix date
@ -22876,7 +22876,7 @@ unique_ptr<MessageContent> MessagesManager::get_message_content(Td *td, Formatte
}
m->game.set_bot_user_id(via_bot_user_id);
m->game.set_message_text(std::move(message));
m->game.set_text(std::move(message));
return std::move(m);
}

9
td/telegram/MessagesManager.h
View File

@ -1080,14 +1080,15 @@ class MessagesManager : public Actor {
static Result<Contact> process_input_message_contact(
tl_object_ptr<td_api::InputMessageContent> &&input_message_content) TD_WARN_UNUSED_RESULT;
Result<Game> process_input_message_game(tl_object_ptr<td_api::InputMessageContent> &&input_message_content) const
static Result<Game> process_input_message_game(const ContactsManager *contacts_manager,
tl_object_ptr<td_api::InputMessageContent> &&input_message_content)
TD_WARN_UNUSED_RESULT;
bool need_skip_bot_commands(DialogId dialog_id, bool is_bot) const;
FormattedText get_message_text(string message_text,
vector<tl_object_ptr<telegram_api::MessageEntity>> &&server_entities, int32 send_date,
const char *source) const;
static FormattedText get_message_text(const ContactsManager *contacts_manager, string message_text,
vector<tl_object_ptr<telegram_api::MessageEntity>> &&server_entities,
int32 send_date, const char *source);
Result<MessageId> send_message(DialogId dialog_id, MessageId reply_to_message_id, bool disable_notification,
bool from_background, tl_object_ptr<td_api::ReplyMarkup> &&reply_markup,