Skip to content

Commit 6555659

Browse files
levlamlevlam
committed
Use bool parameters in message-related queries.
1 parent ce95659 commit 6555659

File tree

3 files changed

+25
-57
lines changed

3 files changed

+25
-57
lines changed

‎td/telegram/MessageQueryManager.cpp

+17-35
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,11 @@ class ReportMessageDeliveryQuery final : public Td::ResultHandler {
139139
if (input_peer == nullptr) {
140140
return;
141141
}
142-
int32 flags = 0;
143-
if (from_push) {
144-
flags |= telegram_api::messages_reportMessagesDelivery::PUSH_MASK;
145-
}
146142
auto message_id = message_full_id.get_message_id();
147143
CHECK(message_id.is_valid());
148144
CHECK(message_id.is_server());
149145
send_query(G()->net_query_creator().create(telegram_api::messages_reportMessagesDelivery(
150-
flags, false /*ignored*/, std::move(input_peer), {message_id.get_server_message_id().get()})));
146+
0, from_push, std::move(input_peer), {message_id.get_server_message_id().get()})));
151147
}
152148

153149
void on_result(BufferSlice packet) final {
@@ -317,25 +313,28 @@ class SearchMessagesGlobalQuery final : public Td::ResultHandler {
317313
if (!ignore_folder_id) {
318314
flags |= telegram_api::messages_searchGlobal::FOLDER_ID_MASK;
319315
}
316+
bool users_only = false;
317+
bool groups_only = false;
318+
bool broadcasts_only = false;
320319
if (dialog_type_filter != nullptr) {
321320
switch (dialog_type_filter->get_id()) {
322321
case td_api::searchMessagesChatTypeFilterPrivate::ID:
323-
flags |= telegram_api::messages_searchGlobal::USERS_ONLY_MASK;
322+
users_only = true;
324323
break;
325324
case td_api::searchMessagesChatTypeFilterGroup::ID:
326-
flags |= telegram_api::messages_searchGlobal::GROUPS_ONLY_MASK;
325+
groups_only = true;
327326
break;
328327
case td_api::searchMessagesChatTypeFilterChannel::ID:
329-
flags |= telegram_api::messages_searchGlobal::BROADCASTS_ONLY_MASK;
328+
broadcasts_only = true;
330329
break;
331330
default:
332331
UNREACHABLE();
333332
}
334333
}
335334
send_query(G()->net_query_creator().create(telegram_api::messages_searchGlobal(
336-
flags, false /*ignored*/, false /*ignored*/, false /*ignored*/, folder_id.get(), query,
337-
get_input_messages_filter(filter), min_date_, max_date_, offset_date_, std::move(input_peer),
338-
offset_message_id.get_server_message_id().get(), limit)));
335+
flags, broadcasts_only, groups_only, users_only, folder_id.get(), query, get_input_messages_filter(filter),
336+
min_date_, max_date_, offset_date_, std::move(input_peer), offset_message_id.get_server_message_id().get(),
337+
limit)));
339338
}
340339

341340
void on_result(BufferSlice packet) final {
@@ -878,12 +877,7 @@ class DeletePhoneCallHistoryQuery final : public Td::ResultHandler {
878877
}
879878

880879
void send(bool revoke) {
881-
int32 flags = 0;
882-
if (revoke) {
883-
flags |= telegram_api::messages_deletePhoneCallHistory::REVOKE_MASK;
884-
}
885-
send_query(
886-
G()->net_query_creator().create(telegram_api::messages_deletePhoneCallHistory(flags, false /*ignored*/)));
880+
send_query(G()->net_query_creator().create(telegram_api::messages_deletePhoneCallHistory(0, revoke)));
887881
}
888882

889883
void on_result(BufferSlice packet) final {
@@ -964,16 +958,8 @@ class DeleteHistoryQuery final : public Td::ResultHandler {
964958
return promise_.set_error(Status::Error(400, "Chat is not accessible"));
965959
}
966960

967-
int32 flags = 0;
968-
if (!remove_from_dialog_list) {
969-
flags |= telegram_api::messages_deleteHistory::JUST_CLEAR_MASK;
970-
}
971-
if (revoke) {
972-
flags |= telegram_api::messages_deleteHistory::REVOKE_MASK;
973-
}
974-
975961
send_query(G()->net_query_creator().create(
976-
telegram_api::messages_deleteHistory(flags, false /*ignored*/, false /*ignored*/, std::move(input_peer),
962+
telegram_api::messages_deleteHistory(0, !remove_from_dialog_list, revoke, std::move(input_peer),
977963
max_message_id.get_server_message_id().get(), 0, 0)));
978964
}
979965

@@ -1050,15 +1036,11 @@ class DeleteMessagesByDateQuery final : public Td::ResultHandler {
10501036
return promise_.set_error(Status::Error(400, "Chat is not accessible"));
10511037
}
10521038

1053-
int32 flags = telegram_api::messages_deleteHistory::JUST_CLEAR_MASK |
1054-
telegram_api::messages_deleteHistory::MIN_DATE_MASK |
1055-
telegram_api::messages_deleteHistory::MAX_DATE_MASK;
1056-
if (revoke) {
1057-
flags |= telegram_api::messages_deleteHistory::REVOKE_MASK;
1058-
}
1059-
1060-
send_query(G()->net_query_creator().create(telegram_api::messages_deleteHistory(
1061-
flags, false /*ignored*/, false /*ignored*/, std::move(input_peer), 0, min_date, max_date)));
1039+
int32 flags =
1040+
telegram_api::messages_deleteHistory::MIN_DATE_MASK | telegram_api::messages_deleteHistory::MAX_DATE_MASK;
1041+
bool just_clear = true;
1042+
send_query(G()->net_query_creator().create(
1043+
telegram_api::messages_deleteHistory(flags, just_clear, revoke, std::move(input_peer), 0, min_date, max_date)));
10621044
}
10631045

10641046
void on_result(BufferSlice packet) final {

‎td/telegram/MessagesManager.cpp

+6-20
Original file line numberDiff line numberDiff line change
@@ -361,19 +361,9 @@ class UpdateDialogPinnedMessageQuery final : public Td::ResultHandler {
361361
return on_error(Status::Error(400, "Can't update pinned message"));
362362
}
363363

364-
int32 flags = 0;
365-
if (disable_notification) {
366-
flags |= telegram_api::messages_updatePinnedMessage::SILENT_MASK;
367-
}
368-
if (is_unpin) {
369-
flags |= telegram_api::messages_updatePinnedMessage::UNPIN_MASK;
370-
}
371-
if (only_for_self) {
372-
flags |= telegram_api::messages_updatePinnedMessage::PM_ONESIDE_MASK;
373-
}
374364
send_query(G()->net_query_creator().create_with_prefix(
375365
business_connection_id.get_invoke_prefix(),
376-
telegram_api::messages_updatePinnedMessage(flags, false /*ignored*/, false /*ignored*/, false /*ignored*/,
366+
telegram_api::messages_updatePinnedMessage(0, disable_notification, is_unpin, only_for_self,
377367
std::move(input_peer), message_id.get_server_message_id().get()),
378368
td_->business_connection_manager_->get_business_connection_dc_id(business_connection_id)));
379369
}
@@ -465,11 +455,10 @@ class GetDialogListQuery final : public Td::ResultHandler {
465455
auto input_peer = DialogManager::get_input_peer_force(offset_dialog_id);
466456
CHECK(input_peer != nullptr);
467457

468-
int32 flags =
469-
telegram_api::messages_getDialogs::EXCLUDE_PINNED_MASK | telegram_api::messages_getDialogs::FOLDER_ID_MASK;
458+
int32 flags = telegram_api::messages_getDialogs::FOLDER_ID_MASK;
470459
send_query(G()->net_query_creator().create(
471-
telegram_api::messages_getDialogs(flags, false /*ignored*/, folder_id.get(), offset_date,
472-
offset_message_id.get(), std::move(input_peer), limit, 0),
460+
telegram_api::messages_getDialogs(flags, true, folder_id.get(), offset_date, offset_message_id.get(),
461+
std::move(input_peer), limit, 0),
473462
{{folder_id}}));
474463
}
475464

@@ -21320,14 +21309,11 @@ void MessagesManager::send_secret_message(DialogId dialog_id, const Message *m,
2132021309
CHECK(m->media_album_id < 0);
2132121310
flags |= secret_api::decryptedMessage::GROUPED_ID_MASK;
2132221311
}
21323-
if (m->disable_notification) {
21324-
flags |= secret_api::decryptedMessage::SILENT_MASK;
21325-
}
2132621312

2132721313
send_closure(
2132821314
td_->secret_chats_manager_, &SecretChatsManager::send_message, dialog_id.get_secret_chat_id(),
21329-
make_tl_object<secret_api::decryptedMessage>(
21330-
flags, false /*ignored*/, random_id, m->ttl.get_input_ttl(),
21315+
secret_api::make_object<secret_api::decryptedMessage>(
21316+
flags, m->disable_notification, random_id, m->ttl.get_input_ttl(),
2133121317
m->content->get_type() == MessageContentType::Text ? text->text : string(), std::move(media.decrypted_media_),
2133221318
std::move(entities), td_->user_manager_->get_user_first_username(m->via_bot_user_id), m->reply_to_random_id,
2133321319
-m->media_album_id),

‎td/telegram/SavedMessagesManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ class DeleteSavedMessagesByDateQuery final : public Td::ResultHandler {
219219
auto saved_input_peer = saved_messages_topic_id.get_input_peer(td_);
220220
CHECK(saved_input_peer != nullptr);
221221

222-
int32 flags =
223-
telegram_api::messages_deleteHistory::MIN_DATE_MASK | telegram_api::messages_deleteHistory::MAX_DATE_MASK;
222+
int32 flags = telegram_api::messages_deleteSavedHistory::MIN_DATE_MASK |
223+
telegram_api::messages_deleteSavedHistory::MAX_DATE_MASK;
224224

225225
send_query(G()->net_query_creator().create(
226226
telegram_api::messages_deleteSavedHistory(flags, std::move(saved_input_peer), 0, min_date, max_date)));

0 commit comments

Comments
 (0)