Skip to content

Commit d68320c

Browse files
committed
tg_cli: add and use as_input_message.
1 parent a74c276 commit d68320c

1 file changed

Lines changed: 18 additions & 20 deletions

File tree

td/telegram/cli.cpp

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,6 +2218,15 @@ class CliClient final : public Actor {
22182218
arg.message = std::move(args);
22192219
}
22202220

2221+
td_api::object_ptr<td_api::InputMessageContent> as_input_message(const string &message, bool is_rich) const {
2222+
if (is_rich) {
2223+
return td_api::make_object<td_api::inputMessageRichMessage>(as_input_rich_message(message), true);
2224+
} else {
2225+
return td_api::make_object<td_api::inputMessageText>(as_formatted_text(message), get_link_preview_options(),
2226+
true);
2227+
}
2228+
}
2229+
22212230
static td_api::object_ptr<td_api::NotificationSettingsScope> as_notification_settings_scope(Slice scope) {
22222231
if (scope.empty()) {
22232232
return nullptr;
@@ -6276,8 +6285,7 @@ class CliClient final : public Actor {
62766285
get_added_sticker_file_ids(), 0, 0, as_caption(message), show_caption_above_media_,
62776286
get_message_self_destruct_type(), has_spoiler_));
62786287
} else {
6279-
send_message(chat_id, td_api::make_object<td_api::inputMessageText>(as_formatted_text(message),
6280-
get_link_preview_options(), true));
6288+
send_message(chat_id, as_input_message(message, false));
62816289
}
62826290
}
62836291
} else if (op == "ssm") {
@@ -6358,17 +6366,14 @@ class CliClient final : public Actor {
63586366
get_args(args, suggested_post_price_);
63596367
} else if (op == "sspsd") {
63606368
get_args(args, suggested_post_send_date_);
6361-
} else if (op == "sm" || op == "sms" || op == "smf") {
6369+
} else if (op == "sm" || op == "sms" || op == "smf" || op == "srm") {
63626370
ChatId chat_id;
63636371
string message;
63646372
get_args(args, chat_id, message);
63656373
if (op == "smf") {
63666374
message = string(5097, 'a');
63676375
}
6368-
send_message(
6369-
chat_id,
6370-
td_api::make_object<td_api::inputMessageText>(as_formatted_text(message), get_link_preview_options(), true),
6371-
op == "sms", false);
6376+
send_message(chat_id, as_input_message(message, op == "srm"), op == "sms", false);
63726377
} else if (op == "smce") {
63736378
ChatId chat_id;
63746379
get_args(args, chat_id);
@@ -6382,19 +6387,14 @@ class CliClient final : public Actor {
63826387
auto text = as_formatted_text("👍 😉 🧑‍🚒", std::move(entities));
63836388
send_message(chat_id,
63846389
td_api::make_object<td_api::inputMessageText>(std::move(text), get_link_preview_options(), true));
6385-
} else if (op == "srmm") {
6386-
ChatId chat_id;
6387-
InputRichMessage message;
6388-
get_args(args, chat_id, message);
6389-
send_message(chat_id, td_api::make_object<td_api::inputMessageRichMessage>(message, true), false, false);
63906390
} else if (op == "alm") {
63916391
ChatId chat_id;
63926392
string sender_id;
63936393
string message;
63946394
get_args(args, chat_id, sender_id, message);
6395-
send_request(td_api::make_object<td_api::addLocalMessage>(
6396-
chat_id, as_message_sender(sender_id), get_input_message_reply_to(), false,
6397-
td_api::make_object<td_api::inputMessageText>(as_formatted_text(message), get_link_preview_options(), true)));
6395+
send_request(td_api::make_object<td_api::addLocalMessage>(chat_id, as_message_sender(sender_id),
6396+
get_input_message_reply_to(), false,
6397+
as_input_message(message, false)));
63986398
} else if (op == "spmp") {
63996399
ChatId chat_id;
64006400
get_args(args, chat_id, args);
@@ -6481,8 +6481,7 @@ class CliClient final : public Actor {
64816481
MessageId message_id;
64826482
string message;
64836483
get_args(args, chat_id, message_id, message);
6484-
auto input_text =
6485-
td_api::make_object<td_api::inputMessageText>(as_formatted_text(message), get_link_preview_options(), true);
6484+
auto input_text = as_input_message(message, false);
64866485
if (!business_connection_id_.empty()) {
64876486
send_request(td_api::make_object<td_api::editBusinessMessageText>(business_connection_id_, chat_id, message_id,
64886487
nullptr, std::move(input_text)));
@@ -6494,9 +6493,8 @@ class CliClient final : public Actor {
64946493
MessageId message_id;
64956494
string message;
64966495
get_args(args, shortcut_id, message_id, message);
6497-
send_request(td_api::make_object<td_api::editQuickReplyMessage>(
6498-
shortcut_id, message_id,
6499-
td_api::make_object<td_api::inputMessageText>(as_formatted_text(message), get_link_preview_options(), true)));
6496+
send_request(td_api::make_object<td_api::editQuickReplyMessage>(shortcut_id, message_id,
6497+
as_input_message(message, false)));
65006498
} else if (op == "eman") {
65016499
ChatId chat_id;
65026500
MessageId message_id;

0 commit comments

Comments
 (0)