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

Move fix_dialog_action_bar to DialogActionBar.cpp.

This commit is contained in:
levlam 2021-11-23 07:45:32 +03:00
parent 6b1833a259
commit 6c1429f74c
4 changed files with 128 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
td/telegram/DialogActionBar.cpp
View File

@ -6,13 +6,16 @@
//
#include "td/telegram/DialogActionBar.h"
#include "td/telegram/ContactsManager.h"
#include "td/telegram/Td.h"
namespace td {
unique_ptr<DialogActionBar> DialogActionBar::create(bool can_report_spam, bool can_add_contact, bool can_block_user,
bool can_share_phone_number, bool can_report_location,
bool can_unarchive, int32 distance, bool can_invite_members) {
if (!can_report_spam && !can_add_contact && !can_block_user && !can_share_phone_number && !can_report_location &&
!can_unarchive && distance < 0 && !can_invite_members) {
!can_invite_members) {
return nullptr;
}
@ -28,6 +31,118 @@ unique_ptr<DialogActionBar> DialogActionBar::create(bool can_report_spam, bool c
return action_bar;
}
void DialogActionBar::fix(Td *td, DialogId dialog_id, bool is_dialog_blocked, FolderId folder_id) {
auto dialog_type = dialog_id.get_type();
if (distance >= 0 && dialog_type != DialogType::User) {
LOG(ERROR) << "Receive distance " << distance << " to " << dialog_id;
distance = -1;
}
if (can_report_location) {
if (dialog_type != DialogType::Channel) {
LOG(ERROR) << "Receive can_report_location in " << dialog_id;
can_report_location = false;
} else if (can_report_spam || can_add_contact || can_block_user || can_share_phone_number || can_unarchive ||
can_invite_members) {
LOG(ERROR) << "Receive action bar " << can_report_spam << "/" << can_add_contact << "/" << can_block_user << "/"
<< can_share_phone_number << "/" << can_report_location << "/" << can_unarchive << "/"
<< can_invite_members;
can_report_spam = false;
can_add_contact = false;
can_block_user = false;
can_share_phone_number = false;
can_unarchive = false;
can_invite_members = false;
CHECK(distance == -1);
}
}
if (can_invite_members) {
if (dialog_type != DialogType::Chat &&
(dialog_type != DialogType::Channel || td->contacts_manager_->get_channel_type(dialog_id.get_channel_id()) ==
ContactsManager::ChannelType::Broadcast)) {
LOG(ERROR) << "Receive can_invite_members in " << dialog_id;
can_invite_members = false;
} else if (can_report_spam || can_add_contact || can_block_user || can_share_phone_number || can_unarchive) {
LOG(ERROR) << "Receive action bar " << can_report_spam << "/" << can_add_contact << "/" << can_block_user << "/"
<< can_share_phone_number << "/" << can_unarchive << "/" << can_invite_members;
can_report_spam = false;
can_add_contact = false;
can_block_user = false;
can_share_phone_number = false;
can_unarchive = false;
CHECK(distance == -1);
}
}
if (dialog_type == DialogType::User) {
auto user_id = dialog_id.get_user_id();
bool is_me = user_id == td->contacts_manager_->get_my_id();
bool is_deleted = td->contacts_manager_->is_user_deleted(user_id);
bool is_contact = td->contacts_manager_->is_user_contact(user_id);
if (is_me || is_dialog_blocked) {
can_report_spam = false;
can_unarchive = false;
}
if (is_me || is_dialog_blocked || is_deleted) {
can_share_phone_number = false;
}
if (is_me || is_dialog_blocked || is_deleted || is_contact) {
can_block_user = false;
can_add_contact = false;
}
}
if (folder_id != FolderId::archive()) {
can_unarchive = false;
}
if (can_share_phone_number) {
CHECK(!can_report_location);
CHECK(!can_invite_members);
if (dialog_type != DialogType::User) {
LOG(ERROR) << "Receive can_share_phone_number in " << dialog_id;
can_share_phone_number = false;
} else if (can_report_spam || can_add_contact || can_block_user || can_unarchive || distance >= 0) {
LOG(ERROR) << "Receive action bar " << can_report_spam << "/" << can_add_contact << "/" << can_block_user << "/"
<< can_share_phone_number << "/" << can_unarchive << "/" << distance;
can_report_spam = false;
can_add_contact = false;
can_block_user = false;
can_unarchive = false;
}
}
if (can_block_user) {
CHECK(!can_report_location);
CHECK(!can_invite_members);
CHECK(!can_share_phone_number);
if (dialog_type != DialogType::User) {
LOG(ERROR) << "Receive can_block_user in " << dialog_id;
can_block_user = false;
} else if (!can_report_spam || !can_add_contact) {
LOG(ERROR) << "Receive action bar " << can_report_spam << "/" << can_add_contact << "/" << can_block_user;
can_report_spam = true;
can_add_contact = true;
}
}
if (can_add_contact) {
CHECK(!can_report_location);
CHECK(!can_invite_members);
CHECK(!can_share_phone_number);
if (dialog_type != DialogType::User) {
LOG(ERROR) << "Receive can_add_contact in " << dialog_id;
can_add_contact = false;
} else if (can_report_spam != can_block_user) {
LOG(ERROR) << "Receive action bar " << can_report_spam << "/" << can_add_contact << "/" << can_block_user;
can_report_spam = false;
can_block_user = false;
can_unarchive = false;
}
}
if (!can_block_user) {
distance = -1;
}
if (!can_report_spam) {
can_unarchive = false;
}
}
td_api::object_ptr<td_api::ChatActionBar> DialogActionBar::get_chat_action_bar_object(DialogType dialog_type,
bool hide_unarchive) const {
if (can_report_location) {

5
td/telegram/DialogActionBar.h
View File

@ -7,12 +7,15 @@
#pragma once
#include "td/telegram/DialogId.h"
#include "td/telegram/FolderId.h"
#include "td/telegram/td_api.h"
#include "td/utils/common.h"
namespace td {
class Td;
struct DialogActionBar {
int32 distance = -1; // distance to the peer
@ -30,6 +33,8 @@ struct DialogActionBar {
td_api::object_ptr<td_api::ChatActionBar> get_chat_action_bar_object(DialogType dialog_type,
bool hide_unarchive) const;
void fix(Td *td, DialogId dialog_id, bool is_dialog_blocked, FolderId folder_id);
};
bool operator==(const unique_ptr<DialogActionBar> &lhs, const unique_ptr<DialogActionBar> &rhs);

127
td/telegram/MessagesManager.cpp
View File

@ -8231,6 +8231,8 @@ void MessagesManager::on_get_peer_settings(DialogId dialog_id,
peer_settings->share_contact_, peer_settings->report_geo_, peer_settings->autoarchived_,
distance, peer_settings->invite_members_);
fix_dialog_action_bar(d, action_bar.get());
if (d->action_bar == action_bar) {
if (!d->know_action_bar || d->need_repair_action_bar) {
d->know_action_bar = true;
@ -8244,133 +8246,16 @@ void MessagesManager::on_get_peer_settings(DialogId dialog_id,
d->need_repair_action_bar = false;
d->action_bar = std::move(action_bar);
fix_dialog_action_bar(d);
send_update_chat_action_bar(d);
}
void MessagesManager::fix_dialog_action_bar(Dialog *d) {
CHECK(d != nullptr);
auto action_bar = d->action_bar.get();
void MessagesManager::fix_dialog_action_bar(const Dialog *d, DialogActionBar *action_bar) {
if (action_bar == nullptr) {
return;
}
auto dialog_type = d->dialog_id.get_type();
if (action_bar->distance >= 0 && dialog_type != DialogType::User) {
LOG(ERROR) << "Receive distance " << action_bar->distance << " to " << d->dialog_id;
action_bar->distance = -1;
}
if (action_bar->can_report_location) {
if (dialog_type != DialogType::Channel) {
LOG(ERROR) << "Receive can_report_location in " << d->dialog_id;
action_bar->can_report_location = false;
} else if (action_bar->can_report_spam || action_bar->can_add_contact || action_bar->can_block_user ||
action_bar->can_share_phone_number || action_bar->can_unarchive || action_bar->can_invite_members) {
LOG(ERROR) << "Receive action bar " << action_bar->can_report_spam << "/" << action_bar->can_add_contact << "/"
<< action_bar->can_block_user << "/" << action_bar->can_share_phone_number << "/"
<< action_bar->can_report_location << "/" << action_bar->can_unarchive << "/"
<< action_bar->can_invite_members;
action_bar->can_report_spam = false;
action_bar->can_add_contact = false;
action_bar->can_block_user = false;
action_bar->can_share_phone_number = false;
action_bar->can_unarchive = false;
action_bar->can_invite_members = false;
CHECK(action_bar->distance == -1);
}
}
if (action_bar->can_invite_members) {
if (dialog_type != DialogType::Chat && (dialog_type != DialogType::Channel || is_broadcast_channel(d->dialog_id))) {
LOG(ERROR) << "Receive can_invite_members in " << d->dialog_id;
action_bar->can_invite_members = false;
} else if (action_bar->can_report_spam || action_bar->can_add_contact || action_bar->can_block_user ||
action_bar->can_share_phone_number || action_bar->can_unarchive) {
LOG(ERROR) << "Receive action bar " << action_bar->can_report_spam << "/" << action_bar->can_add_contact << "/"
<< action_bar->can_block_user << "/" << action_bar->can_share_phone_number << "/"
<< action_bar->can_unarchive << "/" << action_bar->can_invite_members;
action_bar->can_report_spam = false;
action_bar->can_add_contact = false;
action_bar->can_block_user = false;
action_bar->can_share_phone_number = false;
action_bar->can_unarchive = false;
CHECK(action_bar->distance == -1);
}
}
if (dialog_type == DialogType::User) {
auto user_id = d->dialog_id.get_user_id();
bool is_me = user_id == td_->contacts_manager_->get_my_id();
bool is_blocked = d->is_blocked;
bool is_deleted = td_->contacts_manager_->is_user_deleted(user_id);
bool is_contact = td_->contacts_manager_->is_user_contact(user_id);
if (is_me || is_blocked) {
action_bar->can_report_spam = false;
action_bar->can_unarchive = false;
}
if (is_me || is_blocked || is_deleted) {
action_bar->can_share_phone_number = false;
}
if (is_me || is_blocked || is_deleted || is_contact) {
action_bar->can_block_user = false;
action_bar->can_add_contact = false;
}
}
if (d->folder_id != FolderId::archive()) {
action_bar->can_unarchive = false;
}
if (action_bar->can_share_phone_number) {
CHECK(!action_bar->can_report_location);
CHECK(!action_bar->can_invite_members);
if (dialog_type != DialogType::User) {
LOG(ERROR) << "Receive can_share_phone_number in " << d->dialog_id;
action_bar->can_share_phone_number = false;
} else if (action_bar->can_report_spam || action_bar->can_add_contact || action_bar->can_block_user ||
action_bar->can_unarchive || action_bar->distance >= 0) {
LOG(ERROR) << "Receive action bar " << action_bar->can_report_spam << "/" << action_bar->can_add_contact << "/"
<< action_bar->can_block_user << "/" << action_bar->can_share_phone_number << "/"
<< action_bar->can_unarchive << "/" << action_bar->distance;
action_bar->can_report_spam = false;
action_bar->can_add_contact = false;
action_bar->can_block_user = false;
action_bar->can_unarchive = false;
}
}
if (action_bar->can_block_user) {
CHECK(!action_bar->can_report_location);
CHECK(!action_bar->can_invite_members);
CHECK(!action_bar->can_share_phone_number);
if (dialog_type != DialogType::User) {
LOG(ERROR) << "Receive can_block_user in " << d->dialog_id;
action_bar->can_block_user = false;
} else if (!action_bar->can_report_spam || !action_bar->can_add_contact) {
LOG(ERROR) << "Receive action bar " << action_bar->can_report_spam << "/" << action_bar->can_add_contact << "/"
<< action_bar->can_block_user;
action_bar->can_report_spam = true;
action_bar->can_add_contact = true;
}
}
if (action_bar->can_add_contact) {
CHECK(!action_bar->can_report_location);
CHECK(!action_bar->can_invite_members);
CHECK(!action_bar->can_share_phone_number);
if (dialog_type != DialogType::User) {
LOG(ERROR) << "Receive can_add_contact in " << d->dialog_id;
action_bar->can_add_contact = false;
} else if (action_bar->can_report_spam != action_bar->can_block_user) {
LOG(ERROR) << "Receive action bar " << action_bar->can_report_spam << "/" << action_bar->can_add_contact << "/"
<< action_bar->can_block_user;
action_bar->can_report_spam = false;
action_bar->can_block_user = false;
action_bar->can_unarchive = false;
}
}
if (!action_bar->can_block_user) {
action_bar->distance = -1;
}
if (!action_bar->can_report_spam) {
action_bar->can_unarchive = false;
}
CHECK(d != nullptr);
action_bar->fix(td_, d->dialog_id, d->is_blocked, d->folder_id);
}
Result<string> MessagesManager::get_login_button_url(FullMessageId full_message_id, int64 button_id) {
@ -34423,7 +34308,7 @@ MessagesManager::Dialog *MessagesManager::add_new_dialog(unique_ptr<Dialog> &&d,
Dialog *dialog = dialog_it->second.get();
fix_dialog_action_bar(dialog);
fix_dialog_action_bar(dialog, dialog->action_bar.get());
send_update_new_chat(dialog);

2
td/telegram/MessagesManager.h
View File

@ -2550,7 +2550,7 @@ class MessagesManager final : public Actor {
void add_dialog_last_database_message(Dialog *d, unique_ptr<Message> &&last_database_message);
void fix_dialog_action_bar(Dialog *d);
void fix_dialog_action_bar(const Dialog *d, DialogActionBar *action_bar);
td_api::object_ptr<td_api::ChatType> get_chat_type_object(DialogId dialog_id) const;