RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Slightly refactored add_contact_box.

This commit is contained in:
23rd 2021-11-28 00:49:17 +03:00 committed by John Preston
parent 69dc6c98ce
commit 0dfb77435d
2 changed files with 87 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Telegram/SourceFiles/boxes/add_contact_box.cpp
View File

@ -128,7 +128,7 @@ void ShowAddParticipantsError(
const QString &error, const QString &error,
not_null<PeerData*> chat, not_null<PeerData*> chat,
const std::vector<not_null<UserData*>> &users) { const std::vector<not_null<UserData*>> &users) {
if (error == qstr("USER_BOT")) { if (error == u"USER_BOT"_q) {
const auto channel = chat->asChannel(); const auto channel = chat->asChannel();
if ((users.size() == 1) if ((users.size() == 1)
&& users.front()->isBot() && users.front()->isBot()
@ -168,28 +168,28 @@ void ShowAddParticipantsError(
} }
const auto hasBot = ranges::any_of(users, &UserData::isBot); const auto hasBot = ranges::any_of(users, &UserData::isBot);
const auto text = [&] { const auto text = [&] {
if (error == qstr("USER_BOT")) { if (error == u"USER_BOT"_q) {
return tr::lng_cant_invite_bot_to_channel(tr::now); return tr::lng_cant_invite_bot_to_channel(tr::now);
} else if (error == qstr("USER_LEFT_CHAT")) { } else if (error == u"USER_LEFT_CHAT"_q) {
// Trying to return a user who has left. // Trying to return a user who has left.
} else if (error == qstr("USER_KICKED")) { } else if (error == u"USER_KICKED"_q) {
// Trying to return a user who was kicked by admin. // Trying to return a user who was kicked by admin.
return tr::lng_cant_invite_banned(tr::now); return tr::lng_cant_invite_banned(tr::now);
} else if (error == qstr("USER_PRIVACY_RESTRICTED")) { } else if (error == u"USER_PRIVACY_RESTRICTED"_q) {
return tr::lng_cant_invite_privacy(tr::now); return tr::lng_cant_invite_privacy(tr::now);
} else if (error == qstr("USER_NOT_MUTUAL_CONTACT")) { } else if (error == u"USER_NOT_MUTUAL_CONTACT"_q) {
// Trying to return user who does not have me in contacts. // Trying to return user who does not have me in contacts.
return tr::lng_failed_add_not_mutual(tr::now); return tr::lng_failed_add_not_mutual(tr::now);
} else if (error == qstr("USER_ALREADY_PARTICIPANT") && hasBot) { } else if (error == u"USER_ALREADY_PARTICIPANT"_q && hasBot) {
return tr::lng_bot_already_in_group(tr::now); return tr::lng_bot_already_in_group(tr::now);
} else if (error == qstr("BOT_GROUPS_BLOCKED")) { } else if (error == u"BOT_GROUPS_BLOCKED"_q) {
return tr::lng_error_cant_add_bot(tr::now); return tr::lng_error_cant_add_bot(tr::now);
} else if (error == qstr("PEER_FLOOD")) { } else if (error == u"PEER_FLOOD"_q) {
const auto type = (chat->isChat() || chat->isMegagroup()) const auto type = (chat->isChat() || chat->isMegagroup())
? PeerFloodType::InviteGroup ? PeerFloodType::InviteGroup
: PeerFloodType::InviteChannel; : PeerFloodType::InviteChannel;
return PeerFloodErrorText(&chat->session(), type); return PeerFloodErrorText(&chat->session(), type);
} else if (error == qstr("ADMINS_TOO_MUCH")) { } else if (error == u"ADMINS_TOO_MUCH"_q) {
return ((chat->isChat() || chat->isMegagroup()) return ((chat->isChat() || chat->isMegagroup())
? tr::lng_error_admin_limit ? tr::lng_error_admin_limit
: tr::lng_error_admin_limit_channel)(tr::now); : tr::lng_error_admin_limit_channel)(tr::now);
@ -609,9 +609,11 @@ void GroupInfoBox::createGroup(
not_null<PeerListBox*> selectUsersBox, not_null<PeerListBox*> selectUsersBox,
const QString &title, const QString &title,
const std::vector<not_null<PeerData*>> &users) { const std::vector<not_null<PeerData*>> &users) {
if (_creationRequestId) return; if (_creationRequestId) {
return;
auto inputs = QVector<MTPInputUser>(); }
using TLUsers = MTPInputUser;
auto inputs = QVector<TLUsers>();
inputs.reserve(users.size()); inputs.reserve(users.size());
for (auto peer : users) { for (auto peer : users) {
auto user = peer->asUser(); auto user = peer->asUser();
@ -624,7 +626,7 @@ void GroupInfoBox::createGroup(
return; return;
} }
_creationRequestId = _api.request(MTPmessages_CreateChat( _creationRequestId = _api.request(MTPmessages_CreateChat(
MTP_vector<MTPInputUser>(inputs), MTP_vector<TLUsers>(inputs),
MTP_string(title) MTP_string(title)
)).done([=](const MTPUpdates &result) { )).done([=](const MTPUpdates &result) {
auto image = _photo->takeResultImage(); auto image = _photo->takeResultImage();
@ -633,26 +635,28 @@ void GroupInfoBox::createGroup(
Ui::hideLayer(); // Destroys 'this'. Ui::hideLayer(); // Destroys 'this'.
ChatCreateDone(navigation, std::move(image), result); ChatCreateDone(navigation, std::move(image), result);
}).fail([=](const MTP::Error &error) { }).fail([=](const MTP::Error &error) {
const auto &type = error.type();
_creationRequestId = 0; _creationRequestId = 0;
if (error.type() == qstr("NO_CHAT_TITLE")) { const auto controller = _navigation->parentController();
auto weak = Ui::MakeWeak(this); if (type == u"NO_CHAT_TITLE"_q) {
const auto weak = Ui::MakeWeak(this);
selectUsersBox->closeBox(); selectUsersBox->closeBox();
if (weak) { if (weak) {
_title->showError(); _title->showError();
} }
} else if (error.type() == qstr("USERS_TOO_FEW")) { } else if (type == u"USERS_TOO_FEW"_q) {
Ui::show( controller->show(
Box<Ui::InformBox>(tr::lng_cant_invite_privacy(tr::now)), Box<Ui::InformBox>(tr::lng_cant_invite_privacy(tr::now)),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} else if (error.type() == qstr("PEER_FLOOD")) { } else if (type == u"PEER_FLOOD"_q) {
Ui::show( controller->show(
Box<Ui::InformBox>( Box<Ui::InformBox>(
PeerFloodErrorText( PeerFloodErrorText(
&_navigation->session(), &_navigation->session(),
PeerFloodType::InviteGroup)), PeerFloodType::InviteGroup)),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} else if (error.type() == qstr("USER_RESTRICTED")) { } else if (type == u"USER_RESTRICTED"_q) {
Ui::show( controller->show(
Box<Ui::InformBox>(tr::lng_cant_do_this(tr::now)), Box<Ui::InformBox>(tr::lng_cant_do_this(tr::now)),
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} }
@ -756,14 +760,20 @@ void GroupInfoBox::createChannel(
closeBox(); closeBox();
} }
}).fail([this](const MTP::Error &error) { }).fail([this](const MTP::Error &error) {
const auto &type = error.type();
_creationRequestId = 0; _creationRequestId = 0;
if (error.type() == "NO_CHAT_TITLE") { const auto controller = _navigation->parentController();
if (type == u"NO_CHAT_TITLE"_q) {
_title->setFocus(); _title->setFocus();
_title->showError(); _title->showError();
} else if (error.type() == qstr("USER_RESTRICTED")) { } else if (type == u"USER_RESTRICTED"_q) {
Ui::show(Box<Ui::InformBox>(tr::lng_cant_do_this(tr::now))); controller->show(
} else if (error.type() == qstr("CHANNELS_TOO_MUCH")) { Box<Ui::InformBox>(tr::lng_cant_do_this(tr::now)),
Ui::show(Box<Ui::InformBox>(tr::lng_cant_do_this(tr::now))); // TODO Ui::LayerOption::CloseOther);
} else if (type == u"CHANNELS_TOO_MUCH"_q) {
controller->show(
Box<Ui::InformBox>(tr::lng_cant_do_this(tr::now)),
Ui::LayerOption::CloseOther); // TODO
} }
}).send(); }).send();
} }
@ -795,9 +805,9 @@ void GroupInfoBox::channelReady() {
closeBox(); closeBox();
callback(argument); callback(argument);
} else { } else {
Ui::show(Box<SetupChannelBox>( _navigation->parentController()->show(
_navigation, Box<SetupChannelBox>(_navigation, _createdChannel),
_createdChannel)); Ui::LayerOption::CloseOther);
} }
} }
@ -890,7 +900,7 @@ void SetupChannelBox::prepare() {
MTP_string("preston") MTP_string("preston")
)).fail([=](const MTP::Error &error) { )).fail([=](const MTP::Error &error) {
_checkRequestId = 0; _checkRequestId = 0;
firstCheckFail(error.type()); firstCheckFail(parseError(error.type()));
}).send(); }).send();
addButton(tr::lng_settings_save(), [=] { save(); }); addButton(tr::lng_settings_save(), [=] { save(); });
@ -1119,7 +1129,7 @@ void SetupChannelBox::save() {
closeBox(); closeBox();
}).fail([=](const MTP::Error &error) { }).fail([=](const MTP::Error &error) {
_saveRequestId = 0; _saveRequestId = 0;
updateFail(error.type()); updateFail(parseError(error.type()));
}).send(); }).send();
}; };
if (_saveRequestId) { if (_saveRequestId) {
@ -1207,7 +1217,7 @@ void SetupChannelBox::check() {
update(); update();
}).fail([=](const MTP::Error &error) { }).fail([=](const MTP::Error &error) {
_checkRequestId = 0; _checkRequestId = 0;
checkFail(error.type()); checkFail(parseError(error.type()));
}).send(); }).send();
} }
} }
@ -1241,20 +1251,38 @@ void SetupChannelBox::privacyChanged(Privacy value) {
update(); update();
} }
void SetupChannelBox::updateFail(const QString &error) { SetupChannelBox::UsernameResult SetupChannelBox::parseError(
if ((error == "USERNAME_NOT_MODIFIED") const QString &error) {
if (error == u"USERNAME_NOT_MODIFIED"_q) {
return UsernameResult::Ok;
} else if (error == u"USERNAME_INVALID"_q) {
return UsernameResult::Invalid;
} else if (error == u"USERNAME_OCCUPIED"_q) {
return UsernameResult::Occupied;
} else if (error == u"USERNAMES_UNAVAILABLE"_q) {
return UsernameResult::Occupied;
} else if (error == u"CHANNEL_PUBLIC_GROUP_NA"_q) {
return UsernameResult::NA;
} else if (error == u"CHANNELS_ADMIN_PUBLIC_TOO_MUCH"_q) {
return UsernameResult::ChatsTooMuch;
} else {
return UsernameResult::Unknown;
}
}
void SetupChannelBox::updateFail(UsernameResult result) {
if ((result == UsernameResult::Ok)
|| (_sentUsername == _channel->username)) { || (_sentUsername == _channel->username)) {
_channel->setName( _channel->setName(
TextUtilities::SingleLine(_channel->name), TextUtilities::SingleLine(_channel->name),
TextUtilities::SingleLine(_sentUsername)); TextUtilities::SingleLine(_sentUsername));
closeBox(); closeBox();
} else if (error == "USERNAME_INVALID") { } else if (result == UsernameResult::Invalid) {
_link->setFocus(); _link->setFocus();
_link->showError(); _link->showError();
_errorText = tr::lng_create_channel_link_invalid(tr::now); _errorText = tr::lng_create_channel_link_invalid(tr::now);
update(); update();
} else if ((error == "USERNAME_OCCUPIED") } else if (result == UsernameResult::Occupied) {
|| (error == "USERNAMES_UNAVAILABLE")) {
_link->setFocus(); _link->setFocus();
_link->showError(); _link->showError();
_errorText = tr::lng_create_channel_link_occupied(tr::now); _errorText = tr::lng_create_channel_link_occupied(tr::now);
@ -1264,20 +1292,20 @@ void SetupChannelBox::updateFail(const QString &error) {
} }
} }
void SetupChannelBox::checkFail(const QString &error) { void SetupChannelBox::checkFail(UsernameResult result) {
if (error == qstr("CHANNEL_PUBLIC_GROUP_NA")) { if (result == UsernameResult::NA) {
Ui::hideLayer(); Ui::hideLayer();
} else if (error == qstr("CHANNELS_ADMIN_PUBLIC_TOO_MUCH")) { } else if (result == UsernameResult::ChatsTooMuch) {
if (_existing) { if (_existing) {
showRevokePublicLinkBoxForEdit(); showRevokePublicLinkBoxForEdit();
} else { } else {
_tooMuchUsernames = true; _tooMuchUsernames = true;
_privacyGroup->setValue(Privacy::Private); _privacyGroup->setValue(Privacy::Private);
} }
} else if (error == qstr("USERNAME_INVALID")) { } else if (result == UsernameResult::Invalid) {
_errorText = tr::lng_create_channel_link_invalid(tr::now); _errorText = tr::lng_create_channel_link_invalid(tr::now);
update(); update();
} else if (error == qstr("USERNAME_OCCUPIED") } else if ((result == UsernameResult::Occupied)
&& _checkUsername != _channel->username) { && _checkUsername != _channel->username) {
_errorText = tr::lng_create_channel_link_occupied(tr::now); _errorText = tr::lng_create_channel_link_occupied(tr::now);
update(); update();
@ -1304,10 +1332,10 @@ void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
Ui::LayerOption::KeepOther); Ui::LayerOption::KeepOther);
} }
void SetupChannelBox::firstCheckFail(const QString &error) { void SetupChannelBox::firstCheckFail(UsernameResult result) {
if (error == qstr("CHANNEL_PUBLIC_GROUP_NA")) { if (result == UsernameResult::NA) {
Ui::hideLayer(); Ui::hideLayer();
} else if (error == qstr("CHANNELS_ADMIN_PUBLIC_TOO_MUCH")) { } else if (result == UsernameResult::ChatsTooMuch) {
if (_existing) { if (_existing) {
showRevokePublicLinkBoxForEdit(); showRevokePublicLinkBoxForEdit();
} else { } else {

16
Telegram/SourceFiles/boxes/add_contact_box.h
View File

@ -171,16 +171,26 @@ private:
Public, Public,
Private, Private,
}; };
enum class UsernameResult {
Ok,
Invalid,
Occupied,
ChatsTooMuch,
NA,
Unknown,
};
[[nodiscard]] UsernameResult parseError(const QString &error);
void privacyChanged(Privacy value); void privacyChanged(Privacy value);
void updateSelected(const QPoint &cursorGlobalPosition); void updateSelected(const QPoint &cursorGlobalPosition);
void handleChange(); void handleChange();
void check(); void check();
void save(); void save();
void updateFail(const QString &error); void updateFail(UsernameResult result);
void checkFail(const QString &error); void checkFail(UsernameResult result);
void firstCheckFail(const QString &error); void firstCheckFail(UsernameResult result);
void updateMaxHeight(); void updateMaxHeight();