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

Unify error messages for private and secret chats.

Browse Source
This commit is contained in:
levlam 2021-05-10 19:36:18 +03:00
parent 260eee8bff
commit eecb0476b5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/MessagesManager.cpp
View File

@ -28938,14 +28938,13 @@ void MessagesManager::on_send_message_fail(int64 random_id, Status error) {
if (td_->auth_manager_->is_bot()) {
switch (dialog_id.get_type()) {
case DialogType::User:
case DialogType::SecretChat:
error_message = "Bot was blocked by the user";
break;
case DialogType::Chat:
case DialogType::Channel:
error_message = "Bot was kicked from the chat";
break;
case DialogType::SecretChat:
break;
case DialogType::None:
default:
UNREACHABLE();
@ -28953,14 +28952,13 @@ void MessagesManager::on_send_message_fail(int64 random_id, Status error) {
} else {
switch (dialog_id.get_type()) {
case DialogType::User:
case DialogType::SecretChat:
error_message = "User was blocked by the other user";
break;
case DialogType::Chat:
case DialogType::Channel:
error_message = "User is not in the chat";
break;
case DialogType::SecretChat:
break;
case DialogType::None:
default:
UNREACHABLE();
@ -28968,7 +28966,8 @@ void MessagesManager::on_send_message_fail(int64 random_id, Status error) {
}
// TODO add check to send_message
} else if (error.message() == "USER_IS_BOT") {
if (td_->auth_manager_->is_bot() && dialog_id.get_type() == DialogType::User) {
if (td_->auth_manager_->is_bot() &&
(dialog_id.get_type() == DialogType::User || dialog_id.get_type() == DialogType::SecretChat)) {
error_code = 403;
if (td_->contacts_manager_->is_user_bot(dialog_id.get_user_id())) {
error_message = "Bot can't send messages to bots";
@ -28979,7 +28978,8 @@ void MessagesManager::on_send_message_fail(int64 random_id, Status error) {
}
} else if (error.message() == "PEER_ID_INVALID") {
error_code = 403;
if (td_->auth_manager_->is_bot()) {
if (td_->auth_manager_->is_bot() &&
(dialog_id.get_type() == DialogType::User || dialog_id.get_type() == DialogType::SecretChat)) {
error_message = "Bot can't initiate conversation with a user";
}
} else if (error.message() == "WC_CONVERT_URL_INVALID" || error.message() == "EXTERNAL_URL_INVALID") {