Full support and build fix.

This commit is contained in:
John Preston
2025-12-18 22:25:12 +04:00
parent 53324d5494
commit 28434f4bee
136 changed files with 681 additions and 692 deletions

View File

@@ -83,7 +83,7 @@ void BlockedPeers::block(not_null<PeerData*> peer) {
}
const auto requestId = _api.request(MTPcontacts_Block(
MTP_flags(0),
peer->input
peer->input()
)).done([=] {
const auto data = _blockRequests.take(peer);
peer->setIsBlocked(true);
@@ -127,7 +127,7 @@ void BlockedPeers::unblock(
}
const auto requestId = _api.request(MTPcontacts_Unblock(
MTP_flags(0),
peer->input
peer->input()
)).done([=] {
const auto data = _blockRequests.take(peer);
peer->setIsBlocked(false);

View File

@@ -91,7 +91,7 @@ void SendBotCallbackData(
const auto show = controller->uiShow();
button->requestId = api->request(MTPmessages_GetBotCallbackAnswer(
MTP_flags(flags),
history->peer->input,
history->peer->input(),
MTP_int(item->id),
MTP_bytes(sendData),
password ? password->result : MTP_inputCheckPasswordEmpty()
@@ -421,13 +421,13 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
const auto id = int32(button->buttonId);
const auto chosen = [=](std::vector<not_null<PeerData*>> result) {
peer->session().api().request(MTPmessages_SendBotRequestedPeer(
peer->input,
peer->input(),
MTP_int(itemId),
MTP_int(id),
MTP_vector_from_range(
result | ranges::views::transform([](
not_null<PeerData*> peer) {
return MTPInputPeer(peer->input);
return MTPInputPeer(peer->input());
}))
)).done([=](const MTPUpdates &result) {
peer->session().api().applyUpdates(result);

View File

@@ -237,7 +237,7 @@ void ImportInvite(
fail(error.type());
};
auto inputs = peers | ranges::views::transform([](auto peer) {
return MTPInputPeer(peer->input);
return MTPInputPeer(peer->input());
}) | ranges::to<QVector<MTPInputPeer>>();
if (!slug.isEmpty()) {
api->request(MTPchatlists_JoinChatlistInvite(

View File

@@ -44,7 +44,7 @@ void RemoveChatFilter(
MTP_vector<MTPInputPeer>(ranges::views::all(
leave
) | ranges::views::transform([](not_null<PeerData*> peer) {
return MTPInputPeer(peer->input);
return MTPInputPeer(peer->input());
}) | ranges::to<QVector<MTPInputPeer>>())
)).done([=](const MTPUpdates &result) {
api->applyUpdates(result);

View File

@@ -422,7 +422,7 @@ void ChatParticipants::requestForAdd(
_forAdd.channel = channel;
_forAdd.requestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsRecent(),
MTP_int(offset),
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -450,7 +450,7 @@ void ChatParticipants::requestLast(not_null<ChannelData*> channel) {
const auto offset = 0;
const auto participantsHash = uint64(0);
const auto requestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsRecent(),
MTP_int(offset),
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -480,7 +480,7 @@ void ChatParticipants::requestBots(not_null<ChannelData*> channel) {
const auto offset = 0;
const auto participantsHash = uint64(0);
const auto requestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsBots(),
MTP_int(offset),
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -516,7 +516,7 @@ void ChatParticipants::requestAdmins(not_null<ChannelData*> channel) {
const auto offset = 0;
const auto participantsHash = uint64(0);
const auto requestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsAdmins(),
MTP_int(offset),
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -555,8 +555,8 @@ void ChatParticipants::add(
if (const auto chat = peer->asChat()) {
for (const auto &user : users) {
_api.request(MTPmessages_AddChatUser(
chat->inputChat,
user->inputUser,
chat->inputChat(),
user->inputUser(),
MTP_int(passGroupHistory ? kForwardMessagesOnAdd : 0)
)).done([=](const MTPmessages_InvitedUsers &result) {
const auto &data = result.data();
@@ -587,7 +587,7 @@ void ChatParticipants::add(
const auto send = [&] {
const auto callback = base::take(done);
_api.request(MTPchannels_InviteToChannel(
channel->inputChannel,
channel->inputChannel(),
MTP_vector<MTPInputUser>(list)
)).done([=](const MTPmessages_InvitedUsers &result) {
const auto &data = result.data();
@@ -606,7 +606,7 @@ void ChatParticipants::add(
}).afterDelay(kSmallDelayMs).send();
};
for (const auto &user : users) {
list.push_back(user->inputUser);
list.push_back(user->inputUser());
if (list.size() == kMaxUsersPerInvite) {
send();
list.clear();
@@ -653,8 +653,8 @@ void ChatParticipants::Restrict(
Fn<void()> onDone,
Fn<void()> onFail) {
channel->session().api().request(MTPchannels_EditBanned(
channel->inputChannel,
participant->input,
channel->inputChannel(),
participant->input(),
RestrictionsToMTP(newRights)
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
@@ -692,7 +692,7 @@ void ChatParticipants::requestSelf(not_null<ChannelData*> channel) {
};
_selfParticipantRequests.emplace(channel);
_api.request(MTPchannels_GetParticipant(
channel->inputChannel,
channel->inputChannel(),
MTP_inputPeerSelf()
)).done([=](const MTPchannels_ChannelParticipant &result) {
_selfParticipantRequests.erase(channel);
@@ -742,8 +742,8 @@ void ChatParticipants::kick(
_api.request(MTPmessages_DeleteChatUser(
MTP_flags(0),
chat->inputChat,
participant->asUser()->inputUser
chat->inputChat(),
participant->asUser()->inputUser()
)).done([=](const MTPUpdates &result) {
chat->session().api().applyUpdates(result);
}).send();
@@ -758,8 +758,8 @@ void ChatParticipants::kick(
const auto rights = ChannelData::KickedRestrictedRights(participant);
const auto requestId = _api.request(MTPchannels_EditBanned(
channel->inputChannel,
participant->input,
channel->inputChannel(),
participant->input(),
RestrictionsToMTP(rights)
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
@@ -782,8 +782,8 @@ void ChatParticipants::unblock(
}
const auto requestId = _api.request(MTPchannels_EditBanned(
channel->inputChannel,
participant->input,
channel->inputChannel(),
participant->input(),
MTP_chatBannedRights(MTP_flags(0), MTP_int(0))
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
@@ -814,7 +814,7 @@ void ChatParticipants::loadSimilarPeers(not_null<PeerData*> peer) {
_similar[peer].requestId = _api.request(
MTPchannels_GetChannelRecommendations(
MTP_flags(Flag::f_channel),
channel->inputChannel)
channel->inputChannel())
).done([=](const MTPmessages_Chats &result) {
auto &similar = _similar[channel];
similar.requestId = 0;
@@ -832,7 +832,7 @@ void ChatParticipants::loadSimilarPeers(not_null<PeerData*> peer) {
}).send();
} else if (const auto bot = peer->asBot()) {
_similar[peer].requestId = _api.request(
MTPbots_GetBotRecommendations(bot->inputUser)
MTPbots_GetBotRecommendations(bot->inputUser())
).done([=](const MTPusers_Users &result) {
auto &similar = _similar[peer];
similar.requestId = 0;

View File

@@ -131,7 +131,7 @@ rpl::producer<rpl::no_value, QString> CreditsTopupOptions::request() {
using TLOption = MTPStarsGiftOption;
_api.request(MTPpayments_GetStarsGiftOptions(
MTP_flags(MTPpayments_GetStarsGiftOptions::Flag::f_user_id),
user->inputUser
user->inputUser()
)).done([=](const MTPVector<TLOption> &result) {
_options = optionsFromTL(result.v);
consumer.put_done();
@@ -162,7 +162,7 @@ void CreditsStatus::request(
_requestId = _api.request(MTPpayments_GetStarsStatus(
MTP_flags(0),
_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input
_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input()
)).done([=](const TLResult &result) {
_requestId = 0;
const auto &balance = result.data().vbalance();
@@ -204,7 +204,7 @@ void CreditsHistory::request(
_requestId = _api.request(MTPpayments_GetStarsTransactions(
MTP_flags(_flags),
MTPstring(), // subscription_id
_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input,
_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input(),
MTP_string(token),
MTP_int(kTransactionsLimit)
)).done([=](const MTPpayments_StarsStatus &result) {
@@ -227,7 +227,7 @@ void CreditsHistory::requestSubscriptions(
MTP_flags(missingBalance
? MTPpayments_getStarsSubscriptions::Flag::f_missing_balance
: MTPpayments_getStarsSubscriptions::Flags(0)),
_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input,
_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input(),
MTP_string(token)
)).done([=](const MTPpayments_StarsStatus &result) {
_requestId = 0;
@@ -285,7 +285,7 @@ rpl::producer<rpl::no_value, QString> CreditsEarnStatistics::request() {
const auto finish = [=](const QString &url) {
api().request(MTPpayments_GetStarsRevenueStats(
MTP_flags(0),
(_isUser ? user()->input : channel()->input)
(_isUser ? user()->input() : channel()->input())
)).done([=](const MTPpayments_StarsRevenueStats &result) {
const auto &data = result.data();
const auto &status = data.vstatus().data();
@@ -315,7 +315,7 @@ rpl::producer<rpl::no_value, QString> CreditsEarnStatistics::request() {
api().request(
MTPpayments_GetStarsRevenueAdsAccountUrl(
(_isUser ? user()->input : channel()->input))
(_isUser ? user()->input() : channel()->input()))
).done([=](const MTPpayments_StarsRevenueAdsAccountUrl &result) {
finish(qs(result.data().vurl()));
}).fail([=](const MTP::Error &error) {
@@ -408,7 +408,7 @@ MTPInputSavedStarGift InputSavedStarGiftId(
: id.isUser()
? MTP_inputSavedStarGiftUser(MTP_int(id.userMessageId().bare))
: MTP_inputSavedStarGiftChat(
id.chat()->input,
id.chat()->input(),
MTP_long(id.chatSavedId()));
}

View File

@@ -25,7 +25,7 @@ void RestrictSponsored(
bool restricted,
Fn<void(QString)> failed) {
channel->session().api().request(MTPchannels_RestrictSponsoredMessages(
channel->inputChannel,
channel->inputChannel(),
MTP_bool(restricted))
).done([=](const MTPUpdates &updates) {
channel->session().api().applyUpdates(updates);
@@ -105,8 +105,8 @@ void HandleWithdrawalButton(
? F::f_ton
: F::f_amount),
currencyReceiver
? currencyReceiver->input
: creditsReceiver->input,
? currencyReceiver->input()
: creditsReceiver->input(),
MTP_long(creditsReceiver
? receiver.creditsAmount()
: 0),
@@ -145,8 +145,8 @@ void HandleWithdrawalButton(
? F::f_ton
: F::f_amount),
currencyReceiver
? currencyReceiver->input
: creditsReceiver->input,
? currencyReceiver->input()
: creditsReceiver->input(),
MTP_long(creditsReceiver
? receiver.creditsAmount()
: 0),

View File

@@ -146,7 +146,7 @@ mtpRequestId SuggestMedia(
const auto randomId = base::RandomValue<uint64>();
return api->request(MTPmessages_SendMedia(
MTP_flags(flags),
item->history()->peer->input,
item->history()->peer->input(),
ReplyToForMTP(item->history(), replyTo),
inputMedia.value_or(Data::WebPageForMTP(webpage, text.isEmpty())),
MTP_string(text),
@@ -310,7 +310,7 @@ mtpRequestId EditMessage(
: item->id;
return api->request(MTPmessages_EditMessage(
MTP_flags(flags),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(id),
MTP_string(text),
inputMedia.value_or(Data::WebPageForMTP(webpage, text.isEmpty())),

View File

@@ -101,7 +101,7 @@ void InviteLinks::performCreate(
: Flag(0))
| (requestApproval ? Flag::f_request_needed : Flag(0))
| (args.subscription ? Flag::f_subscription_pricing : Flag(0))),
args.peer->input,
args.peer->input(),
MTP_int(args.expireDate),
MTP_int(args.usageLimit),
MTP_string(args.label),
@@ -270,7 +270,7 @@ void InviteLinks::performEdit(
: Flag(0));
_api->request(MTPmessages_EditExportedChatInvite(
MTP_flags(editOnlyTitle ? Flag::f_title : flags),
peer->input,
peer->input(),
MTP_string(link),
MTP_int(expireDate),
MTP_int(usageLimit),
@@ -365,7 +365,7 @@ void InviteLinks::destroy(
callbacks.push_back(std::move(done));
}
_api->request(MTPmessages_DeleteExportedChatInvite(
peer->input,
peer->input(),
MTP_string(link)
)).done([=] {
const auto callbacks = _deleteCallbacks.take(key);
@@ -400,8 +400,8 @@ void InviteLinks::destroyAllRevoked(
callbacks.push_back(std::move(done));
}
_api->request(MTPmessages_DeleteRevokedExportedChatInvites(
peer->input,
admin->inputUser
peer->input(),
admin->inputUser()
)).done([=] {
if (const auto callbacks = _deleteRevokedCallbacks.take(peer)) {
for (const auto &callback : *callbacks) {
@@ -418,7 +418,7 @@ void InviteLinks::requestMyLinks(not_null<PeerData*> peer) {
}
const auto requestId = _api->request(MTPmessages_GetExportedChatInvites(
MTP_flags(0),
peer->input,
peer->input(),
MTP_inputUserSelf(),
MTPint(), // offset_date
MTPstring(), // offset_link
@@ -471,8 +471,8 @@ void InviteLinks::processRequest(
using Flag = MTPmessages_HideChatJoinRequest::Flag;
_api->request(MTPmessages_HideChatJoinRequest(
MTP_flags(approved ? Flag::f_approved : Flag(0)),
peer->input,
user->inputUser
peer->input(),
user->inputUser()
)).done([=](const MTPUpdates &result) {
if (const auto chat = peer->asChat()) {
if (chat->count > 0) {
@@ -601,7 +601,7 @@ void InviteLinks::requestJoinedFirstSlice(LinkKey key) {
}
const auto requestId = _api->request(MTPmessages_GetChatInviteImporters(
MTP_flags(MTPmessages_GetChatInviteImporters::Flag::f_link),
key.peer->input,
key.peer->input(),
MTP_string(key.link),
MTPstring(), // q
MTP_int(0), // offset_date
@@ -780,8 +780,8 @@ void InviteLinks::requestMoreLinks(
_api->request(MTPmessages_GetExportedChatInvites(
MTP_flags(Flag::f_offset_link
| (revoked ? Flag::f_revoked : Flag(0))),
peer->input,
admin->inputUser,
peer->input(),
admin->inputUser(),
MTP_int(lastDate),
MTP_string(lastLink),
MTP_int(kPerPage)

View File

@@ -105,10 +105,10 @@ void MessagesSearch::searchRequest() {
| (savedPeer ? Flag::f_saved_peer_id : Flag())
| (_request.topMsgId ? Flag::f_top_msg_id : Flag())
| (_request.tags.empty() ? Flag() : Flag::f_saved_reaction)),
_history->peer->input,
_history->peer->input(),
MTP_string(_request.query),
(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
(fromPeer ? fromPeer->input() : MTP_inputPeerEmpty()),
(savedPeer ? savedPeer->input() : MTP_inputPeerEmpty()),
MTP_vector_from_range(_request.tags | ranges::views::transform(
Data::ReactionToMTP
)),

View File

@@ -260,12 +260,12 @@ void PeerPhoto::clear(not_null<PhotoData*> photo) {
};
if (const auto chat = photo->peer->asChat()) {
_api.request(MTPmessages_EditChatPhoto(
chat->inputChat,
chat->inputChat(),
MTP_inputChatPhotoEmpty()
)).done(applier).send();
} else if (const auto channel = photo->peer->asChannel()) {
_api.request(MTPchannels_EditPhoto(
channel->inputChannel,
channel->inputChannel(),
MTP_inputChatPhotoEmpty()
)).done(applier).send();
}
@@ -294,7 +294,7 @@ void PeerPhoto::clear(not_null<PhotoData*> photo) {
void PeerPhoto::clearPersonal(not_null<UserData*> user) {
_api.request(MTPphotos_UploadContactProfilePhoto(
MTP_flags(MTPphotos_UploadContactProfilePhoto::Flag::f_save),
user->inputUser,
user->inputUser(),
MTPInputFile(),
MTPInputFile(), // video
MTPdouble(), // video_start_ts
@@ -339,12 +339,12 @@ void PeerPhoto::set(not_null<PeerData*> peer, not_null<PhotoData*> photo) {
};
if (const auto chat = peer->asChat()) {
_api.request(MTPmessages_EditChatPhoto(
chat->inputChat,
chat->inputChat(),
MTP_inputChatPhoto(photo->mtpInput())
)).done(applier).send();
} else if (const auto channel = peer->asChannel()) {
_api.request(MTPchannels_EditPhoto(
channel->inputChannel,
channel->inputChannel(),
MTP_inputChatPhoto(photo->mtpInput())
)).done(applier).send();
}
@@ -371,7 +371,7 @@ void PeerPhoto::ready(
const auto botUserInput = [&] {
const auto user = peer->asUser();
return (user && user->botInfo && user->botInfo->canEditInformation)
? std::make_optional<MTPInputUser>(user->inputUser)
? std::make_optional<MTPInputUser>(user->inputUser())
: std::nullopt;
}();
if (peer->isSelf() || botUserInput) {
@@ -409,7 +409,7 @@ void PeerPhoto::ready(
using Flag = MTPDinputChatUploadedPhoto::Flag;
const auto none = MTPDinputChatUploadedPhoto::Flags(0);
history->sendRequestId = _api.request(MTPmessages_EditChatPhoto(
chat->inputChat,
chat->inputChat(),
MTP_inputChatUploadedPhoto(
MTP_flags((file ? Flag::f_file : none)
| (videoSize ? Flag::f_video_emoji_markup : none)),
@@ -423,7 +423,7 @@ void PeerPhoto::ready(
const auto none = MTPDinputChatUploadedPhoto::Flags(0);
const auto history = _session->data().history(channel);
history->sendRequestId = _api.request(MTPchannels_EditPhoto(
channel->inputChannel,
channel->inputChannel(),
MTP_inputChatUploadedPhoto(
MTP_flags((file ? Flag::f_file : none)
| (videoSize ? Flag::f_video_emoji_markup : none)),
@@ -441,7 +441,7 @@ void PeerPhoto::ready(
| ((type == UploadType::Suggestion)
? Flag::f_suggest
: Flag::f_save)),
user->inputUser,
user->inputUser(),
file ? (*file) : MTPInputFile(),
MTPInputFile(), // video
MTPdouble(), // video_start_ts
@@ -469,7 +469,7 @@ void PeerPhoto::requestUserPhotos(
}
const auto requestId = _api.request(MTPphotos_GetUserPhotos(
user->inputUser,
user->inputUser(),
MTP_int(0),
MTP_long(afterId),
MTP_int(kSharedMediaLimit)

View File

@@ -90,7 +90,7 @@ void Polls::create(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
PollDataToInputMedia(&data),
MTP_string(),
@@ -99,7 +99,7 @@ void Polls::create(
MTPVector<MTPMessageEntity>(),
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, action.options.shortcutId),
MTP_long(action.options.effectId),
MTP_long(starsPaid),
@@ -162,7 +162,7 @@ void Polls::sendVotes(
ranges::back_inserter(prepared),
[](const QByteArray &option) { return MTP_bytes(option); });
const auto requestId = _api.request(MTPmessages_SendVote(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id),
MTP_vector<MTPbytes>(prepared)
)).done([=](const MTPUpdates &result) {
@@ -188,7 +188,7 @@ void Polls::close(not_null<HistoryItem*> item) {
}
const auto requestId = _api.request(MTPmessages_EditMessage(
MTP_flags(MTPmessages_EditMessage::Flag::f_media),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id),
MTPstring(),
PollDataToInputMedia(poll, true),
@@ -212,7 +212,7 @@ void Polls::reloadResults(not_null<HistoryItem*> item) {
return;
}
const auto requestId = _api.request(MTPmessages_GetPollResults(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id)
)).done([=](const MTPUpdates &result) {
_pollReloadRequestIds.erase(itemId);

View File

@@ -365,7 +365,7 @@ void Premium::resolveGiveawayInfo(
_giveawayInfoPeer = peer;
_giveawayInfoMessageId = messageId;
_giveawayInfoRequestId = _api.request(MTPpayments_GetGiveawayInfo(
_giveawayInfoPeer->input,
_giveawayInfoPeer->input(),
MTP_int(_giveawayInfoMessageId.bare)
)).done([=](const MTPpayments_GiveawayInfo &result) {
_giveawayInfoRequestId = 0;
@@ -500,7 +500,7 @@ rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::request() {
MTP_flags(_peer->isChannel()
? MTPpayments_GetPremiumGiftCodeOptions::Flag::f_boost_peer
: MTPpayments_GetPremiumGiftCodeOptions::Flag(0)),
_peer->input
_peer->input()
)).done([=](const MTPVector<TLOption> &result) {
auto tlMapOptions = base::flat_map<Amount, QVector<TLOption>>();
for (const auto &tlOption : result.v) {
@@ -554,7 +554,7 @@ rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::applyPrepaid(
}
_api.request(MTPpayments_LaunchPrepaidGiveaway(
_peer->input,
_peer->input(),
MTP_long(prepaidId),
invoice.giveawayCredits
? Payments::InvoiceCreditsGiveawayToTL(invoice)

View File

@@ -47,7 +47,7 @@ void SendPhotoReport(
const QString &comment,
not_null<PhotoData*> photo) {
peer->session().api().request(MTPaccount_ReportProfilePhoto(
peer->input,
peer->input(),
photo->mtpInput(),
ReasonToTL(reason),
MTP_string(comment)
@@ -125,7 +125,7 @@ auto CreateReportMessagesOrStoriesCallback(
if (!reportInput.stories.empty()) {
state->requestId = peer->session().api().request(
MTPstories_Report(
peer->input,
peer->input(),
MTP_vector<MTPint>(apiIds),
MTP_bytes(reportInput.optionId),
MTP_string(reportInput.comment))
@@ -133,7 +133,7 @@ auto CreateReportMessagesOrStoriesCallback(
} else {
state->requestId = peer->session().api().request(
MTPmessages_Report(
peer->input,
peer->input(),
MTP_vector<MTPint>(apiIds),
MTP_bytes(reportInput.optionId),
MTP_string(reportInput.comment))

View File

@@ -137,7 +137,7 @@ void SendProgressManager::send(const Key &key, int progress) {
MTP_flags(key.topMsgId
? MTPmessages_SetTyping::Flag::f_top_msg_id
: MTPmessages_SetTyping::Flag(0)),
key.history->peer->input,
key.history->peer->input(),
MTP_int(key.topMsgId),
action
)).done([=](const MTPBool &result, mtpRequestId requestId) {

View File

@@ -131,7 +131,7 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
std::move(inputMedia),
MTPstring(),
@@ -140,7 +140,7 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
MTPvector<MTPMessageEntity>(),
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(session, action.options.shortcutId),
MTP_long(action.options.effectId),
MTP_long(starsPaid),
@@ -259,7 +259,7 @@ void SendExistingMedia(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
inputMedia(),
MTP_string(captionText),
@@ -268,7 +268,7 @@ void SendExistingMedia(
sentEntities,
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(session, action.options.shortcutId),
MTP_long(action.options.effectId),
MTP_long(starsPaid),
@@ -448,7 +448,7 @@ bool SendDice(MessageToSend &message) {
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
MTP_inputMediaDice(MTP_string(emoji)),
MTP_string(),
@@ -457,7 +457,7 @@ bool SendDice(MessageToSend &message) {
MTP_vector<MTPMessageEntity>(),
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(session, action.options.shortcutId),
MTP_long(action.options.effectId),
MTP_long(starsPaid),

View File

@@ -99,7 +99,7 @@ std::optional<HistoryItem*> SingleMessageSearch::performLookupByChannel(
ready();
};
_requestId = _session->api().request(MTPchannels_GetMessages(
channel->inputChannel,
channel->inputChannel(),
MTP_vector<MTPInputMessage>(1, MTP_inputMessageID(MTP_int(postId)))
)).done([=](const MTPmessages_Messages &result) {
const auto received = Api::ParseSearchResult(

View File

@@ -210,7 +210,7 @@ rpl::producer<rpl::no_value, QString> Statistics::request() {
if (!channel()->isMegagroup()) {
makeRequest(MTPstats_GetBroadcastStats(
MTP_flags(MTPstats_GetBroadcastStats::Flags(0)),
channel()->inputChannel
channel()->inputChannel()
)).done([=](const MTPstats_BroadcastStats &result) {
_channelStats = ChannelStatisticsFromTL(result.data());
consumer.put_done();
@@ -220,7 +220,7 @@ rpl::producer<rpl::no_value, QString> Statistics::request() {
} else {
makeRequest(MTPstats_GetMegagroupStats(
MTP_flags(MTPstats_GetMegagroupStats::Flags(0)),
channel()->inputChannel
channel()->inputChannel()
)).done([=](const MTPstats_MegagroupStats &result) {
const auto &data = result.data();
_supergroupStats = SupergroupStatisticsFromTL(data);
@@ -351,14 +351,14 @@ void PublicForwards::request(
constexpr auto kLimit = tl::make_int(100);
if (_fullId.messageId) {
_requestId = makeRequest(MTPstats_GetMessagePublicForwards(
channel->inputChannel,
channel->inputChannel(),
MTP_int(_fullId.messageId.msg),
MTP_string(token),
kLimit
)).done(processResult).fail(processFail).send();
} else if (_fullId.storyId) {
_requestId = makeRequest(MTPstats_GetStoryPublicForwards(
channel->input,
channel->input(),
MTP_int(_fullId.storyId.story),
MTP_string(token),
kLimit
@@ -413,7 +413,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
const Data::StatisticalGraph &messageGraph,
const Data::StatisticalGraph &reactionsGraph) {
api().request(MTPchannels_GetMessages(
channel()->inputChannel,
channel()->inputChannel(),
MTP_vector<MTPInputMessage>(
1,
MTP_inputMessageID(MTP_int(_fullId.msg))))
@@ -468,7 +468,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
const Data::StatisticalGraph &messageGraph,
const Data::StatisticalGraph &reactionsGraph) {
api().request(MTPstories_GetStoriesByID(
channel()->input,
channel()->input(),
MTP_vector<MTPint>(1, MTP_int(_storyId.story)))
).done([=](const MTPstories_Stories &result) {
const auto &storyItem = result.data().vstories().v.front();
@@ -499,7 +499,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
if (_storyId) {
makeRequest(MTPstats_GetStoryStats(
MTP_flags(MTPstats_GetStoryStats::Flags(0)),
channel()->input,
channel()->input(),
MTP_int(_storyId.story)
)).done([=](const MTPstats_StoryStats &result) {
const auto &data = result.data();
@@ -512,7 +512,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
} else {
makeRequest(MTPstats_GetMessageStats(
MTP_flags(MTPstats_GetMessageStats::Flags(0)),
channel()->inputChannel,
channel()->inputChannel(),
MTP_int(_fullId.msg.bare)
)).done([=](const MTPstats_MessageStats &result) {
const auto &data = result.data();
@@ -539,7 +539,7 @@ rpl::producer<rpl::no_value, QString> Boosts::request() {
}
_api.request(MTPpremium_GetBoostsStatus(
_peer->input
_peer->input()
)).done([=](const MTPpremium_BoostsStatus &result) {
const auto &data = result.data();
channel->updateLevelHint(data.vlevel().v);
@@ -625,7 +625,7 @@ void Boosts::requestBoosts(
gifts
? MTP_flags(MTPpremium_GetBoostsList::Flag::f_gifts)
: MTP_flags(0),
_peer->input,
_peer->input(),
MTP_string(token.next),
token.next.isEmpty() ? kTlFirstSlice : kTlLimit
)).done([=](const MTPpremium_BoostsList &result) {
@@ -698,7 +698,7 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
api().request(MTPpayments_GetStarsRevenueStats(
MTP_flags(MTPpayments_getStarsRevenueStats::Flag::f_ton),
(_isUser ? user()->input : channel()->input)
(_isUser ? user()->input() : channel()->input())
)).done([=](const MTPpayments_StarsRevenueStats &result) {
const auto &data = result.data();
const auto &balances = data.vstatus().data();
@@ -721,7 +721,7 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
if (!_isUser) {
api().request(
MTPchannels_GetFullChannel(channel()->inputChannel)
MTPchannels_GetFullChannel(channel()->inputChannel())
).done([=](const MTPmessages_ChatFull &result) {
result.data().vfull_chat().match([&](
const MTPDchannelFull &d) {
@@ -757,7 +757,7 @@ void EarnStatistics::requestHistory(
_requestId = api().request(MTPpayments_GetStarsTransactions(
MTP_flags(MTPpayments_getStarsTransactions::Flag::f_ton),
MTP_string(), // Subscription ID.
(_isUser ? user()->input : channel()->input),
(_isUser ? user()->input() : channel()->input()),
MTP_string(token),
token.isEmpty() ? kTlFirstSlice : kTlLimit
)).done([=](const MTPpayments_StarsStatus &result) {

View File

@@ -66,7 +66,7 @@ void SendApproval(
suggestion->requestId = session->api().request(
MTPmessages_ToggleSuggestedPostApproval(
MTP_flags(scheduleDate ? Flag::f_schedule_date : Flag()),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id.bare),
MTP_int(scheduleDate),
MTPstring()) // reject_comment
@@ -267,7 +267,7 @@ void SendDecline(
MTPmessages_ToggleSuggestedPostApproval(
MTP_flags(Flag::f_reject
| (comment.isEmpty() ? Flag() : Flag::f_reject_comment)),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id.bare),
MTPint(), // schedule_date
MTP_string(comment))

View File

@@ -95,7 +95,7 @@ void TodoLists::create(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
TodoListDataToInputMedia(&data),
MTP_string(),
@@ -104,7 +104,7 @@ void TodoLists::create(
MTPVector<MTPMessageEntity>(),
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, action.options.shortcutId),
MTP_long(action.options.effectId),
MTP_long(starsPaid),
@@ -164,7 +164,7 @@ void TodoLists::add(
}
const auto session = _session;
_session->api().request(MTPmessages_AppendTodoList(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id.bare),
TodoListItemsToMTP(&item->history()->session(), items)
)).done([=](const MTPUpdates &result) {
@@ -230,7 +230,7 @@ void TodoLists::send(FullMsgId itemId, Accumulated &entry) {
auto incompleted = entry.incompleted
| ranges::views::transform([](int id) { return MTP_int(id); });
entry.requestId = _api.request(MTPmessages_ToggleTodoCompleted(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id),
MTP_vector_from_range(completed),
MTP_vector_from_range(incompleted)

View File

@@ -41,7 +41,7 @@ void Transcribes::rate(not_null<HistoryItem*> item, bool isGood) {
for (const auto &[transcribeId, id] : _ids) {
if (id == fullId) {
_api.request(MTPmessages_RateTranscribedAudio(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id),
MTP_long(transcribeId),
MTP_bool(isGood))).send();
@@ -158,7 +158,7 @@ void Transcribes::load(not_null<HistoryItem*> item) {
};
const auto id = item->fullId();
const auto requestId = _api.request(MTPmessages_TranscribeAudio(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id)
)).done([=](const MTPmessages_TranscribedAudio &result) {
const auto &data = result.data();

View File

@@ -111,7 +111,7 @@ void UnreadThings::requestMentions(
using Flag = MTPmessages_GetUnreadMentions::Flag;
const auto requestId = _api->request(MTPmessages_GetUnreadMentions(
MTP_flags(topic ? Flag::f_top_msg_id : Flag()),
history->peer->input,
history->peer->input(),
MTP_int(topic ? topic->rootId() : 0),
MTP_int(offsetId),
MTP_int(addOffset),
@@ -147,9 +147,9 @@ void UnreadThings::requestReactions(
const auto requestId = _api->request(MTPmessages_GetUnreadReactions(
MTP_flags((topic ? Flag::f_top_msg_id : Flag())
| (sublist ? Flag::f_saved_peer_id : Flag())),
history->peer->input,
history->peer->input(),
MTP_int(topic ? topic->rootId() : 0),
(sublist ? sublist->sublistPeer()->input : MTPInputPeer()),
(sublist ? sublist->sublistPeer()->input() : MTPInputPeer()),
MTP_int(offsetId),
MTP_int(addOffset),
MTP_int(limit),

View File

@@ -653,7 +653,7 @@ void Updates::getChannelDifference(
}
api().request(MTPupdates_GetChannelDifference(
MTP_flags(flags),
channel->inputChannel,
channel->inputChannel(),
filter,
MTP_int(channel->pts()),
MTP_int(kChannelGetDifferenceLimit)
@@ -732,7 +732,7 @@ void Updates::channelRangeDifferenceSend(
MTP_int(range.till - 1))));
const auto requestId = api().request(MTPupdates_GetChannelDifference(
MTP_flags(MTPupdates_GetChannelDifference::Flag::f_force),
channel->inputChannel,
channel->inputChannel(),
filter,
MTP_int(pts),
MTP_int(limit)
@@ -1419,18 +1419,7 @@ void Updates::applyUpdates(
case mtpc_updateShortMessage: {
auto &d = updates.c_updateShortMessage();
const auto viaBotId = d.vvia_bot_id();
const auto entities = d.ventities();
const auto fwd = d.vfwd_from();
if (!session().data().userLoaded(d.vuser_id())
|| (viaBotId && !session().data().userLoaded(*viaBotId))
|| (entities && !MentionUsersLoaded(&session(), *entities))
|| (fwd && !ForwardedInfoDataLoaded(&session(), *fwd))) {
MTP_LOG(0, ("getDifference "
"{ good - getting user for updateShortMessage }%1"
).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
return getDifference();
}
_session->data().fillMessagePeers(d);
if (updateAndApply(d.vpts().v, d.vpts_count().v, updates)) {
// Update date as well.
setState(0, d.vdate().v, _updatesQts, _updatesSeq);
@@ -1439,24 +1428,7 @@ void Updates::applyUpdates(
case mtpc_updateShortChatMessage: {
auto &d = updates.c_updateShortChatMessage();
const auto noFrom = !session().data().userLoaded(d.vfrom_id());
const auto chat = session().data().chatLoaded(d.vchat_id());
const auto viaBotId = d.vvia_bot_id();
const auto entities = d.ventities();
const auto fwd = d.vfwd_from();
if (!chat
|| noFrom
|| (viaBotId && !session().data().userLoaded(*viaBotId))
|| (entities && !MentionUsersLoaded(&session(), *entities))
|| (fwd && !ForwardedInfoDataLoaded(&session(), *fwd))) {
MTP_LOG(0, ("getDifference "
"{ good - getting user for updateShortChatMessage }%1"
).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
if (chat && noFrom) {
session().api().requestFullPeer(chat);
}
return getDifference();
}
_session->data().fillMessagePeers(d);
if (updateAndApply(d.vpts().v, d.vpts_count().v, updates)) {
// Update date as well.
setState(0, d.vdate().v, _updatesQts, _updatesSeq);
@@ -1486,13 +1458,7 @@ void Updates::applyUpdates(
const auto wasAlready = (lookupMessage() != nullptr);
feedUpdate(MTP_updateMessageID(d.vid(), MTP_long(randomId))); // ignore real date
if (const auto item = lookupMessage()) {
const auto list = d.ventities();
if (list && !MentionUsersLoaded(&session(), *list)) {
session().api().requestMessageData(
item->history()->peer,
item->id,
nullptr);
}
_session->data().fillMessagePeers(item->fullId(), d);
item->applySentMessage(sent.text, d, wasAlready);
}
}
@@ -1519,7 +1485,6 @@ void Updates::feedUpdate(const MTPUpdate &update) {
// New messages.
case mtpc_updateNewMessage: {
auto &d = update.c_updateNewMessage();
_session->data().fillMessagePeers(d.vmessage());
updateAndApply(d.vpts().v, d.vpts_count().v, update);
} break;
@@ -1546,7 +1511,6 @@ void Updates::feedUpdate(const MTPUpdate &update) {
}
return;
}
_session->data().fillMessagePeers(d.vmessage());
if (channel && !_handlingChannelDifference) {
if (channel->ptsRequesting()) { // skip global updates while getting channel difference
MTP_LOG(0, ("Skipping new channel message because getting the difference."));

View File

@@ -28,7 +28,7 @@ namespace {
not_null<PeerData*> peer) {
const auto user = peer->asUser();
return (user && user->botInfo && user->botInfo->canEditInformation)
? std::make_optional<MTPInputUser>(user->inputUser)
? std::make_optional<MTPInputUser>(user->inputUser())
: std::nullopt;
}
@@ -98,9 +98,9 @@ rpl::producer<Data::Usernames> Usernames::loadUsernames(
if (peer->isSelf()) {
requestUser(MTP_inputUserSelf());
} else if (const auto user = peer->asUser()) {
requestUser(user->inputUser);
requestUser(user->inputUser());
} else if (const auto channel = peer->asChannel()) {
requestChannel(channel->inputChannel);
requestChannel(channel->inputChannel());
}
return lifetime;
};
@@ -163,7 +163,7 @@ rpl::producer<rpl::no_value, Usernames::Error> Usernames::toggle(
)).done(done).fail(fail).handleFloodErrors().send();
} else if (const auto channel = peer->asChannel()) {
_api.request(MTPchannels_ToggleUsername(
channel->inputChannel,
channel->inputChannel(),
MTP_string(username),
MTP_bool(active)
)).done(done).fail(fail).handleFloodErrors().send();
@@ -216,7 +216,7 @@ rpl::producer<> Usernames::reorder(
_reorderRequests.emplace(peerId, requestId);
} else if (const auto channel = peer->asChannel()) {
const auto requestId = _api.request(MTPchannels_ReorderUsernames(
channel->inputChannel,
channel->inputChannel(),
MTP_vector<MTPstring>(std::move(tlUsernames))
)).done(finish).fail(finish).send();
_reorderRequests.emplace(peerId, requestId);

View File

@@ -33,7 +33,7 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
result.reserve(peers.size());
for (const auto &peer : peers) {
if (const auto user = peer->asUser()) {
result.push_back(user->inputUser);
result.push_back(user->inputUser());
}
}
return result;

View File

@@ -95,7 +95,7 @@ void ViewsManager::viewsIncrement() {
ids.push_back(MTP_int(msgId));
}
const auto requestId = _api.request(MTPmessages_GetMessagesViews(
i->first->input,
i->first->input(),
MTP_vector<MTPint>(ids),
MTP_bool(true)
)).done([=](
@@ -183,7 +183,7 @@ void ViewsManager::sendPollRequests(
}
};
const auto requestId = _api.request(MTPmessages_GetExtendedMedia(
peer->input,
peer->input(),
MTP_vector<MTPint>(list)
)).done([=](const MTPUpdates &result, mtpRequestId id) {
_session->api().applyUpdates(result);

View File

@@ -252,7 +252,7 @@ struct State {
} else if (const auto user = item->history()->peer->asUser()) {
entry.requestId = session->api().request(
MTPmessages_GetOutboxReadDate(
user->input,
user->input(),
MTP_int(item->id)
)
).done([=](const MTPOutboxReadDate &result) {
@@ -282,7 +282,7 @@ struct State {
} else {
entry.requestId = session->api().request(
MTPmessages_GetMessageReadParticipants(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id)
)
).done([=](const MTPVector<MTPReadParticipantDate> &result) {
@@ -340,7 +340,7 @@ struct State {
MTP_flags(reaction.empty()
? Flag(0)
: Flag::f_reaction),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id),
ReactionToMTP(reaction),
MTPstring(), // offset

View File

@@ -367,7 +367,7 @@ void ApiWrap::savePinnedOrder(Data::Folder *folder) {
const auto &order = _session->data().pinnedChatsOrder(folder);
const auto input = [](Dialogs::Key key) {
if (const auto history = key.history()) {
return MTP_inputDialogPeer(history->peer->input);
return MTP_inputDialogPeer(history->peer->input());
} else if (const auto folder = key.folder()) {
return MTP_inputDialogPeerFolder(MTP_int(folder->id()));
}
@@ -402,7 +402,7 @@ void ApiWrap::savePinnedOrder(not_null<Data::Forum*> forum) {
input);
request(MTPmessages_ReorderPinnedForumTopics(
MTP_flags(MTPmessages_ReorderPinnedForumTopics::Flag::f_force),
forum->peer()->input,
forum->peer()->input(),
MTP_vector(topics)
)).done([=](const MTPUpdates &result) {
applyUpdates(result);
@@ -416,7 +416,7 @@ void ApiWrap::savePinnedOrder(not_null<Data::SavedMessages*> saved) {
const auto &order = _session->data().pinnedChatsOrder(saved);
const auto input = [](Dialogs::Key key) {
if (const auto sublist = key.sublist()) {
return MTP_inputDialogPeer(sublist->sublistPeer()->input);
return MTP_inputDialogPeer(sublist->sublistPeer()->input());
}
Unexpected("Key type in pinnedDialogsOrder().");
};
@@ -445,7 +445,7 @@ void ApiWrap::toggleHistoryArchived(
MTP_vector<MTPInputFolderPeer>(
1,
MTP_inputFolderPeer(
history->peer->input,
history->peer->input(),
MTP_int(archived ? archiveId : 0)))
)).done([=](const MTPUpdates &result) {
applyUpdates(result);
@@ -641,7 +641,7 @@ void ApiWrap::resolveMessageDatas() {
if (!ids.isEmpty()) {
const auto channel = j->first;
const auto requestId = request(MTPchannels_GetMessages(
channel->inputChannel,
channel->inputChannel(),
MTP_vector<MTPInputMessage>(ids)
)).done([=](
const MTPmessages_Messages &result,
@@ -764,7 +764,7 @@ QString ApiWrap::exportDirectMessageLink(
MTP_flags(inRepliesContext
? MTPchannels_ExportMessageLink::Flag::f_thread
: MTPchannels_ExportMessageLink::Flag(0)),
channel->inputChannel,
channel->inputChannel(),
MTP_int(item->id)
)).done([=](const MTPExportedMessageLink &result) {
const auto link = qs(result.data().vlink());
@@ -798,7 +798,7 @@ QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
? i->second
: fallback();
request(MTPstories_ExportStoryLink(
peer->input,
peer->input(),
MTP_int(story->id())
)).done([=](const MTPExportedStoryLink &result) {
const auto link = qs(result.data().vlink());
@@ -865,7 +865,7 @@ void ApiWrap::requestMoreDialogs(Data::Folder *folder) {
MTP_int(state->offsetDate),
MTP_int(state->offsetId),
(state->offsetPeer
? state->offsetPeer->input
? state->offsetPeer->input()
: MTP_inputPeerEmpty()),
MTP_int(loadCount),
MTP_long(hash)
@@ -1130,7 +1130,7 @@ void ApiWrap::requestFullPeer(not_null<PeerData*> peer) {
_session->supportHelper().refreshInfo(user);
}
return request(MTPusers_GetFullUser(
user->inputUser
user->inputUser()
)).done([=](const MTPusers_UserFull &result) {
result.match([&](const MTPDusers_userFull &data) {
_session->data().processUsers(data.vusers());
@@ -1140,13 +1140,13 @@ void ApiWrap::requestFullPeer(not_null<PeerData*> peer) {
}).fail(failHandler).send();
} else if (const auto chat = peer->asChat()) {
return request(MTPmessages_GetFullChat(
chat->inputChat
chat->inputChat()
)).done([=](const MTPmessages_ChatFull &result) {
gotChatFull(peer, result);
}).fail(failHandler).send();
} else if (const auto channel = peer->asChannel()) {
return request(MTPchannels_GetFullChannel(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPmessages_ChatFull &result) {
gotChatFull(peer, result);
migrateDone(channel, channel);
@@ -1224,7 +1224,7 @@ void ApiWrap::requestPeerSettings(not_null<PeerData*> peer) {
return;
}
request(MTPmessages_GetPeerSettings(
peer->input
peer->input()
)).done([=](const MTPmessages_PeerSettings &result) {
result.match([&](const MTPDmessages_peerSettings &data) {
_session->data().processUsers(data.vusers());
@@ -1279,7 +1279,7 @@ void ApiWrap::migrateChat(
}
request(MTPmessages_MigrateChat(
chat->inputChat
chat->inputChat()
)).done([=](const MTPUpdates &result) {
applyUpdates(result);
session().changes().sendNotifications();
@@ -1351,7 +1351,7 @@ void ApiWrap::markContentsRead(
}
for (const auto &channelIds : channelMarkedIds) {
request(MTPchannels_ReadMessageContents(
channelIds.first->inputChannel,
channelIds.first->inputChannel(),
MTP_vector<MTPint>(channelIds.second)
)).send();
}
@@ -1364,7 +1364,7 @@ void ApiWrap::markContentsRead(not_null<HistoryItem*> item) {
const auto ids = MTP_vector<MTPint>(1, MTP_int(item->id));
if (const auto channel = item->history()->peer->asChannel()) {
request(MTPchannels_ReadMessageContents(
channel->inputChannel,
channel->inputChannel(),
ids
)).send();
} else {
@@ -1398,8 +1398,8 @@ void ApiWrap::deleteAllFromParticipantSend(
not_null<ChannelData*> channel,
not_null<PeerData*> from) {
request(MTPchannels_DeleteParticipantHistory(
channel->inputChannel,
from->input
channel->inputChannel(),
from->input()
)).done([=](const MTPmessages_AffectedHistory &result) {
const auto offset = applyAffectedHistory(channel, result);
if (offset > 0) {
@@ -1421,8 +1421,8 @@ void ApiWrap::deleteSublistHistorySend(
not_null<PeerData*> sublistPeer) {
request(MTPmessages_DeleteSavedHistory(
MTP_flags(MTPmessages_DeleteSavedHistory::Flag::f_parent_peer),
parentChat->input,
sublistPeer->input,
parentChat->input(),
sublistPeer->input(),
MTP_int(0), // max_id
MTP_int(0), // min_date
MTP_int(0) // max_date
@@ -1743,7 +1743,7 @@ void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
Data::PeerUpdate::Flag::ChannelAmIn);
} else if (!_channelAmInRequests.contains(channel)) {
const auto requestId = request(MTPchannels_JoinChannel(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
_channelAmInRequests.remove(channel);
applyUpdates(result);
@@ -1800,7 +1800,7 @@ void ApiWrap::leaveChannel(not_null<ChannelData*> channel) {
Data::PeerUpdate::Flag::ChannelAmIn);
} else if (!_channelAmInRequests.contains(channel)) {
auto requestId = request(MTPchannels_LeaveChannel(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
_channelAmInRequests.remove(channel);
applyUpdates(result);
@@ -1926,14 +1926,14 @@ void ApiWrap::sendNotifySettingsUpdates() {
for (const auto topic : base::take(_updateNotifyTopics)) {
request(MTPaccount_UpdateNotifySettings(
MTP_inputNotifyForumTopic(
topic->peer()->input,
topic->peer()->input(),
MTP_int(topic->rootId())),
topic->notify().serialize()
)).afterDelay(kSmallDelayMs).send();
}
for (const auto peer : base::take(_updateNotifyPeers)) {
request(MTPaccount_UpdateNotifySettings(
MTP_inputNotifyPeer(peer->input),
MTP_inputNotifyPeer(peer->input()),
peer->notify().serialize()
)).afterDelay(kSmallDelayMs).send();
}
@@ -2012,8 +2012,8 @@ void ApiWrap::deleteConversation(not_null<PeerData*> peer, bool revoke) {
if (const auto chat = peer->asChat()) {
request(MTPmessages_DeleteChatUser(
MTP_flags(0),
chat->inputChat,
_session->user()->inputUser
chat->inputChat(),
_session->user()->inputUser()
)).done([=](const MTPUpdates &result) {
applyUpdates(result);
deleteHistory(peer, false, revoke);
@@ -2206,7 +2206,7 @@ void ApiWrap::saveDraftsToCloud() {
cloudDraft->saveRequestId = request(MTPmessages_SaveDraft(
MTP_flags(flags),
ReplyToForMTP(history, cloudDraft->reply),
history->peer->input,
history->peer->input(),
MTP_string(textWithTags.text),
entities,
Data::WebPageForMTP(
@@ -2382,7 +2382,7 @@ void ApiWrap::resolveWebPages() {
QVector<mtpRequestId> reqsByIndex(idsByChannel.size(), 0);
for (auto i = idsByChannel.cbegin(), e = idsByChannel.cend(); i != e; ++i) {
reqsByIndex[i->second.first] = request(MTPchannels_GetMessages(
i->first->inputChannel,
i->first->inputChannel(),
MTP_vector<MTPInputMessage>(i->second.second)
)).done([=, channel = i->first](
const MTPmessages_Messages &result,
@@ -2511,13 +2511,13 @@ void ApiWrap::refreshFileReference(
};
if (storyId) {
request(MTPstories_GetStoriesByID(
_session->data().peer(storyId.peer)->input,
_session->data().peer(storyId.peer)->input(),
MTP_vector<MTPint>(1, MTP_int(storyId.story))));
} else if (item->isScheduled()) {
const auto realId = _session->scheduledMessages().lookupId(
item);
request(MTPmessages_GetScheduledMessages(
item->history()->peer->input,
item->history()->peer->input(),
MTP_vector<MTPint>(1, MTP_int(realId))));
} else if (item->isSavedMusicItem()) {
const auto user = item->history()->peer->asUser();
@@ -2525,7 +2525,7 @@ void ApiWrap::refreshFileReference(
const auto document = media ? media->document() : nullptr;
if (user && document) {
request(MTPusers_GetSavedMusicByID(
user->inputUser,
user->inputUser(),
MTP_vector<MTPInputDocument>(1, document->mtpInput())));
} else {
fail();
@@ -2540,7 +2540,7 @@ void ApiWrap::refreshFileReference(
MTP_long(0)));
} else if (const auto channel = item->history()->peer->asChannel()) {
request(MTPchannels_GetMessages(
channel->inputChannel,
channel->inputChannel(),
MTP_vector<MTPInputMessage>(
1,
MTP_inputMessageID(MTP_int(item->id)))));
@@ -2556,7 +2556,7 @@ void ApiWrap::refreshFileReference(
}, [&](Data::FileOriginUserPhoto data) {
if (const auto user = _session->data().user(data.userId)) {
request(MTPphotos_GetUserPhotos(
user->inputUser,
user->inputUser(),
MTP_int(-1),
MTP_long(data.photoId),
MTP_int(1)));
@@ -2565,7 +2565,7 @@ void ApiWrap::refreshFileReference(
}
}, [&](Data::FileOriginFullUser data) {
if (const auto user = _session->data().user(data.userId)) {
request(MTPusers_GetFullUser(user->inputUser));
request(MTPusers_GetFullUser(user->inputUser()));
} else {
fail();
}
@@ -2634,7 +2634,7 @@ void ApiWrap::refreshFileReference(
MTP_int(0)));
}, [&](Data::FileOriginStory data) {
request(MTPstories_GetStoriesByID(
_session->data().peer(data.peer)->input,
_session->data().peer(data.peer)->input(),
MTP_vector<MTPint>(1, MTP_int(data.story))));
}, [&](v::null_t) {
fail();
@@ -2704,7 +2704,7 @@ void ApiWrap::setGroupStickerSet(
megagroup->mgInfo->stickerSet = set;
request(MTPchannels_SetStickers(
megagroup->inputChannel,
megagroup->inputChannel(),
Data::InputStickerSet(set)
)).send();
_session->data().stickers().notifyUpdated(Data::StickersType::Stickers);
@@ -2717,7 +2717,7 @@ void ApiWrap::setGroupEmojiSet(
megagroup->mgInfo->emojiSet = set;
request(MTPchannels_SetEmojiStickers(
megagroup->inputChannel,
megagroup->inputChannel(),
Data::InputStickerSet(set)
)).send();
_session->changes().peerUpdated(
@@ -3127,7 +3127,7 @@ void ApiWrap::requestMessageAfterDate(
};
if (topicRootId) {
send(MTPmessages_GetReplies(
peer->input,
peer->input(),
MTP_int(topicRootId),
MTP_int(offsetId),
MTP_int(offsetDate),
@@ -3139,8 +3139,8 @@ void ApiWrap::requestMessageAfterDate(
} else if (monoforumPeerId) {
send(MTPmessages_GetSavedHistory(
MTP_flags(MTPmessages_GetSavedHistory::Flag::f_parent_peer),
peer->input,
session().data().peer(monoforumPeerId)->input,
peer->input(),
session().data().peer(monoforumPeerId)->input(),
MTP_int(offsetId),
MTP_int(offsetDate),
MTP_int(addOffset),
@@ -3150,7 +3150,7 @@ void ApiWrap::requestMessageAfterDate(
MTP_long(historyHash)));
} else {
send(MTPmessages_GetHistory(
peer->input,
peer->input(),
MTP_int(offsetId),
MTP_int(offsetDate),
MTP_int(addOffset),
@@ -3537,19 +3537,19 @@ void ApiWrap::forwardMessages(
histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
history->sendRequestId = request(MTPmessages_ForwardMessages(
MTP_flags(oneFlags),
forwardFrom->input,
forwardFrom->input(),
MTP_vector<MTPint>(ids),
MTP_vector<MTPlong>(randomIds),
peer->input,
peer->input(),
MTP_int(topMsgId),
(action.options.suggest
? ReplyToForMTP(history, action.replyTo)
: monoforumPeer
? MTP_inputReplyToMonoForum(monoforumPeer->input)
? MTP_inputReplyToMonoForum(monoforumPeer->input())
: MTPInputReplyTo()),
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, action.options.shortcutId),
MTP_long(action.options.effectId),
MTPint(), // video_timestamp
@@ -3925,7 +3925,7 @@ void ApiWrap::sendShortcutMessages(
auto ids = QVector<MTPint>();
auto randomIds = QVector<MTPlong>();
request(MTPmessages_SendQuickReplyMessages(
peer->input,
peer->input(),
MTP_int(id),
MTP_vector<MTPint>(ids),
MTP_vector<MTPlong>(randomIds)
@@ -4150,7 +4150,7 @@ void ApiWrap::sendMessage(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(mediaFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
Data::WebPageForMTP(message.webPage, true),
msgText,
@@ -4159,7 +4159,7 @@ void ApiWrap::sendMessage(
sentEntities,
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
mtpShortcut,
MTP_long(action.options.effectId),
MTP_long(starsPaid),
@@ -4172,7 +4172,7 @@ void ApiWrap::sendMessage(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMessage>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
msgText,
MTP_long(randomId),
@@ -4180,7 +4180,7 @@ void ApiWrap::sendMessage(
sentEntities,
MTP_int(action.options.scheduled),
MTP_int(action.options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
mtpShortcut,
MTP_long(action.options.effectId),
MTP_long(starsPaid),
@@ -4224,8 +4224,8 @@ void ApiWrap::sendBotStart(
info->startToken = QString();
}
request(MTPmessages_StartBot(
bot->inputUser,
chat ? chat->input : MTP_inputPeerEmpty(),
bot->inputUser(),
chat ? chat->input() : MTP_inputPeerEmpty(),
MTP_long(randomId),
MTP_string(token)
)).done([=](const MTPUpdates &result) {
@@ -4320,13 +4320,13 @@ void ApiWrap::sendInlineResult(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendInlineBotResult>(
MTP_flags(sendFlags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
MTP_long(randomId),
MTP_long(data->getQueryId()),
MTP_string(data->getId()),
MTP_int(action.options.scheduled),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, action.options.shortcutId),
MTP_long(starsPaid)
), [=](const MTPUpdates &result, const MTP::Response &response) {
@@ -4361,7 +4361,7 @@ void ApiWrap::uploadAlbumMedia(
request(MTPmessages_UploadMedia(
MTP_flags(0),
MTPstring(), // business_connection_id
item->history()->peer->input,
item->history()->peer->input(),
media
)).done([=](const MTPMessageMedia &result) {
const auto item = _session->data().message(localId);
@@ -4505,7 +4505,7 @@ void ApiWrap::sendMediaWithRandomId(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(flags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
(options.price
? MTPInputMedia(MTP_inputMediaPaidMedia(
@@ -4520,7 +4520,7 @@ void ApiWrap::sendMediaWithRandomId(
sentEntities,
MTP_int(options.scheduled),
MTP_int(options.scheduleRepeatPeriod),
(options.sendAs ? options.sendAs->input : MTP_inputPeerEmpty()),
(options.sendAs ? options.sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, options.shortcutId),
MTP_long(options.effectId),
MTP_long(starsPaid),
@@ -4595,7 +4595,7 @@ void ApiWrap::sendMultiPaidMedia(
randomId,
Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
MTP_flags(flags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
MTP_inputMediaPaidMedia(
MTP_flags(0),
@@ -4608,7 +4608,7 @@ void ApiWrap::sendMultiPaidMedia(
sentEntities,
MTP_int(options.scheduled),
MTP_int(options.scheduleRepeatPeriod),
(options.sendAs ? options.sendAs->input : MTP_inputPeerEmpty()),
(options.sendAs ? options.sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, options.shortcutId),
MTP_long(options.effectId),
MTP_long(starsPaid),
@@ -4734,12 +4734,12 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
uint64(0), // randomId
Data::Histories::PrepareMessage<MTPmessages_SendMultiMedia>(
MTP_flags(flags),
peer->input,
peer->input(),
Data::Histories::ReplyToPlaceholder(),
MTP_vector<MTPInputSingleMedia>(medias),
MTP_int(album->options.scheduled),
//MTP_int(album->options.scheduleRepeatPeriod),
(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
Data::ShortcutIdToMTP(_session, album->options.shortcutId),
MTP_long(album->options.effectId),
MTP_long(starsPaid)
@@ -4821,7 +4821,7 @@ void ApiWrap::requestBotCommonGroups(
};
const auto limit = 100;
request(MTPmessages_GetCommonChats(
bot->inputUser,
bot->inputUser(),
MTP_long(0), // max_id
MTP_int(limit)
)).done([=](const MTPmessages_Chats &result) {

View File

@@ -126,7 +126,7 @@ void ChatCreateDone(
void MustBePublicDestroy(not_null<ChannelData*> channel) {
const auto session = &channel->session();
session->api().request(MTPchannels_DeleteChannel(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
session->api().applyUpdates(result);
}).send();
@@ -735,7 +735,7 @@ void GroupInfoBox::createGroup(
auto user = peer->asUser();
Assert(user != nullptr);
if (!user->isSelf()) {
inputs.push_back(user->inputUser);
inputs.push_back(user->inputUser());
}
}
_creationRequestId = _api.request(MTPmessages_CreateChat(
@@ -1034,7 +1034,7 @@ void SetupChannelBox::prepare() {
setMouseTracking(true);
_checkRequestId = _api.request(MTPchannels_CheckUsername(
_channel->inputChannel,
_channel->inputChannel(),
MTP_string("preston")
)).fail([=](const MTP::Error &error) {
_checkRequestId = 0;
@@ -1281,7 +1281,7 @@ void SetupChannelBox::save() {
const auto saveUsername = [&](const QString &link) {
_sentUsername = link;
_saveRequestId = _api.request(MTPchannels_UpdateUsername(
_channel->inputChannel,
_channel->inputChannel(),
MTP_string(_sentUsername)
)).done([=] {
const auto done = _done;
@@ -1365,7 +1365,7 @@ void SetupChannelBox::check() {
if (link.size() >= Ui::EditPeer::kMinUsernameLength) {
_checkUsername = link;
_checkRequestId = _api.request(MTPchannels_CheckUsername(
_channel->inputChannel,
_channel->inputChannel(),
MTP_string(link)
)).done([=](const MTPBool &result) {
_checkRequestId = 0;

View File

@@ -337,7 +337,7 @@ void BackgroundBox::resetForPeer() {
const auto api = &_controller->session().api();
api->request(MTPmessages_SetChatWallPaper(
MTP_flags(0),
_forPeer->input,
_forPeer->input(),
MTPInputWallPaper(),
MTPWallPaperSettings(),
MTPint()

View File

@@ -668,7 +668,7 @@ void BackgroundPreviewBox::setExistingForPeer(
| (_fromMessageId ? Flag() : Flag::f_wallpaper)
| (both ? Flag::f_for_both : Flag())
| Flag::f_settings),
_forPeer->input,
_forPeer->input(),
paper.mtpInput(&_controller->session()),
paper.mtpSettings(),
MTP_int(_fromMessageId.msg)

View File

@@ -634,8 +634,8 @@ void DeleteMessagesBox::deleteAndClear() {
if (_reportSpam->checked()) {
_moderateInChannel->session().api().request(
MTPchannels_ReportSpam(
_moderateInChannel->inputChannel,
_moderateFrom->input,
_moderateInChannel->inputChannel(),
_moderateFrom->input(),
MTP_vector<MTPint>(1, MTP_int(_ids[0].msg)))
).send();
}

View File

@@ -1015,7 +1015,7 @@ void ExportFilterLink(
const auto front = peers.front();
const auto session = &front->session();
auto mtpPeers = peers | ranges::views::transform(
[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input()); }
) | ranges::to<QVector<MTPInputPeer>>();
session->api().request(MTPchatlists_ExportChatlistInvite(
MTP_inputChatlistDialogFilter(MTP_int(id)),
@@ -1048,7 +1048,7 @@ void EditLinkChats(
const auto front = peers.front();
const auto session = &front->session();
auto mtpPeers = peers | ranges::views::transform(
[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input()); }
) | ranges::to<QVector<MTPInputPeer>>();
session->api().request(MTPchatlists_EditExportedInvite(
MTP_flags(MTPchatlists_EditExportedInvite::Flag::f_peers),

View File

@@ -280,8 +280,8 @@ void CreateModerateMessagesBox(
}) | ranges::to<QVector<MTPint>>();
c->session().api().request(
MTPchannels_ReportSpam(
c->inputChannel,
p->input,
c->inputChannel(),
p->input(),
MTP_vector<MTPint>(std::move(filtered)))
).send();
});

View File

@@ -995,7 +995,7 @@ void ChooseTopicSearchController::searchQuery(const QString &query) {
void ChooseTopicSearchController::searchOnServer() {
_requestId = _api.request(MTPmessages_GetForumTopics(
MTP_flags(MTPmessages_GetForumTopics::Flag::f_q),
_forum->peer()->input,
_forum->peer()->input(),
MTP_string(_query),
MTP_int(_offsetDate),
MTP_int(_offsetId),

View File

@@ -163,8 +163,8 @@ void AddBotToGroupBoxController::requestExistingRights(
_bot->session().api().request(_existingRightsRequestId).cancel();
_existingRightsRequestId = _bot->session().api().request(
MTPchannels_GetParticipant(
_existingRightsChannel->inputChannel,
_bot->input)
_existingRightsChannel->inputChannel(),
_bot->input())
).done([=](const MTPchannels_ChannelParticipant &result) {
result.match([&](const MTPDchannels_channelParticipant &data) {
channel->owner().processUsers(data.vusers());

View File

@@ -1330,7 +1330,7 @@ void AddSpecialBoxController::loadMoreRows() {
const auto channel = _peer->asChannel();
_loadRequestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsRecent(),
MTP_int(_offset),
MTP_int(perPage),
@@ -1393,8 +1393,8 @@ bool AddSpecialBoxController::checkInfoLoaded(
// We don't know what this user status is in the group.
const auto channel = _peer->asChannel();
_api.request(MTPchannels_GetParticipant(
channel->inputChannel,
participant->input
channel->inputChannel(),
participant->input()
)).done([=](const MTPchannels_ChannelParticipant &result) {
result.match([&](const MTPDchannels_channelParticipant &data) {
channel->owner().processUsers(data.vusers());
@@ -1800,7 +1800,7 @@ void AddSpecialBoxSearchController::requestParticipants() {
const auto channel = _peer->asChannel();
_requestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsSearch(MTP_string(_query)),
MTP_int(_offset),
MTP_int(perPage),

View File

@@ -92,7 +92,7 @@ void SendRequest(
user->session().api().request(MTPcontacts_AddContact(
MTP_flags(Flag::f_note
| (sharePhone ? Flag::f_add_phone_privacy_exception : Flag(0))),
user->inputUser,
user->inputUser(),
MTP_string(first),
MTP_string(last),
MTP_string(phone),
@@ -688,7 +688,7 @@ void Controller::setupDeleteContactButton() {
const auto deleteSure = [=](Fn<void()> &&close) {
close();
_user->session().api().request(MTPcontacts_DeleteContacts(
MTP_vector<MTPInputUser>(1, _user->inputUser)
MTP_vector<MTPInputUser>(1, _user->inputUser())
)).done([=](const MTPUpdates &result) {
_user->session().api().applyUpdates(result);
_box->closeBox();

View File

@@ -565,7 +565,7 @@ void EditForumTopicBox(
state->requestId = api->request(MTPmessages_EditForumTopic(
MTP_flags(Flag::f_title
| (topic->isGeneral() ? Flag() : Flag::f_icon_emoji_id)),
topic->peer()->input,
topic->peer()->input(),
MTP_int(rootId),
MTP_string(title->getLastText().trimmed()),
MTP_long(state->iconId.current()),

View File

@@ -65,7 +65,7 @@ namespace {
) | rpl::on_next([=](bool toggled) {
megagroup->session().api().request(
MTPchannels_ToggleParticipantsHidden(
megagroup->inputChannel,
megagroup->inputChannel(),
MTP_bool(toggled)
)
).done([=](const MTPUpdates &result) {

View File

@@ -592,7 +592,7 @@ void EditAdminBox::transferOwnership() {
}
const auto channel = peer()->isChannel()
? peer()->asChannel()->inputChannel
? peer()->asChannel()->inputChannel()
: MTP_inputChannelEmpty();
const auto api = &peer()->session().api();
api->cloudPassword().reload();
@@ -680,8 +680,8 @@ void EditAdminBox::sendTransferRequestFrom(
const auto user = this->user();
const auto api = &channel->session().api();
_transferRequestId = api->request(MTPchannels_EditCreator(
channel->inputChannel,
user->inputUser,
channel->inputChannel(),
user->inputUser(),
result.result
)).done([=](const MTPUpdates &result) {
api->applyUpdates(result);

View File

@@ -57,8 +57,8 @@ void RemoveAdmin(
Fn<void()> onFail) {
const auto newRights = MTP_chatAdminRights(MTP_flags(0));
channel->session().api().request(MTPchannels_EditAdmin(
channel->inputChannel,
user->inputUser,
channel->inputChannel(),
user->inputUser(),
newRights,
MTP_string(QString())
)).done([=](const MTPUpdates &result) {
@@ -81,8 +81,8 @@ void AddChatParticipant(
Fn<void()> onDone,
Fn<void()> onFail) {
chat->session().api().request(MTPmessages_AddChatUser(
chat->inputChat,
user->inputUser,
chat->inputChat(),
user->inputUser(),
MTP_int(kForwardMessagesOnAdd)
)).done([=](const MTPmessages_InvitedUsers &result) {
const auto &data = result.data();
@@ -111,8 +111,8 @@ void SaveChatAdmin(
Fn<void()> onFail,
bool retryOnNotParticipant = true) {
chat->session().api().request(MTPmessages_EditChatAdmin(
chat->inputChat,
user->inputUser,
chat->inputChat(),
user->inputUser(),
MTP_bool(isAdmin)
)).done([=] {
chat->applyEditAdmin(user, isAdmin);
@@ -150,8 +150,8 @@ void SaveChannelAdmin(
Fn<void()> onDone,
Fn<void()> onFail) {
channel->session().api().request(MTPchannels_EditAdmin(
channel->inputChannel,
user->inputUser,
channel->inputChannel(),
user->inputUser(),
AdminRightsToMTP(newRights),
MTP_string(rank)
)).done([=](const MTPUpdates &result) {
@@ -175,8 +175,8 @@ void SaveChatParticipantKick(
Fn<void()> onFail) {
chat->session().api().request(MTPmessages_DeleteChatUser(
MTP_flags(0),
chat->inputChat,
user->inputUser
chat->inputChat(),
user->inputUser()
)).done([=](const MTPUpdates &result) {
chat->session().api().applyUpdates(result);
if (onDone) {
@@ -1515,7 +1515,7 @@ void ParticipantsBoxController::loadMoreRows() {
const auto participantsHash = uint64(0);
_loadRequestId = _api.request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
filter,
MTP_int(_offset),
MTP_int(perPage),
@@ -2209,7 +2209,7 @@ void ParticipantsBoxController::subscribeToCreatorChange(
const auto weak = base::make_weak(this);
const auto api = &channel->session().api();
api->request(MTPchannels_GetParticipants(
channel->inputChannel,
channel->inputChannel(),
MTP_channelParticipantsRecent(),
MTP_int(0), // offset
MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -2356,7 +2356,7 @@ bool ParticipantsBoxSearchController::loadMoreRows() {
const auto participantsHash = uint64(0);
_requestId = _api.request(MTPchannels_GetParticipants(
_channel->inputChannel,
_channel->inputChannel(),
filter,
MTP_int(_offset),
MTP_int(perPage),

View File

@@ -602,7 +602,7 @@ void Set(
: Flag(0))
| Flag::f_background_emoji_id
| (values.forProfile ? Flag::f_for_profile : Flag(0))),
channel->inputChannel,
channel->inputChannel(),
MTP_int(values.colorIndex),
MTP_long(values.backgroundEmojiId)));
}
@@ -2776,7 +2776,7 @@ void CheckBoostLevel(
Fn<std::optional<Ui::AskBoostReason>(int level)> askMore,
Fn<void()> cancel) {
peer->session().api().request(MTPpremium_GetBoostsStatus(
peer->input
peer->input()
)).done([=](const MTPpremium_BoostsStatus &result) {
const auto &data = result.data();
if (const auto channel = peer->asChannel()) {

View File

@@ -182,7 +182,7 @@ void SaveDefaultRestrictions(
const auto requestId = api->request(
MTPmessages_EditChatDefaultBannedRights(
peer->input,
peer->input(),
RestrictionsToMTP({ rights, 0 }))
).done([=](const MTPUpdates &result) {
api->clearModifyRequest(key);
@@ -214,7 +214,7 @@ void SaveSlowmodeSeconds(
const auto key = Api::RequestKey("slowmode_seconds", channel->id);
const auto requestId = api->request(MTPchannels_ToggleSlowMode(
channel->inputChannel,
channel->inputChannel(),
MTP_int(seconds)
)).done([=](const MTPUpdates &result) {
api->clearModifyRequest(key);
@@ -249,7 +249,7 @@ void SaveStarsPerMessage(
MTP_flags(broadcastAllowed
? Flag::f_broadcast_messages_allowed
: Flag(0)),
channel->inputChannel,
channel->inputChannel(),
MTP_long(starsPerMessage)
)).done([=](const MTPUpdates &result) {
api->clearModifyRequest(key);
@@ -284,7 +284,7 @@ void SaveBoostsUnrestrict(
const auto key = Api::RequestKey("boosts_unrestrict", channel->id);
const auto requestId = api->request(
MTPchannels_SetBoostsToUnblockRestrictions(
channel->inputChannel,
channel->inputChannel(),
MTP_int(boostsUnrestrict))
).done([=](const MTPUpdates &result) {
api->clearModifyRequest(key);
@@ -1718,7 +1718,7 @@ void Controller::editReactions() {
}
_controls.levelRequested = true;
_api.request(MTPpremium_GetBoostsStatus(
_peer->input
_peer->input()
)).done([=](const MTPpremium_BoostsStatus &result) {
_controls.levelRequested = false;
if (const auto channel = _peer->asChannel()) {
@@ -2284,7 +2284,7 @@ void Controller::saveUsernamesOrder() {
}
if (_savingData.usernamesOrder->empty()) {
_api.request(MTPchannels_DeactivateAllUsernames(
channel->inputChannel
channel->inputChannel()
)).done([=] {
channel->setUsernames(channel->editableUsername().isEmpty()
? Data::Usernames()
@@ -2341,7 +2341,7 @@ void Controller::saveUsername() {
const auto newUsername = (*_savingData.username);
_api.request(MTPchannels_UpdateUsername(
channel->inputChannel,
channel->inputChannel(),
MTP_string(newUsername)
)).done([=] {
channel->setName(
@@ -2393,11 +2393,11 @@ void Controller::saveDiscussionLink() {
}
const auto input = *_savingData.discussionLink
? (*_savingData.discussionLink)->inputChannel
? (*_savingData.discussionLink)->inputChannel()
: MTP_inputChannelEmpty();
_api.request(MTPchannels_SetDiscussionGroup(
(channel->isBroadcast() ? channel->inputChannel : input),
(channel->isBroadcast() ? input : channel->inputChannel)
(channel->isBroadcast() ? channel->inputChannel() : input),
(channel->isBroadcast() ? input : channel->inputChannel())
)).done([=] {
channel->setDiscussionLink(*_savingData.discussionLink);
continueSave();
@@ -2462,14 +2462,14 @@ void Controller::saveTitle() {
if (const auto channel = _peer->asChannel()) {
_api.request(MTPchannels_EditTitle(
channel->inputChannel,
channel->inputChannel(),
MTP_string(*_savingData.title)
)).done(std::move(onDone)
).fail(std::move(onFail)
).send();
} else if (const auto chat = _peer->asChat()) {
_api.request(MTPmessages_EditChatTitle(
chat->inputChat,
chat->inputChat(),
MTP_string(*_savingData.title)
)).done(std::move(onDone)
).fail(std::move(onFail)
@@ -2477,7 +2477,7 @@ void Controller::saveTitle() {
} else if (_isBot) {
_api.request(MTPbots_GetBotInfo(
MTP_flags(MTPbots_GetBotInfo::Flag::f_bot),
_peer->asUser()->inputUser,
_peer->asUser()->inputUser(),
MTPstring() // Lang code.
)).done([=](const MTPbots_BotInfo &result) {
const auto was = qs(result.data().vname());
@@ -2488,7 +2488,7 @@ void Controller::saveTitle() {
using Flag = MTPbots_SetBotInfo::Flag;
_api.request(MTPbots_SetBotInfo(
MTP_flags(Flag::f_bot | Flag::f_name),
_peer->asUser()->inputUser,
_peer->asUser()->inputUser(),
MTPstring(), // Lang code.
MTP_string(now), // Name.
MTPstring(), // About.
@@ -2516,7 +2516,7 @@ void Controller::saveDescription() {
if (_isBot) {
_api.request(MTPbots_GetBotInfo(
MTP_flags(MTPbots_GetBotInfo::Flag::f_bot),
_peer->asUser()->inputUser,
_peer->asUser()->inputUser(),
MTPstring() // Lang code.
)).done([=](const MTPbots_BotInfo &result) {
const auto was = qs(result.data().vabout());
@@ -2527,7 +2527,7 @@ void Controller::saveDescription() {
using Flag = MTPbots_SetBotInfo::Flag;
_api.request(MTPbots_SetBotInfo(
MTP_flags(Flag::f_bot | Flag::f_about),
_peer->asUser()->inputUser,
_peer->asUser()->inputUser(),
MTPstring(), // Lang code.
MTPstring(), // Name.
MTP_string(now), // About.
@@ -2544,7 +2544,7 @@ void Controller::saveDescription() {
return;
}
_api.request(MTPmessages_EditChatAbout(
_peer->input,
_peer->input(),
MTP_string(*_savingData.description)
)).done([=] {
successCallback();
@@ -2620,7 +2620,7 @@ void Controller::togglePreHistoryHidden(
done();
};
_api.request(MTPchannels_TogglePreHistoryHidden(
channel->inputChannel,
channel->inputChannel(),
MTP_bool(hidden)
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
@@ -2658,7 +2658,7 @@ void Controller::saveForum() {
return;
}
_api.request(MTPchannels_ToggleForum(
channel->inputChannel,
channel->inputChannel(),
MTP_bool(*_savingData.forum),
MTP_bool(*_savingData.forum && *_savingData.forumTabs)
)).done([=](const MTPUpdates &result) {
@@ -2685,7 +2685,7 @@ void Controller::saveAutotranslate() {
return continueSave();
}
_api.request(MTPchannels_ToggleAutotranslation(
channel->inputChannel,
channel->inputChannel(),
MTP_bool(*_savingData.autotranslate)
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
@@ -2721,7 +2721,7 @@ void Controller::saveSignatures() {
| (*_savingData.signatureProfiles
? Flag::f_profiles_enabled
: Flag())),
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
continueSave();
@@ -2741,7 +2741,7 @@ void Controller::saveForwards() {
return continueSave();
}
_api.request(MTPmessages_ToggleNoForwards(
_peer->input,
_peer->input(),
MTP_bool(*_savingData.noForwards)
)).done([=](const MTPUpdates &result) {
_peer->session().api().applyUpdates(result);
@@ -2764,7 +2764,7 @@ void Controller::saveJoinToWrite() {
return continueSave();
}
_api.request(MTPchannels_ToggleJoinToSend(
_peer->asChannel()->inputChannel,
_peer->asChannel()->inputChannel(),
MTP_bool(*_savingData.joinToWrite)
)).done([=](const MTPUpdates &result) {
_peer->session().api().applyUpdates(result);
@@ -2787,7 +2787,7 @@ void Controller::saveRequestToJoin() {
return continueSave();
}
_api.request(MTPchannels_ToggleJoinRequest(
_peer->asChannel()->inputChannel,
_peer->asChannel()->inputChannel(),
MTP_bool(*_savingData.requestToJoin)
)).done([=](const MTPUpdates &result) {
_peer->session().api().applyUpdates(result);
@@ -2847,7 +2847,7 @@ void Controller::deleteChannel() {
session->api().deleteConversation(chat, false);
}
session->api().request(MTPchannels_DeleteChannel(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
session->api().applyUpdates(result);
//}).fail([=](const MTP::Error &error) {

View File

@@ -902,11 +902,11 @@ void Controller::loadMoreRows() {
_requestId = _api.request(MTPmessages_GetChatInviteImporters(
MTP_flags(Flag::f_link
| (_role == Role::Requested ? Flag::f_requested : Flag(0))),
_peer->input,
_peer->input(),
MTP_string(_link),
MTPstring(), // q
MTP_int(_lastUser ? _lastUser->date : 0),
_lastUser ? _lastUser->user->inputUser : MTP_inputUserEmpty(),
_lastUser ? _lastUser->user->inputUser() : MTP_inputUserEmpty(),
MTP_int(_lastUser ? kPerPage : kFirstPage)
)).done([=](const MTPmessages_ChatInviteImporters &result) {
_requestId = 0;

View File

@@ -803,7 +803,7 @@ void AdminsController::prepare() {
return;
}
_requestId = session().api().request(MTPmessages_GetAdminsWithInvites(
_peer->input
_peer->input()
)).done([=](const MTPmessages_ChatAdminsWithInvites &result) {
result.match([&](const MTPDmessages_chatAdminsWithInvites &data) {
auto &owner = _peer->owner();

View File

@@ -1273,7 +1273,7 @@ Fn<void()> AboutGigagroupCallback(
}
*converting = true;
channel->session().api().request(MTPchannels_ConvertToGigagroup(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
channel->session().api().applyUpdates(result);
if (const auto strong = weak.get()) {

View File

@@ -1010,7 +1010,7 @@ void SaveAllowedReactions(
MTP_flags(Flag()
| (maxCount ? Flag::f_reactions_limit : Flag())
| (editPaidEnabled ? Flag::f_paid_enabled : Flag())),
peer->input,
peer->input(),
updated,
MTP_int(maxCount),
MTP_bool(paidEnabled)

View File

@@ -362,11 +362,11 @@ void RequestsBoxController::loadMoreRows() {
using Flag = MTPmessages_GetChatInviteImporters::Flag;
_loadRequestId = _api.request(MTPmessages_GetChatInviteImporters(
MTP_flags(Flag::f_requested),
_peer->input,
_peer->input(),
MTPstring(), // link
MTPstring(), // q
MTP_int(_offsetDate),
_offsetUser ? _offsetUser->inputUser : MTP_inputUserEmpty(),
_offsetUser ? _offsetUser->inputUser() : MTP_inputUserEmpty(),
MTP_int(limit)
)).done([=](const MTPmessages_ChatInviteImporters &result) {
const auto firstLoad = !_offsetDate;
@@ -681,11 +681,11 @@ bool RequestsBoxSearchController::loadMoreRows() {
using Flag = MTPmessages_GetChatInviteImporters::Flag;
_requestId = _api.request(MTPmessages_GetChatInviteImporters(
MTP_flags(Flag::f_requested | Flag::f_q),
_peer->input,
_peer->input(),
MTPstring(), // link
MTP_string(_query),
MTP_int(_offsetDate),
_offsetUser ? _offsetUser->inputUser : MTP_inputUserEmpty(),
_offsetUser ? _offsetUser->inputUser() : MTP_inputUserEmpty(),
MTP_int(limit)
)).done([=](
const MTPmessages_ChatInviteImporters &result,

View File

@@ -553,7 +553,7 @@ void Controller::checkUsernameAvailability() {
const auto channel = _peer->migrateToOrMe()->asChannel();
const auto username = channel ? channel->editableUsername() : QString();
_checkUsernameRequestId = _api.request(MTPchannels_CheckUsername(
channel ? channel->inputChannel : MTP_inputChannelEmpty(),
channel ? channel->inputChannel() : MTP_inputChannelEmpty(),
MTP_string(checking)
)).done([=](const MTPBool &result) {
_checkUsernameRequestId = 0;

View File

@@ -58,8 +58,8 @@ void Setup(
MTP_flags(Flag::f_bot
| Flag::f_enabled
| (description.isEmpty() ? Flag() : Flag::f_custom_description)),
bot->inputUser,
peer->input,
bot->inputUser(),
peer->input(),
MTP_string(description)
)).done([=] {
done(QString());
@@ -74,8 +74,8 @@ void Remove(
Fn<void(QString)> done) {
bot->session().api().request(MTPbots_SetCustomVerification(
MTP_flags(MTPbots_SetCustomVerification::Flag::f_bot),
bot->inputUser,
peer->input,
bot->inputUser(),
peer->input(),
MTPstring()
)).done([=] {
done(QString());

View File

@@ -112,7 +112,7 @@ void PinMessageBox(
}
state->requestId = api->request(MTPmessages_UpdatePinnedMessage(
MTP_flags(flags),
peer->input,
peer->input(),
MTP_int(msgId)
)).done([=](const MTPUpdates &result) {
peer->session().api().applyUpdates(result);

View File

@@ -366,11 +366,11 @@ void PublicsController::rowRightActionClicked(not_null<PeerListRow*> row) {
}
*once = true;
peer->session().api().request(MTPchannels_UpdateUsername(
peer->asChannel()->inputChannel,
peer->asChannel()->inputChannel(),
MTP_string()
)).done([=] {
peer->session().api().request(MTPchannels_DeactivateAllUsernames(
peer->asChannel()->inputChannel
peer->asChannel()->inputChannel()
)).done([=] {
closeBox();
close();

View File

@@ -1781,13 +1781,13 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
threadHistory->sendRequestId = api.request(
MTPmessages_ForwardMessages(
MTP_flags(sendFlags),
history->peer->input,
history->peer->input(),
MTP_vector<MTPint>(mtpMsgIds),
MTP_vector<MTPlong>(generateRandom()),
peer->input,
peer->input(),
MTP_int(topMsgId),
(sublistPeer
? MTP_inputReplyToMonoForum(sublistPeer->input)
? MTP_inputReplyToMonoForum(sublistPeer->input())
: MTPInputReplyTo()),
MTP_int(options.scheduled),
MTP_int(options.scheduleRepeatPeriod),

View File

@@ -352,7 +352,7 @@ void PlaceAuctionBid(
| (passDetails ? Flag::f_peer : Flag())
| (passDetails ? Flag::f_message : Flag())
| (hideName ? Flag::f_hide_name : Flag())),
passDetails ? to->input : MTP_inputPeerEmpty(),
passDetails ? to->input() : MTP_inputPeerEmpty(),
MTP_long(state.gift->id),
MTP_long(amount),
MTP_textWithEntities(

View File

@@ -1475,7 +1475,7 @@ void GiftUpgrade(
RequestStarsFormAndSubmit(
window->uiShow(),
MTP_inputInvoiceStarGiftPrepaidUpgrade(
peer->input,
peer->input(),
MTP_string(giftPrepayUpgradeHash)),
std::move(formDone));
}
@@ -1820,7 +1820,7 @@ void CheckMaybeGiftLocked(
window->uiShow(),
MTP_inputInvoiceStarGiftTransfer(
Api::InputSavedStarGiftId(savedId, unique),
peer->input),
peer->input()),
formReady);
} else if (star && star->resale) {
const auto id = star->info.id;
@@ -4356,7 +4356,7 @@ void SendOfferBuyGift(
using Flag = MTPpayments_SendStarGiftOffer::Flag;
show->session().api().request(MTPpayments_SendStarGiftOffer(
MTP_flags(starsPerMessage ? Flag::f_allow_paid_stars : Flag()),
owner->input,
owner->input(),
MTP_string(unique->slug),
StarsAmountToTL(options.price()),
MTP_int(options.offerDuration),

View File

@@ -468,7 +468,7 @@ void TransferGift(
// Like when we transfer a gift from Resale tab.
session->api().request(MTPpayments_TransferStarGift(
Api::InputSavedStarGiftId(savedId, gift),
to->input
to->input()
)).done([=](const MTPUpdates &result) {
session->api().applyUpdates(result);
formDone(Payments::CheckoutResult::Paid, &result);
@@ -492,7 +492,7 @@ void TransferGift(
window->uiShow(),
MTP_inputInvoiceStarGiftTransfer(
Api::InputSavedStarGiftId(savedId, gift),
to->input),
to->input()),
std::move(formDone));
}
}
@@ -541,7 +541,7 @@ void BuyResaleGift(
const auto invoice = MTP_inputInvoiceStarGiftResale(
MTP_flags((type == CreditsType::Ton) ? Flag::f_ton : Flag()),
MTP_string(gift->slug),
to->input);
to->input());
Ui::RequestOurForm(show, invoice, [=](
uint64 formId,
@@ -922,7 +922,7 @@ void SendPeerThemeChangeRequest(
api->request(MTPmessages_SetChatWallPaper(
MTP_flags(0),
peer->input,
peer->input(),
MTPInputWallPaper(),
MTPWallPaperSettings(),
MTPint()
@@ -931,7 +931,7 @@ void SendPeerThemeChangeRequest(
}).send();
api->request(MTPmessages_SetChatTheme(
peer->input,
peer->input(),
(unique
? MTP_inputChatThemeUniqueGift(MTP_string(unique->slug))
: MTP_inputChatTheme(MTP_string(token)))

View File

@@ -228,7 +228,7 @@ void TranslateBox(
translated->hide(anim::type::instant);
state->api.request(MTPmessages_TranslateText(
MTP_flags(flags),
msgId ? peer->input : MTP_inputPeerEmpty(),
msgId ? peer->input() : MTP_inputPeerEmpty(),
(msgId
? MTP_vector<MTPint>(1, MTP_int(msgId))
: MTPVector<MTPint>()),

View File

@@ -38,7 +38,7 @@ void UrlAuthBox::Activate(
return;
}
const auto session = &message->history()->session();
const auto inputPeer = message->history()->peer->input;
const auto inputPeer = message->history()->peer->input();
const auto buttonId = button->buttonId;
const auto url = QString::fromUtf8(button->data);
@@ -127,7 +127,7 @@ void UrlAuthBox::Request(
return;
}
const auto session = &message->history()->session();
const auto inputPeer = message->history()->peer->input;
const auto inputPeer = message->history()->peer->input();
const auto buttonId = button->buttonId;
const auto url = QString::fromUtf8(button->data);

View File

@@ -349,7 +349,7 @@ void Call::startOutgoing() {
: MTPphone_RequestCall::Flag(0);
_api.request(MTPphone_RequestCall(
MTP_flags(flags),
_user->inputUser,
_user->inputUser(),
MTP_int(base::RandomValue<int32>()),
MTP_bytes(_gaHash),
MTP_phoneCallProtocol(

View File

@@ -362,7 +362,7 @@ void ChooseJoinAsProcess::start(
void ChooseJoinAsProcess::requestList() {
const auto session = &_request->peer->session();
_request->id = session->api().request(MTPphone_GetGroupCallJoinAs(
_request->peer->input
_request->peer->input()
)).done([=](const MTPphone_JoinAsPeers &result) {
auto list = result.match([&](const MTPDphone_joinAsPeers &data) {
session->data().processUsers(data.vusers());

View File

@@ -1305,7 +1305,7 @@ void GroupCall::start(TimeId scheduleDate, bool rtmp) {
_createRequestId = _api.request(MTPphone_CreateGroupCall(
MTP_flags((scheduleDate ? Flag::f_schedule_date : Flag(0))
| (rtmp ? Flag::f_rtmp_stream : Flag(0))),
_peer->input,
_peer->input(),
MTP_int(base::RandomValue<int32>()),
MTPstring(), // title
MTP_int(scheduleDate)
@@ -1584,8 +1584,8 @@ void GroupCall::setJoinAs(not_null<PeerData*> as) {
void GroupCall::saveDefaultJoinAs(not_null<PeerData*> as) {
setJoinAs(as);
_api.request(MTPphone_SaveDefaultGroupCallJoinAs(
_peer->input,
joinAs()->input
_peer->input(),
joinAs()->input()
)).send();
}
@@ -1664,7 +1664,7 @@ void GroupCall::sendJoinRequest() {
_api.request(MTPphone_JoinGroupCall(
MTP_flags(flags),
inputCallSafe(),
joinAs()->input,
joinAs()->input(),
MTP_string(_joinHash),
(_e2e ? TdE2E::PublicKeyToMTP(_e2e->myKey()) : MTPint256()),
MTP_bytes(joinBlock),
@@ -3915,7 +3915,7 @@ void GroupCall::sendSelfUpdate(SendUpdateType type) {
? Flag::f_presentation_paused
: Flag::f_muted),
inputCall(),
joinAs()->input,
joinAs()->input(),
MTP_bool(muted() != MuteState::Active),
MTP_int(100000), // volume
MTP_bool(muted() == MuteState::RaisedHand),
@@ -4012,7 +4012,7 @@ void GroupCall::editParticipant(
_api.request(MTPphone_EditGroupCallParticipant(
MTP_flags(flags),
inputCall(),
participantPeer->input,
participantPeer->input(),
MTP_bool(mute),
MTP_int(std::clamp(volume.value_or(0), 1, Group::kMaxVolume)),
MTPBool(), // raise_hand
@@ -4039,7 +4039,7 @@ void GroupCall::inviteToConference(
_api.request(MTPphone_InviteConferenceCallParticipant(
MTP_flags(request.video ? Flag::f_video : Flag()),
inputCall(),
user->inputUser
user->inputUser()
)).done([=](const MTPUpdates &result) {
const auto call = _sharedCall.get();
user->owner().registerInvitedToCallUser(_id, call, user, true);
@@ -4129,7 +4129,7 @@ void GroupCall::inviteUsers(
const auto user = request.user;
owner->registerInvitedToCallUser(_id, _peer, user, false);
usersSlice.push_back(user);
slice.push_back(user->inputUser);
slice.push_back(user->inputUser());
if (slice.size() == kMaxInvitePerSlice) {
sendSlice();
}

View File

@@ -179,7 +179,7 @@ void Messages::send(TextWithTags text, int stars) {
MTP_long(randomId),
serialized,
MTP_long(stars),
from->input
from->input()
)).done([=](
const MTPUpdates &result,
const MTP::Response &response) {
@@ -636,7 +636,7 @@ void Messages::reactionsPaidSend() {
MTP_long(randomId),
MTP_textWithEntities(MTP_string(), MTP_vector<MTPMessageEntity>()),
MTP_long(stars),
from->input
from->input()
)).done([=](
const MTPUpdates &result,
const MTP::Response &response) {
@@ -679,7 +679,7 @@ void Messages::deleteConfirmed(MessageDeleteRequest request) {
_api->request(MTPphone_DeleteGroupCallParticipantMessages(
MTP_flags(request.reportSpam ? Flag::f_report_spam : Flag()),
_call->inputCall(),
from->input
from->input()
)).send();
eraseFrom(ranges::remove(_messages, not_null(from), &Message::peer));
} else {

View File

@@ -161,7 +161,7 @@ void StartRtmpProcess::requestUrl(bool revoke) {
const auto session = &_request->peer->session();
_request->id = session->api().request(MTPphone_GetGroupCallStreamRtmpUrl(
MTP_flags(0),
_request->peer->input,
_request->peer->input(),
MTP_bool(revoke)
)).done([=](const MTPphone_GroupCallStreamRtmpUrl &result) {
auto data = result.match([&](

View File

@@ -694,7 +694,7 @@ void SettingsBox(
state->requestId = session->api().request(
MTPphone_GetGroupCallStreamRtmpUrl(
MTP_flags(0),
peer->input,
peer->input(),
MTP_bool(true)
)).done([=](const MTPphone_GroupCallStreamRtmpUrl &result) {
auto data = result.match([&](

View File

@@ -281,7 +281,7 @@ void EmojiInteractions::sendAccumulatedOutgoing(
const auto emoji = from->emoji;
const auto requestId = _session->api().request(MTPmessages_SetTyping(
MTP_flags(0),
peer->input,
peer->input(),
MTPint(), // top_msg_id
MTP_sendMessageEmojiInteraction(
MTP_string(from->emoticon),
@@ -426,7 +426,7 @@ void EmojiInteractions::playStarted(not_null<PeerData*> peer, QString emoji) {
}
_session->api().request(MTPmessages_SetTyping(
MTP_flags(0),
peer->input,
peer->input(),
MTPint(), // top_msg_id
MTP_sendMessageEmojiInteractionSeen(MTP_string(emoji))
)).send();

View File

@@ -951,8 +951,8 @@ void GifsListWidget::sendInlineRequest() {
_search->setLoading(true);
_inlineRequestId = _api.request(MTPmessages_GetInlineBotResults(
MTP_flags(0),
_searchBot->inputUser,
_inlineQueryPeer->input,
_searchBot->inputUser(),
_inlineQueryPeer->input(),
MTPInputGeoPoint(),
MTP_string(_inlineQuery),
MTP_string(nextOffset)

View File

@@ -231,7 +231,7 @@ void SavePersonalChannel(
&& self->personalChannelMessageId() != messageId)) {
self->setPersonalChannel(channelId, messageId);
self->session().api().request(MTPaccount_UpdatePersonalChannel(
channel ? channel->inputChannel : MTP_inputChannelEmpty()
channel ? channel->inputChannel() : MTP_inputChannelEmpty()
)).done(crl::guard(window, [=] {
window->showToast((channel
? tr::lng_settings_channel_saved
@@ -993,7 +993,7 @@ bool ShowEditBirthday(
const auto save = [=](Data::Birthday result) {
using BFlag = MTPDbirthday::Flag;
controller->session().api().request(MTPusers_SuggestBirthday(
targetUser->inputUser,
targetUser->inputUser(),
MTP_birthday(
MTP_flags(result.year() ? BFlag::f_year : BFlag()),
MTP_int(result.day()),

View File

@@ -85,7 +85,7 @@ void Chatbots::save(
api->request(MTPaccount_UpdateConnectedBot(
MTP_flags(!settings.bot ? Flag::f_deleted : Flag::f_rights),
ToMTP(settings.permissions),
(settings.bot ? settings.bot : was.bot)->inputUser,
(settings.bot ? settings.bot : was.bot)->inputUser(),
ForBotsToMTP(settings.recipients)
)).done([=](const MTPUpdates &result) {
api->applyUpdates(result);
@@ -117,7 +117,7 @@ void Chatbots::togglePaused(not_null<PeerData*> peer, bool paused) {
_sentRequests.erase(i);
}
const auto id = api->request(MTPaccount_ToggleConnectedBotPaused(
peer->input,
peer->input(),
MTP_bool(paused)
)).done([=] {
if (_sentRequests[peer].type != type) {
@@ -155,7 +155,7 @@ void Chatbots::removeFrom(not_null<PeerData*> peer) {
_sentRequests.erase(i);
}
const auto id = api->request(MTPaccount_DisablePeerConnectedBot(
peer->input
peer->input()
)).done([=] {
if (_sentRequests[peer].type != type) {
return;

View File

@@ -91,7 +91,7 @@ void Factchecks::request() {
}
}
_requestId = _session->api().request(MTPmessages_GetFactCheck(
history->peer->input,
history->peer->input(),
MTP_vector<MTPint>(std::move(ids))
)).done([=](const MTPVector<MTPFactCheck> &result) {
_requestId = 0;
@@ -170,7 +170,7 @@ void Factchecks::save(
return;
} else if (text.empty()) {
_session->api().request(MTPmessages_DeleteFactCheck(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id.bare)
)).done([=](const MTPUpdates &result) {
_session->api().applyUpdates(result);
@@ -180,7 +180,7 @@ void Factchecks::save(
}).send();
} else {
_session->api().request(MTPmessages_EditFactCheck(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(item->id.bare),
MTP_textWithEntities(
MTP_string(text.text),

View File

@@ -79,7 +79,7 @@ void RecentSharedMediaGifts::request(
_recent[peer->id].requestId = peer->session().api().request(
MTPpayments_GetSavedStarGifts(
MTP_flags(0),
peer->input,
peer->input(),
MTP_int(0), // collection_id
MTP_string(QString()),
MTP_int(kMaxPinnedGifts)
@@ -128,7 +128,7 @@ void RecentSharedMediaGifts::updatePinnedOrder(
}
_session->api().request(MTPpayments_ToggleStarGiftsPinnedToTop(
peer->input,
peer->input(),
MTP_vector<MTPInputSavedStarGift>(std::move(inputs))
)).done([=] {
auto result = std::deque<SavedStarGift>();

View File

@@ -485,7 +485,7 @@ void ScheduledMessages::request(not_null<History*> history) {
? countListHash(i->second)
: uint64(0);
request.requestId = _session->api().request(
MTPmessages_GetScheduledHistory(peer->input, MTP_long(hash))
MTPmessages_GetScheduledHistory(peer->input(), MTP_long(hash))
).done([=](const MTPmessages_Messages &result) {
parse(history, result);
}).fail([=] {

View File

@@ -285,7 +285,7 @@ void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
request.requestId = _session->api().request(
MTPmessages_GetSponsoredMessages(
MTP_flags(0),
history->peer->input,
history->peer->input(),
MTPint()) // msg_id
).done([=](const MTPmessages_sponsoredMessages &result) {
parse(history, result);
@@ -346,7 +346,7 @@ void SponsoredMessages::requestForVideo(
request.requestId = _session->api().request(
MTPmessages_GetSponsoredMessages(
MTP_flags(Flag::f_msg_id),
peer->input,
peer->input(),
MTP_int(item->id.bare))
).done([=](const MTPmessages_sponsoredMessages &result) {
parseForVideo(peer, result);

View File

@@ -109,7 +109,7 @@ void TopPeers::remove(not_null<PeerData*> peer) {
_requestId = _session->api().request(MTPcontacts_ResetTopPeerRating(
TypeToCategory(_type),
peer->input
peer->input()
)).send();
}

View File

@@ -116,8 +116,6 @@ std::unique_ptr<Data::SavedMessages> MegagroupInfo::takeMonoforumData() {
ChannelData::ChannelData(not_null<Data::Session*> owner, PeerId id)
: PeerData(owner, id)
, inputChannel(
MTP_inputChannel(MTP_long(peerToChannel(id).bare), MTP_long(0)))
, _ptsWaiter(&owner->session().updates()) {
}
@@ -176,13 +174,7 @@ bool ChannelData::isUsernameEditable(QString username) const {
}
void ChannelData::setAccessHash(uint64 accessHash) {
access = accessHash;
input = MTP_inputPeerChannel(
MTP_long(peerToChannel(id).bare),
MTP_long(accessHash));
inputChannel = MTP_inputChannel(
MTP_long(peerToChannel(id).bare),
MTP_long(accessHash));
_accessHash = accessHash;
}
void ChannelData::setFlags(ChannelDataFlags which) {
@@ -604,7 +596,7 @@ void ChannelData::markForbidden() {
? MTPDchannelForbidden::Flag::f_megagroup
: MTPDchannelForbidden::Flag::f_broadcast),
MTP_long(peerToChannel(id).bare),
MTP_long(access),
MTP_long(_accessHash),
MTP_string(name()),
MTPint()));
}

View File

@@ -194,6 +194,10 @@ public:
void setUsername(const QString &username);
void setUsernames(const Data::Usernames &newUsernames);
void setPhoto(const MTPChatPhoto &photo);
[[nodiscard]] uint64 accessHash() const {
return _accessHash;
}
void setAccessHash(uint64 accessHash);
void setFlags(ChannelDataFlags which);

View File

@@ -27,8 +27,7 @@ using UpdateFlag = Data::PeerUpdate::Flag;
} // namespace
ChatData::ChatData(not_null<Data::Session*> owner, PeerId id)
: PeerData(owner, id)
, inputChat(MTP_long(peerToChat(id).bare)) {
: PeerData(owner, id) {
_flags.changes(
) | rpl::on_next([=](const Flags::Change &change) {
if (change.diff & Flag::CallNotEmpty) {

View File

@@ -230,13 +230,13 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
auto pinned = QVector<MTPInputPeer>();
pinned.reserve(_pinned.size());
for (const auto &history : _pinned) {
pinned.push_back(history->peer->input);
pinned.push_back(history->peer->input());
always.remove(history);
}
auto include = QVector<MTPInputPeer>();
include.reserve(always.size());
for (const auto &history : always) {
include.push_back(history->peer->input);
include.push_back(history->peer->input());
}
auto title = MTP_textWithEntities(
MTP_string(_title.text),
@@ -275,7 +275,7 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
auto never = QVector<MTPInputPeer>();
never.reserve(_never.size());
for (const auto &history : _never) {
never.push_back(history->peer->input);
never.push_back(history->peer->input());
}
return MTP_dialogFilter(
MTP_flags(flags),
@@ -944,7 +944,7 @@ bool ChatFilters::loadNextExceptions(bool chatsListLoaded) {
for (const auto &history : i->always()) {
if (!history->folderKnown()) {
inputs.push_back(
MTP_inputDialogPeer(history->peer->input));
MTP_inputDialogPeer(history->peer->input()));
}
}
}

View File

@@ -61,7 +61,7 @@ constexpr auto ByDocument = [](const auto &entry) {
if (const auto user = peer->asUser()) {
return user->accessHash();
} else if (const auto channel = peer->asChannel()) {
return channel->access;
return channel->accessHash();
}
return 0;
}

View File

@@ -534,7 +534,7 @@ void EmojiStatuses::set(
if (peer->isSelf()) {
send(MTPaccount_UpdateEmojiStatus(status));
} else if (const auto channel = peer->asChannel()) {
send(MTPchannels_UpdateEmojiStatus(channel->inputChannel, status));
send(MTPchannels_UpdateEmojiStatus(channel->inputChannel(), status));
}
}

View File

@@ -162,7 +162,7 @@ void Forum::requestTopics() {
const auto loadCount = firstLoad ? kTopicsFirstLoad : kTopicsPerPage;
_requestId = session().api().request(MTPmessages_GetForumTopics(
MTP_flags(0),
peer()->input,
peer()->input(),
MTPstring(), // q
MTP_int(_offset.date),
MTP_int(_offset.id),
@@ -425,7 +425,7 @@ void Forum::requestSomeStale() {
Fn<void()> finish) {
return session().api().request(
MTPmessages_GetForumTopicsByID(
peer()->input,
peer()->input(),
MTP_vector<MTPint>(rootIds))
).done([=](const MTPmessages_ForumTopics &result) {
_staleRequestId = 0;

View File

@@ -477,7 +477,7 @@ void ForumTopic::setClosedAndSave(bool closed) {
const auto weak = base::make_weak(this);
api->request(MTPmessages_EditForumTopic(
MTP_flags(MTPmessages_EditForumTopic::Flag::f_closed),
peer()->input,
peer()->input(),
MTP_int(_rootId),
MTPstring(), // title
MTPlong(), // icon_emoji_id

View File

@@ -1152,7 +1152,7 @@ void GroupCall::saveSendAs(not_null<PeerData*> peer) {
_savedSendAs = peer;
api().request(MTPphone_SaveDefaultSendAs(
input(),
peer->input
peer->input()
)).send();
}

View File

@@ -46,7 +46,7 @@ MTPInputReplyTo ReplyToForMTP(
if (replyTo.storyId) {
if (const auto peer = owner->peerLoaded(replyTo.storyId.peer)) {
return MTP_inputReplyToStory(
peer->input,
peer->input(),
MTP_int(replyTo.storyId.story));
}
} else if (replyTo.messageId || replyTo.topicRootId) {
@@ -95,13 +95,13 @@ MTPInputReplyTo ReplyToForMTP(
MTP_int(replyTo.messageId ? replyTo.messageId.msg : 0),
MTP_int(replyTo.topicRootId),
(external
? owner->peer(replyTo.messageId.peer)->input
? owner->peer(replyTo.messageId.peer)->input()
: MTPInputPeer()),
MTP_string(replyTo.quote.text),
quoteEntities,
MTP_int(replyTo.quoteOffset),
(replyToMonoforumPeerId
? history->owner().peer(replyToMonoforumPeerId)->input
? history->owner().peer(replyToMonoforumPeerId)->input()
: MTPInputPeer()),
MTP_int(replyTo.todoItemId));
} else if (history->peer->amMonoforumAdmin()
@@ -109,7 +109,7 @@ MTPInputReplyTo ReplyToForMTP(
const auto replyToMonoforumPeer = replyTo.monoforumPeerId
? history->owner().peer(replyTo.monoforumPeerId)
: history->session().user();
return MTP_inputReplyToMonoForum(replyToMonoforumPeer->input);
return MTP_inputReplyToMonoForum(replyToMonoforumPeer->input());
}
return MTPInputReplyTo();
}
@@ -421,7 +421,7 @@ void Histories::sendDialogRequests() {
auto peers = QVector<MTPInputDialogPeer>();
const auto dialogPeer = [](not_null<History*> history) {
return MTP_inputDialogPeer(history->peer->input);
return MTP_inputDialogPeer(history->peer->input());
};
ranges::transform(
histories,
@@ -501,7 +501,7 @@ void Histories::changeDialogUnreadMark(
session().api().request(MTPmessages_MarkDialogUnread(
MTP_flags(unread ? Flag::f_unread : Flag(0)),
MTPInputPeer(), // parent_peer
MTP_inputDialogPeer(history->peer->input)
MTP_inputDialogPeer(history->peer->input())
)).send();
}
@@ -518,8 +518,8 @@ void Histories::changeSublistUnreadMark(
session().api().request(MTPmessages_MarkDialogUnread(
MTP_flags(Flag::f_parent_peer
| (unread ? Flag::f_unread : Flag(0))),
parent->input,
MTP_inputDialogPeer(sublist->sublistPeer()->input)
parent->input(),
MTP_inputDialogPeer(sublist->sublistPeer()->input())
)).send();
}
@@ -532,7 +532,7 @@ void Histories::requestFakeChatListMessage(
_fakeChatListRequests.emplace(history);
sendRequest(history, RequestType::History, [=](Fn<void()> finish) {
return session().api().request(MTPmessages_GetHistory(
history->peer->input,
history->peer->input(),
MTP_int(0), // offset_id
MTP_int(0), // offset_date
MTP_int(0), // add_offset
@@ -573,7 +573,7 @@ void Histories::requestGroupAround(not_null<HistoryItem*> item) {
const auto requestId = sendRequest(history, RequestType::History, [=](
Fn<void()> finish) {
return session().api().request(MTPmessages_GetHistory(
history->peer->input,
history->peer->input(),
MTP_int(id),
MTP_int(0), // offset_date
MTP_int(-kMaxAlbumCount),
@@ -658,7 +658,7 @@ void Histories::reportPendingDeliveries() {
};
session().api().request(MTPmessages_ReportMessagesDelivery(
MTP_flags(0),
peer->input,
peer->input(),
MTP_vector(std::move(list))
)).done(finish).fail(finish).send();
}
@@ -722,12 +722,12 @@ void Histories::sendReadRequest(not_null<History*> history, State &state) {
};
if (const auto channel = history->peer->asChannel()) {
return session().api().request(MTPchannels_ReadHistory(
channel->inputChannel,
channel->inputChannel(),
MTP_int(tillId)
)).done(finished).fail(finished).send();
} else {
return session().api().request(MTPmessages_ReadHistory(
history->peer->input,
history->peer->input(),
MTP_int(tillId)
)).done([=](const MTPmessages_AffectedMessages &result) {
session().api().applyAffectedMessages(history->peer, result);
@@ -779,7 +779,7 @@ void Histories::deleteMessages(
};
if (const auto channel = history->peer->asChannel()) {
return session().api().request(MTPchannels_DeleteMessages(
channel->inputChannel,
channel->inputChannel(),
MTP_vector<MTPint>(ids)
)).done(done).fail(finish).send();
} else {
@@ -803,7 +803,7 @@ void Histories::deleteAllMessages(
const auto channel = peer->asChannel();
if (!justClear && revoke && channel && channel->canDelete()) {
return session().api().request(MTPchannels_DeleteChannel(
channel->inputChannel
channel->inputChannel()
)).done([=](const MTPUpdates &result) {
session().api().applyUpdates(result);
//}).fail([=](const MTP::Error &error) {
@@ -815,18 +815,18 @@ void Histories::deleteAllMessages(
using Flag = MTPchannels_DeleteHistory::Flag;
return session().api().request(MTPchannels_DeleteHistory(
MTP_flags(revoke ? Flag::f_for_everyone : Flag(0)),
channel->inputChannel,
channel->inputChannel(),
MTP_int(deleteTillId)
)).done(finish).fail(finish).send();
} else if (!justClear && revoke && chat && chat->amCreator()) {
return session().api().request(MTPmessages_DeleteChat(
chat->inputChat
chat->inputChat()
)).done(finish).fail([=](const MTP::Error &error) {
if (error.type() == "PEER_ID_INVALID") {
// Try to join and delete,
// while delete fails for non-joined.
session().api().request(MTPmessages_AddChatUser(
chat->inputChat,
chat->inputChat(),
MTP_inputUserSelf(),
MTP_int(0)
)).done([=](const MTPmessages_InvitedUsers &result) {
@@ -848,7 +848,7 @@ void Histories::deleteAllMessages(
| (revoke ? Flag::f_revoke : Flag(0));
return session().api().request(MTPmessages_DeleteHistory(
MTP_flags(flags),
peer->input,
peer->input(),
MTP_int(0),
MTPint(), // min_date
MTPint() // max_date
@@ -901,7 +901,7 @@ void Histories::deleteMessagesByDates(
| (revoke ? Flag::f_revoke : Flag(0));
return session().api().request(MTPmessages_DeleteHistory(
MTP_flags(flags),
peer->input,
peer->input(),
MTP_int(0),
MTP_int(minDate),
MTP_int(maxDate)
@@ -965,7 +965,7 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
}
for (const auto &[peer, ids] : scheduledIdsByPeer) {
peer->session().api().request(MTPmessages_DeleteScheduledMessages(
peer->input,
peer->input(),
MTP_vector<MTPint>(ids)
)).done([peer = peer](const MTPUpdates &result) {
peer->session().api().applyUpdates(result);
@@ -1058,7 +1058,7 @@ void Histories::sendCreateTopicRequest(
MTP_flags(Flag::f_icon_color
| (topic->iconId() ? Flag::f_icon_emoji_id : Flag())
| (history->peer->isBot() ? Flag::f_title_missing : Flag())),
history->peer->input,
history->peer->input(),
MTP_string(topic->title()),
MTP_int(topic->colorId()),
MTP_long(topic->iconId()),

View File

@@ -172,7 +172,7 @@ constexpr auto kPaidAccumulatePeriod = 5 * crl::time(1000) + 500;
: (*shownPeer == session->userPeerId())
? MTP_paidReactionPrivacyDefault()
: MTP_paidReactionPrivacyPeer(
session->data().peer(*shownPeer)->input);
session->data().peer(*shownPeer)->input());
}
} // namespace
@@ -1058,7 +1058,7 @@ void Reactions::requestMyTags(SavedSublist *sublist) {
using Flag = MTPmessages_GetSavedReactionTags::Flag;
my.requestId = api.request(MTPmessages_GetSavedReactionTags(
MTP_flags(sublist ? Flag::f_peer : Flag()),
(sublist ? sublist->sublistPeer()->input : MTP_inputPeerEmpty()),
(sublist ? sublist->sublistPeer()->input() : MTP_inputPeerEmpty()),
MTP_long(my.hash)
)).done([=](const MTPmessages_SavedReactionTags &result) {
auto &my = _myTags[sublist];
@@ -1504,7 +1504,7 @@ void Reactions::send(not_null<HistoryItem*> item, bool addToRecent) {
| (addToRecent ? Flag::f_add_to_recent : Flag(0));
i->second = api.request(MTPmessages_SendReaction(
MTP_flags(flags),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(id.msg),
MTP_vector<MTPReaction>(chosen | ranges::views::filter([](
const ReactionId &id) {
@@ -1728,7 +1728,7 @@ void Reactions::pollCollected() {
}
};
_pollRequestId = api.request(MTPmessages_GetMessagesReactions(
peer->input,
peer->input(),
MTP_vector<MTPint>(ids)
)).done([=](const MTPUpdates &result) {
_owner->session().api().applyUpdates(result);
@@ -1832,7 +1832,7 @@ void Reactions::sendPaidPrivacyRequest(
auto &api = _owner->session().api();
const auto requestId = api.request(
MTPmessages_TogglePaidReactionPrivacy(
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(id.msg),
PaidReactionShownPeerToTL(&_owner->session(), send.shownPeer))
).done([=] {
@@ -1869,7 +1869,7 @@ void Reactions::sendPaidRequest(
using Flag = MTPmessages_SendPaidReaction::Flag;
const auto requestId = api.request(MTPmessages_SendPaidReaction(
MTP_flags(send.shownPeer ? Flag::f_private : Flag()),
item->history()->peer->input,
item->history()->peer->input(),
MTP_int(id.msg),
MTP_int(send.count),
MTP_long(randomId),

View File

@@ -599,7 +599,7 @@ void PeerData::updateUserpic(
isSelf() ? peerToUser(id) : UserId(),
MTP_inputPeerPhotoFileLocation(
MTP_flags(0),
input,
input(),
MTP_long(photoId))) },
kUserpicSize,
kUserpicSize),
@@ -874,7 +874,7 @@ void PeerData::saveTranslationDisabled(bool disabled) {
using Flag = MTPmessages_TogglePeerTranslations::Flag;
session().api().request(MTPmessages_TogglePeerTranslations(
MTP_flags(disabled ? Flag::f_disabled : Flag()),
input
input()
)).send();
}

View File

@@ -534,7 +534,7 @@ void RepliesList::loadAround(MsgId id) {
const auto send = [=](Fn<void()> finish) {
return _history->session().api().request(MTPmessages_GetReplies(
_history->peer->input,
_history->peer->input(),
MTP_int(_rootId),
MTP_int(id), // offset_id
MTP_int(0), // offset_date
@@ -591,7 +591,7 @@ void RepliesList::loadBefore() {
const auto last = _list.back();
const auto send = [=](Fn<void()> finish) {
return _history->session().api().request(MTPmessages_GetReplies(
_history->peer->input,
_history->peer->input(),
MTP_int(_rootId),
MTP_int(last), // offset_id
MTP_int(0), // offset_date
@@ -635,7 +635,7 @@ void RepliesList::loadAfter() {
const auto first = _list.front();
const auto send = [=](Fn<void()> finish) {
return _history->session().api().request(MTPmessages_GetReplies(
_history->peer->input,
_history->peer->input(),
MTP_int(_rootId),
MTP_int(first + 1), // offset_id
MTP_int(0), // offset_date
@@ -940,7 +940,7 @@ void RepliesList::requestUnreadCount() {
};
_reloadUnreadCountRequestId = session->api().request(
MTPmessages_GetDiscussionMessage(
_history->peer->input,
_history->peer->input(),
MTP_int(_rootId))
).done([=](const MTPmessages_DiscussionMessage &result) {
if (weak) {
@@ -1004,7 +1004,7 @@ void RepliesList::sendReadTillRequest() {
api->request(base::take(_readRequestId)).cancel();
_readRequestId = api->request(MTPmessages_ReadDiscussion(
_history->peer->input,
_history->peer->input(),
MTP_int(_rootId),
MTP_int(computeInboxReadTillFull())
)).done(crl::guard(this, [=] {

View File

@@ -164,7 +164,7 @@ void SavedMessages::requestSomeStale() {
i = _stalePeers.erase(i);
peers.push_back(peer);
peerIds.push_back(peer->input);
peerIds.push_back(peer->input());
if (peerIds.size() == kStalePerRequest) {
break;
}
@@ -192,7 +192,7 @@ void SavedMessages::requestSomeStale() {
return session().api().request(
MTPmessages_GetSavedDialogsByID(
MTP_flags(Flag::f_parent_peer),
_parentChat->input,
_parentChat->input(),
MTP_vector<MTPInputPeer>(peerIds))
).done([=](const MTPmessages_SavedDialogs &result) {
_staleRequestId = 0;
@@ -276,10 +276,10 @@ void SavedMessages::sendLoadMore() {
MTPmessages_GetSavedDialogs(
MTP_flags(Flag::f_exclude_pinned
| (_parentChat ? Flag::f_parent_peer : Flag(0))),
_parentChat ? _parentChat->input : MTPInputPeer(),
_parentChat ? _parentChat->input() : MTPInputPeer(),
MTP_int(_offset.date),
MTP_int(_offset.id),
_offset.peer ? _offset.peer->input : MTP_inputPeerEmpty(),
_offset.peer ? _offset.peer->input() : MTP_inputPeerEmpty(),
MTP_int(_offset.id ? kListPerPage : kListFirstPerPage),
MTP_long(0)) // hash
).done([=](const MTPmessages_SavedDialogs &result) {

View File

@@ -269,7 +269,7 @@ void SavedMusic::loadMore(PeerId peerId, bool reload) {
entry.reloading = reload;
entry.requestId = _owner->session().api().request(MTPusers_GetSavedMusic(
user->inputUser,
user->inputUser(),
MTP_int(reload ? 0 : entry.list.size()),
MTP_int(kPerPage),
MTP_long(reload ? firstPageHash(entry) : 0)

View File

@@ -677,8 +677,8 @@ void SavedSublist::sendReadTillRequest() {
_sentReadTill = computeInboxReadTillFull();
_readRequestId = api->request(MTPmessages_ReadSavedHistory(
parentChat->input,
sublistPeer()->input,
parentChat->input(),
sublistPeer()->input(),
MTP_int(_sentReadTill.bare)
)).done(crl::guard(this, [=] {
_readRequestId = 0;
@@ -1112,8 +1112,8 @@ void SavedSublist::loadAround(MsgId id) {
const auto parentChat = _parent->parentChat();
return session().api().request(MTPmessages_GetSavedHistory(
MTP_flags(parentChat ? Flag::f_parent_peer : Flag(0)),
parentChat ? parentChat->input : MTPInputPeer(),
sublistPeer()->input,
parentChat ? parentChat->input() : MTPInputPeer(),
sublistPeer()->input(),
MTP_int(id), // offset_id
MTP_int(0), // offset_date
MTP_int(id ? (-kMessagesPerPage / 2) : 0), // add_offset
@@ -1184,8 +1184,8 @@ void SavedSublist::loadBefore() {
const auto parentChat = _parent->parentChat();
return session().api().request(MTPmessages_GetSavedHistory(
MTP_flags(parentChat ? Flag::f_parent_peer : Flag(0)),
parentChat ? parentChat->input : MTPInputPeer(),
sublistPeer()->input,
parentChat ? parentChat->input() : MTPInputPeer(),
sublistPeer()->input(),
MTP_int(last), // offset_id
MTP_int(0), // offset_date
MTP_int(0), // add_offset
@@ -1231,8 +1231,8 @@ void SavedSublist::loadAfter() {
const auto parentChat = _parent->parentChat();
return session().api().request(MTPmessages_GetSavedHistory(
MTP_flags(parentChat ? Flag::f_parent_peer : Flag(0)),
parentChat ? parentChat->input : MTPInputPeer(),
sublistPeer()->input,
parentChat ? parentChat->input() : MTPInputPeer(),
sublistPeer()->input(),
MTP_int(first + 1), // offset_id
MTP_int(0), // offset_date
MTP_int(-kMessagesPerPage), // add_offset

View File

@@ -83,7 +83,7 @@ std::optional<GlobalMediaRequest> PrepareGlobalMediaRequest(
MTP_int(maxDate),
MTP_int(offsetRate),
(offsetPosition.fullId.peer
? session->data().peer(PeerId(offsetPosition.fullId.peer))->input
? session->data().peer(PeerId(offsetPosition.fullId.peer))->input()
: MTP_inputPeerEmpty()),
MTP_int(offsetPosition.fullId.msg),
MTP_int(limit));
@@ -171,11 +171,11 @@ std::optional<SearchRequest> PrepareSearchRequest(
return MTPmessages_Search(
MTP_flags((topicRootId ? Flag::f_top_msg_id : Flag(0))
| (monoforumPeerId ? Flag::f_saved_peer_id : Flag(0))),
peer->input,
peer->input(),
MTP_string(query),
MTP_inputPeerEmpty(),
(monoforumPeerId
? peer->owner().peer(monoforumPeerId)->input
? peer->owner().peer(monoforumPeerId)->input()
: MTPInputPeer()),
MTPVector<MTPReaction>(), // saved_reaction
MTP_int(topicRootId),
@@ -311,7 +311,7 @@ HistoryRequest PrepareHistoryRequest(
int64(0),
int64(0x3FFFFFFF)));
return MTPmessages_GetHistory(
peer->input,
peer->input(),
MTP_int(mtpOffsetId),
MTP_int(offsetDate),
MTP_int(addOffset),

View File

@@ -479,8 +479,6 @@ not_null<PeerData*> Session::peer(PeerId id) {
}
Unexpected("Peer id type.");
}();
result->input = MTPinputPeer(MTP_inputPeerEmpty());
return _peers.emplace(id, std::move(result)).first->second.get();
}
@@ -540,8 +538,6 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
data.match([&](const MTPDuserEmpty &data) {
const auto canShareThisContact = result->canShareThisContactFast();
result->input = MTP_inputPeerUser(data.vid(), MTP_long(0));
result->inputUser = MTP_inputUser(data.vid(), MTP_long(0));
result->setName(tr::lng_deleted(tr::now), QString(), QString(), QString());
result->setPhoto(MTP_userProfilePhotoEmpty());
result->setFlags(UserDataFlag::Deleted);
@@ -634,18 +630,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
result->setFlags((result->flags() & ~flagsMask) | flagsSet);
result->setBotVerifyDetailsIcon(
data.vbot_verification_icon().value_or_empty());
if (minimal) {
if (result->input.type() == mtpc_inputPeerEmpty) {
result->input = MTP_inputPeerUser(
data.vid(),
MTP_long(data.vaccess_hash().value_or_empty()));
}
if (result->inputUser.type() == mtpc_inputUserEmpty) {
result->inputUser = MTP_inputUser(
data.vid(),
MTP_long(data.vaccess_hash().value_or_empty()));
}
} else {
if (!minimal) {
if (storiesState) {
result->setStoriesState(storiesState->hasVideoStream
? PeerData::StoriesState::HasVideoStream
@@ -655,16 +640,6 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
? PeerData::StoriesState::HasUnread
: PeerData::StoriesState::HasRead);
}
if (data.is_self()) {
result->input = MTP_inputPeerSelf();
result->inputUser = MTP_inputUserSelf();
} else if (const auto accessHash = data.vaccess_hash()) {
result->input = MTP_inputPeerUser(data.vid(), *accessHash);
result->inputUser = MTP_inputUser(data.vid(), *accessHash);
} else {
result->input = MTP_inputPeerUser(data.vid(), MTP_long(result->accessHash()));
result->inputUser = MTP_inputUser(data.vid(), MTP_long(result->accessHash()));
}
result->setUnavailableReasons(Data::UnavailableReason::Extract(
data.vrestriction_reason()));
}
@@ -849,7 +824,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
chat->invalidateParticipants();
}
chat->input = MTP_inputPeerChat(data.vid());
chat->setName(qs(data.vtitle()));
chat->setPhoto(data.vphoto());
chat->date = data.vdate().v;
@@ -869,7 +843,7 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
migratedTo->match([&](const MTPDinputChannel &input) {
const auto channel = this->channel(input.vchannel_id().v);
channel->addFlags(ChannelDataFlag::Megagroup);
if (!channel->access) {
if (!channel->accessHash()) {
channel->setAccessHash(input.vaccess_hash().v);
}
ApplyMigration(chat, channel);
@@ -909,7 +883,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
const auto canAddMembers = chat->canAddMembers();
chat->input = MTP_inputPeerChat(data.vid());
chat->setName(qs(data.vtitle()));
chat->setPhoto(MTP_chatPhotoEmpty());
chat->date = 0;
@@ -955,8 +928,8 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
channel->setEmojiStatus(EmojiStatusId());
}
if (minimal) {
if (channel->input.type() == mtpc_inputPeerEmpty
|| channel->inputChannel.type() == mtpc_inputChannelEmpty) {
if (channel->input().type() == mtpc_inputPeerEmpty
|| channel->inputChannel().type() == mtpc_inputChannelEmpty) {
channel->setAccessHash(data.vaccess_hash().value_or_empty());
}
} else {
@@ -971,7 +944,7 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
channel->setRestrictions(ChatRestrictionsInfo());
}
channel->setAccessHash(
data.vaccess_hash().value_or(channel->access));
data.vaccess_hash().value_or(channel->accessHash()));
channel->date = data.vdate().v;
channel->setUnavailableReasons(Data::UnavailableReason::Extract(
data.vrestriction_reason()));
@@ -2228,7 +2201,7 @@ void Session::nextForUpgradeGiftRequest(
MTP_flags(Flag::f_exclude_unique
| Flag::f_exclude_unlimited
| Flag::f_exclude_unupgradable),
owner->input,
owner->input(),
MTPint(), // collection_id
MTP_string(), // offset
MTP_int(1)) // limit
@@ -5252,7 +5225,7 @@ void Session::saveViewAsMessages(
}
_viewAsMessagesRequests[channel] = _session->api().request(
MTPchannels_ToggleViewForumAsMessages(
channel->inputChannel,
channel->inputChannel(),
MTP_bool(viewAsMessages))
).done([=] {
_viewAsMessagesRequests.remove(channel);
@@ -5363,70 +5336,126 @@ void Session::clearLocalStorage() {
_bigFileCache->clear();
}
void Session::fillMessagePeers(const MTPMessage &message) {
void Session::fillMessagePeer(FullMsgId fullId, PeerId peerId) {
if (!peerLoaded(peerId)) {
_messagesWithPeer[peerId].push_back(fullId);
}
}
void Session::fillForwardedInfo(
FullMsgId fullId,
const MTPMessageFwdHeader &header) {
return header.match([&](const MTPDmessageFwdHeader &data) {
if (const auto fromId = data.vfrom_id()) {
fillMessagePeer(fullId, peerFromMTP(*fromId));
}
});
}
void Session::fillMentionUsers(
FullMsgId fullId,
const MTPVector<MTPMessageEntity> &entities) {
for (const auto &entity : entities.v) {
entity.match([&](const MTPDmessageEntityMentionName &data) {
fillMessagePeer(fullId, peerFromUser(data.vuser_id()));
}, [&](const MTPDinputMessageEntityMentionName &data) {
data.vuser_id().match([&](const MTPDinputUser &data) {
fillMessagePeer(fullId, peerFromUser(data.vuser_id()));
}, [](const auto &) {});
}, [](const auto &) {});
}
}
void Session::fillMessagePeers(PeerId peerId, const MTPMessage &message) {
const auto id = IdFromMessage(message);
const auto peerId = PeerFromMessage(message);
if (!IsServerMsgId(id)) {
return;
}
const auto fullId = FullMsgId(peerId, id);
fillMessagePeer(fullId, peerId);
return message.match([&](const MTPDmessage &data) {
if (const auto fromId = data.vfrom_id()) {
fillMessagePeer(fullId, peerFromMTP(*fromId));
}
if (const auto viaBotId = data.vvia_bot_id()) {
fillMessagePeer(fullId, peerFromUser(*viaBotId));
}
if (const auto fwd = data.vfwd_from()) {
fillForwardedInfo(fullId, *fwd);
}
if (const auto entities = data.ventities()) {
fillMentionUsers(fullId, *entities);
}
}, [&](const MTPDmessageService &data) {
if (const auto fromId = data.vfrom_id()) {
fillMessagePeer(fullId, peerFromMTP(*fromId));
}
return data.vaction().match(
[&](const MTPDmessageActionChatAddUser &data) {
for (const auto &userId : data.vusers().v) {
fillMessagePeer(fullId, peerFromUser(userId));
}
}, [&](const MTPDmessageActionChatJoinedByLink &data) {
fillMessagePeer(fullId, peerFromUser(data.vinviter_id()));
}, [&](const MTPDmessageActionChatDeleteUser &data) {
fillMessagePeer(fullId, peerFromUser(data.vuser_id()));
}, [](const auto &) {
});
}, [](const MTPDmessageEmpty &) {
});
}
void Session::fillMessagePeers(const MTPDupdateShortMessage &data) {
const auto id = MsgId(data.vid().v);
const auto peerId = peerFromUser(data.vuser_id());
if (!id || !peerId) {
return;
}
const auto fullId = FullMsgId(peerId, id);
const auto fill = [&](PeerId peerId) {
if (!peerLoaded(peerId)) {
_messagesWithPeer[peerId].push_back(fullId);
}
};
const auto fillForwardedInfo = [&](const MTPMessageFwdHeader &header) {
return header.match([&](const MTPDmessageFwdHeader &data) {
if (const auto fromId = data.vfrom_id()) {
fill(peerFromMTP(*fromId));
}
});
};
const auto fillMentionUsers = [&](
const MTPVector<MTPMessageEntity> &entities) {
for (const auto &entity : entities.v) {
entity.match([&](const MTPDmessageEntityMentionName &data) {
fill(peerFromUser(data.vuser_id()));
}, [&](const MTPDinputMessageEntityMentionName &data) {
data.vuser_id().match([&](const MTPDinputUser &data) {
fill(peerFromUser(data.vuser_id()));
}, [](const auto &) {});
}, [](const auto &) {});
}
};
return message.match([&](const MTPDmessage &message) {
if (const auto fromId = message.vfrom_id()) {
fill(peerFromMTP(*fromId));
}
if (const auto viaBotId = message.vvia_bot_id()) {
fill(peerFromUser(*viaBotId));
}
if (const auto fwd = message.vfwd_from()) {
fillForwardedInfo(*fwd);
}
if (const auto entities = message.ventities()) {
fillMentionUsers(*entities);
}
}, [&](const MTPDmessageService &message) {
if (const auto fromId = message.vfrom_id()) {
fill(peerFromMTP(*fromId));
}
return message.vaction().match(
[&](const MTPDmessageActionChatAddUser &action) {
for (const auto &userId : action.vusers().v) {
fill(peerFromUser(userId));
}
}, [&](const MTPDmessageActionChatJoinedByLink &action) {
fill(peerFromUser(action.vinviter_id()));
}, [&](const MTPDmessageActionChatDeleteUser &action) {
fill(peerFromUser(action.vuser_id()));
}, [](const auto &) {
});
}, [](const MTPDmessageEmpty &message) {
});
fillMessagePeer(fullId, peerId);
if (const auto viaBotId = data.vvia_bot_id()) {
fillMessagePeer(fullId, peerFromUser(*viaBotId));
}
if (const auto fwd = data.vfwd_from()) {
fillForwardedInfo(fullId, *fwd);
}
if (const auto entities = data.ventities()) {
fillMentionUsers(fullId, *entities);
}
}
void Session::fillMessagePeers(const MTPDupdateShortChatMessage &data) {
const auto id = MsgId(data.vid().v);
const auto peerId = peerFromChat(data.vchat_id());
if (!id || !peerId) {
return;
}
const auto fullId = FullMsgId(peerId, id);
fillMessagePeer(fullId, peerId);
fillMessagePeer(fullId, peerFromUser(data.vfrom_id()));
if (const auto viaBotId = data.vvia_bot_id()) {
fillMessagePeer(fullId, peerFromUser(*viaBotId));
}
if (const auto fwd = data.vfwd_from()) {
fillForwardedInfo(fullId, *fwd);
}
if (const auto entities = data.ventities()) {
fillMentionUsers(fullId, *entities);
}
}
void Session::fillMessagePeers(
FullMsgId fullId,
const MTPDupdateShortSentMessage &data) {
if (const auto entities = data.ventities()) {
fillMentionUsers(fullId, *entities);
}
}
HistoryItem *Session::messageWithPeer(PeerId id) const {
if (id == _session->userPeerId()) {
return nullptr;
}
const auto i = _messagesWithPeer.find(id);
if (i == end(_messagesWithPeer)) {
return nullptr;

View File

@@ -918,7 +918,12 @@ public:
void clearLocalStorage();
void fillMessagePeers(const MTPMessage &message);
void fillMessagePeers(PeerId peerId, const MTPMessage &message);
void fillMessagePeers(const MTPDupdateShortMessage &data);
void fillMessagePeers(const MTPDupdateShortChatMessage &data);
void fillMessagePeers(
FullMsgId fullId,
const MTPDupdateShortSentMessage &data);
[[nodiscard]] HistoryItem *messageWithPeer(PeerId id) const;
private:
@@ -1065,6 +1070,14 @@ private:
void checkPollsClosings();
void fillMessagePeer(FullMsgId fullId, PeerId peerId);
void fillForwardedInfo(
FullMsgId fullId,
const MTPMessageFwdHeader &header);
void fillMentionUsers(
FullMsgId fullId,
const MTPVector<MTPMessageEntity> &entities);
const not_null<Main::Session*> _session;
Storage::DatabasePointer _cache;

View File

@@ -137,7 +137,7 @@ rpl::producer<MyGiftsDescriptor> MyUniqueGiftsSlice(
| ((type == MyUniqueType::OnlyOwned)
? Flag::f_exclude_hosted
: Flag())),
user->input,
user->input(),
MTP_int(0), // collection_id
MTP_string(offset),
MTP_int(kMyGiftsPerPage)

View File

@@ -332,7 +332,7 @@ void Stories::requestPeerStories(
}
};
_owner->session().api().request(MTPstories_GetPeerStories(
peer->input
peer->input()
)).done([=](const MTPstories_PeerStories &result) {
const auto &data = result.data();
_owner->processUsers(data.vusers());
@@ -849,7 +849,7 @@ void Stories::sendResolveRequests() {
};
const auto peer = _owner->session().data().peer(peerId);
api->request(MTPstories_GetStoriesByID(
peer->input,
peer->input(),
MTP_vector<MTPint>(prepared)
)).done([=](const MTPstories_Stories &result) {
owner().processUsers(result.data().vusers());
@@ -1090,7 +1090,7 @@ void Stories::sendReaction(FullStoryId id, Data::ReactionId reaction) {
const auto api = &session().api();
api->request(MTPstories_SendReaction(
MTP_flags(0),
story->peer()->input,
story->peer()->input(),
MTP_int(id.story),
ReactionToMTP(reaction)
)).send();
@@ -1317,7 +1317,7 @@ void Stories::toggleHidden(
peer->setStoriesHidden(hidden);
}
session().api().request(MTPstories_TogglePeerStoriesHidden(
peer->input,
peer->input(),
MTP_bool(hidden)
)).send();
if (byHints) {
@@ -1400,7 +1400,7 @@ void Stories::sendMarkAsReadRequest(
const auto api = &_owner->session().api();
api->request(MTPstories_ReadStories(
peer->input,
peer->input(),
MTP_int(tillId)
)).done(finish).fail(finish).send();
}
@@ -1461,7 +1461,7 @@ void Stories::sendIncrementViewsRequests() {
checkQuitPreventFinished();
};
api->request(MTPstories_IncrementStoryViews(
_owner->peer(peer)->input,
_owner->peer(peer)->input(),
MTP_vector<MTPint>(std::move(ids))
)).done(finish).fail(finish).send();
_incrementViewsPending.remove(peer);
@@ -1521,7 +1521,7 @@ void Stories::loadReactionsSlice(
_owner->session().api().request(_reactionsRequestId).cancel();
_reactionsRequestId = api->request(MTPstories_GetStoryReactionsList(
MTP_flags(offset.isEmpty() ? Flag() : Flag::f_offset),
_reactionsStoryPeer->input,
_reactionsStoryPeer->input(),
MTP_int(_reactionsStoryId),
MTPReaction(),
MTP_string(_reactionsOffset),
@@ -1595,7 +1595,7 @@ void Stories::sendViewsSliceRequest() {
_owner->session().api().request(_viewsRequestId).cancel();
_viewsRequestId = api->request(MTPstories_GetStoryViewsList(
MTP_flags(Flag::f_reactions_first),
_viewsStoryPeer->input,
_viewsStoryPeer->input(),
MTPstring(), // q
MTP_int(_viewsStoryId),
MTP_string(_viewsOffset),
@@ -1671,7 +1671,7 @@ void Stories::sendViewsCountsRequest() {
const auto api = &_owner->session().api();
_owner->session().api().request(_viewsRequestId).cancel();
_viewsRequestId = api->request(MTPstories_GetStoriesViews(
_viewsStoryPeer->input,
_viewsStoryPeer->input(),
MTP_vector<MTPint>(1, MTP_int(_viewsStoryId))
)).done([=](const MTPstories_StoryViews &result) {
_viewsRequestId = 0;
@@ -1843,18 +1843,18 @@ void Stories::albumIdsLoadMore(PeerId peerId, int albumId, bool reload) {
};
set->requestId = (albumId == kStoriesAlbumIdArchive)
? api->request(MTPstories_GetStoriesArchive(
peer->input,
peer->input(),
MTP_int(set->lastId),
MTP_int(set->lastId ? kArchivePerPage : kArchiveFirstPerPage)
)).done(done).fail(fail).send()
: (albumId == kStoriesAlbumIdSaved)
? api->request(MTPstories_GetPinnedStories(
peer->input,
peer->input(),
MTP_int(set->lastId),
MTP_int(set->lastId ? kSavedPerPage : kSavedFirstPerPage)
)).done(done).fail(fail).send()
: api->request(MTPstories_GetAlbumStories(
peer->input,
peer->input(),
MTP_int(albumId),
MTP_int(reload ? 0 : set->ids.list.size()),
MTP_int((reload || set->ids.list.empty())
@@ -1891,7 +1891,7 @@ void Stories::loadAlbums(not_null<PeerData*> peer, Albums &albums) {
const auto api = &_owner->session().api();
api->request(base::take(albums.requestId)).cancel();
albums.requestId = api->request(MTPstories_GetAlbums(
peer->input,
peer->input(),
MTP_long(albums.hash)
)).done([=](const MTPstories_Albums &result) {
auto &albums = _albums[peer->id];
@@ -1925,7 +1925,7 @@ void Stories::albumCreate(
ids.push_back(MTP_int(addId));
}
_owner->session().api().request(MTPstories_CreateAlbum(
peer->input,
peer->input(),
MTP_string(title),
MTP_vector<MTPint>(ids)
)).done([=](const MTPStoryAlbum &result) {
@@ -1954,7 +1954,7 @@ void Stories::albumRename(
using Flag = MTPstories_UpdateAlbum::Flag;
_owner->session().api().request(MTPstories_UpdateAlbum(
MTP_flags(Flag::f_title),
peer->input,
peer->input(),
MTP_int(id),
MTP_string(title),
MTPVector<MTPint>(),
@@ -1979,7 +1979,7 @@ void Stories::albumRename(
void Stories::albumDelete(not_null<PeerData*> peer, int id) {
_owner->session().api().request(MTPstories_DeleteAlbum(
peer->input,
peer->input(),
MTP_int(id)
)).send();
@@ -2039,7 +2039,7 @@ void Stories::albumReorderStories(
_reorderStoriesRequestId = _owner->session().api().request(
MTPstories_UpdateAlbum(
MTP_flags(MTPstories_UpdateAlbum::Flag::f_order),
peer->input,
peer->input(),
MTP_int(albumId),
MTPstring(),
MTPVector<MTPint>(),
@@ -2134,7 +2134,7 @@ void Stories::deleteList(const std::vector<FullStoryId> &ids) {
}
const auto api = &_owner->session().api();
api->request(MTPstories_DeleteStories(
peer->input,
peer->input(),
MTP_vector<MTPint>(list)
)).done([=](const MTPVector<MTPint> &result) {
for (const auto &id : result.v) {
@@ -2162,7 +2162,7 @@ void Stories::toggleInProfileList(
}
const auto api = &_owner->session().api();
api->request(MTPstories_TogglePinned(
peer->input,
peer->input(),
MTP_vector<MTPint>(list),
MTP_bool(inProfile)
)).done([=](const MTPVector<MTPint> &result) {
@@ -2265,7 +2265,7 @@ void Stories::togglePinnedList(
const auto api = &_owner->session().api();
const auto peer = session().data().peer(peerId);
api->request(MTPstories_TogglePinnedToTop(
peer->input,
peer->input(),
MTP_vector<MTPint>(list)
)).done([=] {
setPinnedToTop(peerId, list

View File

@@ -168,7 +168,7 @@ public:
void madeAction(TimeId when); // pseudo-online
uint64 accessHash() const {
[[nodiscard]] uint64 accessHash() const {
return _accessHash;
}
void setAccessHash(uint64 accessHash);

View File

@@ -80,7 +80,7 @@ NotifySettings::NotifySettings(not_null<Session*> owner)
void NotifySettings::request(not_null<PeerData*> peer) {
if (peer->notify().settingsUnknown()) {
peer->session().api().requestNotifySettings(
MTP_inputNotifyPeer(peer->input));
MTP_inputNotifyPeer(peer->input()));
}
if (defaultSettings(peer).settingsUnknown()) {
peer->session().api().requestNotifySettings(peer->isUser()
@@ -96,7 +96,7 @@ void NotifySettings::request(not_null<Thread*> thread) {
if (topic->notify().settingsUnknown()) {
topic->session().api().requestNotifySettings(
MTP_inputNotifyForumTopic(
topic->peer()->input,
topic->peer()->input(),
MTP_int(topic->rootId())));
}
}

View File

@@ -185,7 +185,7 @@ void PostsSearch::requestSearch(const QString &query) {
MTP_string(), // hashtag
MTP_string(query),
MTP_int(entry.offsetRate),
(entry.offsetPeer ? entry.offsetPeer->input : MTP_inputPeerEmpty()),
(entry.offsetPeer ? entry.offsetPeer->input() : MTP_inputPeerEmpty()),
MTP_int(entry.offsetId),
MTP_int(kPerPage),
MTP_long(useStars)

View File

@@ -2670,10 +2670,10 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
| (_searchQueryTags.empty()
? Flag()
: Flag::f_saved_reaction)),
inPeer->input,
inPeer->input(),
MTP_string(_searchQuery),
(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
(fromPeer ? fromPeer->input() : MTP_inputPeerEmpty()),
(savedPeer ? savedPeer->input() : MTP_inputPeerEmpty()),
MTP_vector_from_range(
_searchQueryTags | ranges::views::transform(
Data::ReactionToMTP
@@ -2783,7 +2783,7 @@ void Widget::searchTopics() {
_api.request(base::take(_topicSearchRequest)).cancel();
_topicSearchRequest = _api.request(MTPmessages_GetForumTopics(
MTP_flags(MTPmessages_GetForumTopics::Flag::f_q),
_openedForum->peer()->input,
_openedForum->peer()->input(),
MTP_string(_topicSearchQuery),
MTP_int(_topicSearchOffsetDate),
MTP_int(_topicSearchOffsetId),
@@ -2851,11 +2851,11 @@ void Widget::searchMore() {
| (_searchQueryTags.empty()
? Flag()
: Flag::f_saved_reaction)),
peer->input,
peer->input(),
MTP_string(_searchQuery),
(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
(fromPeer ? fromPeer->input() : MTP_inputPeerEmpty()),
(savedPeer
? savedPeer->input
? savedPeer->input()
: MTP_inputPeerEmpty()),
MTP_vector_from_range(
_searchQueryTags | ranges::views::transform(
@@ -2908,10 +2908,10 @@ void Widget::searchMore() {
_migratedProcess.requestId = session().api().request(
MTPmessages_Search(
flags,
_searchInMigrated->peer->input,
_searchInMigrated->peer->input(),
MTP_string(_searchQuery),
(_searchQueryFrom
? _searchQueryFrom->input
? _searchQueryFrom->input()
: MTP_inputPeerEmpty()),
MTPInputPeer(), // saved_peer_id
MTPVector<MTPReaction>(), // saved_reaction
@@ -2956,7 +2956,7 @@ void Widget::requestPublicPosts(bool fromStart) {
MTP_int(fromStart ? 0 : _postsProcess.nextRate),
(fromStart
? MTP_inputPeerEmpty()
: _postsProcess.lastPeer->input),
: _postsProcess.lastPeer->input()),
MTP_int(fromStart ? 0 : _postsProcess.lastId),
MTP_int(kSearchPerPage),
MTP_long(0)) // allow_paid_stars
@@ -3001,7 +3001,7 @@ void Widget::requestMessages(bool fromStart) {
MTP_int(fromStart ? 0 : _searchProcess.nextRate),
(fromStart
? MTP_inputPeerEmpty()
: _searchProcess.lastPeer->input),
: _searchProcess.lastPeer->input()),
MTP_int(fromStart ? 0 : _searchProcess.lastId),
MTP_int(kSearchPerPage))
).done([=](const MTPmessages_Messages &result) {

View File

@@ -22,7 +22,7 @@ Manager::Manager() = default;
Manager::~Manager() = default;
void Manager::start(not_null<PeerData*> peer) {
start(&peer->session(), peer->input);
start(&peer->session(), peer->input());
}
void Manager::startTopic(
@@ -35,7 +35,7 @@ void Manager::startTopic(
}
_controller = std::make_unique<Controller>(
&peer->session().mtp(),
peer->input,
peer->input(),
int32(topicRootId.bare),
uint64(peer->id.value),
topicTitle);

Some files were not shown because too many files have changed in this diff Show More