mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Fixed send options in CreatePollBox and SendFilesBox in replies.

Browse Source
This commit is contained in:
23rd
2020-11-20 20:04:50 +03:00
committed by John Preston
parent c53d9c532f
commit c109e35d95
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@@ -616,6 +616,11 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
const auto source = (_request.section == Section::Scheduled)
? Api::SendType::Scheduled
: Api::SendType::Normal;
const auto sendMenuType = (_request.section == Section::Scheduled)
? SendMenu::Type::Disabled
: (_request.section == Section::Replies)
? SendMenu::Type::SilentOnly
: SendMenu::Type::Scheduled;
const auto flag = PollData::Flags();
const auto replyToId = _request.currentReplyToId
? _request.currentReplyToId
@@ -627,7 +632,8 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
replyToId,
flag,
flag,
source);
source,
sendMenuType);
};
_addAction(tr::lng_polls_create(tr::now), std::move(callback));
}
@@ -812,7 +818,8 @@ void PeerMenuCreatePoll(
MsgId replyToId,
PollData::Flags chosen,
PollData::Flags disabled,
Api::SendType sendType) {
Api::SendType sendType,
SendMenu::Type sendMenuType) {
if (peer->isChannel() && !peer->isMegagroup()) {
chosen &= ~PollData::Flag::PublicVotes;
disabled |= PollData::Flag::PublicVotes;
@@ -821,7 +828,8 @@ void PeerMenuCreatePoll(
controller,
chosen,
disabled,
sendType));
sendType,
sendMenuType));
const auto lock = box->lifetime().make_state<bool>(false);
box->submitRequests(
) | rpl::start_with_next([=](const CreatePollBox::Result &result) {