mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Use UserData::isBot where applicable.

Browse Source
This commit is contained in:
John Preston
2019-07-18 10:51:11 +02:00
parent a7d9aa947b
commit 873b77cf40
29 changed files with 105 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/apiwrap.cpp
View File

@@ -1688,7 +1688,7 @@ void ApiWrap::applyLastParticipantsList(
user,
MegagroupInfo::Restricted{ restrictedRights });
}
if (user->botInfo) {
if (user->isBot()) {
channel->mgInfo->bots.insert(user);
if (channel->mgInfo->botStatus != 0 && channel->mgInfo->botStatus < 2) {
channel->mgInfo->botStatus = 2;
@@ -1736,7 +1736,7 @@ void ApiWrap::applyBotsList(
}
auto user = _session->data().user(userId);
if (user->botInfo) {
if (user->isBot()) {
channel->mgInfo->bots.insert(user);
botStatus = 2;// (botStatus > 0/* || !i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
if (!user->botInfo->inited) {
@@ -3983,9 +3983,7 @@ void ApiWrap::addChatParticipants(
}).afterDelay(crl::time(5)).send();
}
} else if (const auto channel = peer->asChannel()) {
const auto bot = ranges::find_if(users, [](not_null<UserData*> user) {
return user->botInfo != nullptr;
});
const auto bot = ranges::find_if(users, &UserData::isBot);
if (!peer->isMegagroup() && bot != end(users)) {
ShowAddParticipantsError("USER_BOT", peer, users);
return;
@@ -5028,7 +5026,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
}
void ApiWrap::sendBotStart(not_null<UserData*> bot, PeerData *chat) {
Expects(bot->botInfo != nullptr);
Expects(bot->isBot());
Expects(chat == nullptr || !bot->botInfo->startGroupToken.isEmpty());
if (chat && chat->isChannel() && !chat->isMegagroup()) {