void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-08 08:04:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed draft volume items from menu in group calls.

Browse source
This commit is contained in:
23rd 2021-01-18 02:53:09 +03:00
parent 50f87cce84
commit 9fed46fb6e
2 changed files with 88 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View file

@ -1910,6 +1910,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_group_call_too_many" = "Sorry, there are too many members in this voice chat. Please try again later."; "lng_group_call_too_many" = "Sorry, there are too many members in this voice chat. Please try again later.";
"lng_group_call_context_mute" = "Mute"; "lng_group_call_context_mute" = "Mute";
"lng_group_call_context_unmute" = "Allow to speak"; "lng_group_call_context_unmute" = "Allow to speak";
"lng_group_call_context_mute_for_me" = "Mute for me";
"lng_group_call_context_unmute_for_me" = "Unmute for me";
"lng_group_call_duration_days#one" = "{count} day"; "lng_group_call_duration_days#one" = "{count} day";
"lng_group_call_duration_days#other" = "{count} days"; "lng_group_call_duration_days#other" = "{count} days";
"lng_group_call_duration_hours#one" = "{count} hour"; "lng_group_call_duration_hours#one" = "{count} hour";

170
Telegram/SourceFiles/calls/calls_group_members.cpp
View file

@ -1157,30 +1157,6 @@ base::unique_qptr<Ui::PopupMenu> MembersController::createRowContextMenu(
} }
return false; return false;
}(); }();
const auto amCallAdmin = _peer->canManageGroupCall();
const auto mute = (admin || !amCallAdmin)
? (muteState == Row::State::Active)
: (muteState != Row::State::Muted);
const auto toggleMute = crl::guard(this, [=] {
_toggleMuteRequests.fire(Group::MuteRequest{
.user = user,
.mute = mute,
});
});
const auto toggleMute_ = crl::guard(this, [=](bool mute, bool local) {
_toggleMuteRequests.fire(Group::MuteRequest{
.user = user,
.mute = mute,
.locallyOnly = local,
});
});
const auto changeVolume = crl::guard(this, [=](int volume, bool local) {
_changeVolumeRequests.fire(Group::VolumeRequest{
.user = user,
.volume = std::clamp(volume, 1, Group::kMaxVolume),
.locallyOnly = local,
});
});
const auto session = &user->session(); const auto session = &user->session();
const auto getCurrentWindow = [=]() -> Window::SessionController* { const auto getCurrentWindow = [=]() -> Window::SessionController* {
@ -1231,77 +1207,103 @@ base::unique_qptr<Ui::PopupMenu> MembersController::createRowContextMenu(
_kickMemberRequests.fire_copy(user); _kickMemberRequests.fire_copy(user);
}); });
if ((muteState != Row::State::Invited)
&& amCallAdmin
&& (!admin || mute)) {
result->addAction(
(mute
? tr::lng_group_call_context_mute(tr::now)
: tr::lng_group_call_context_unmute(tr::now)),
toggleMute);
}
if (real->ssrc() != 0) { if (real->ssrc() != 0) {
if (!amCallAdmin const auto muteString = [=] {
&& ((muteState == Row::State::Active) return (_peer->canManageGroupCall()
|| (real->state() == Row::State::MutedByMe))) { ? tr::lng_group_call_context_mute
result->addAction( : tr::lng_group_call_context_mute_for_me)(tr::now);
((muteState == Row::State::Active) };
? "Mute for me"
: "Unmute for me"), const auto unmuteString = [=] {
toggleMute); return (_peer->canManageGroupCall()
} ? tr::lng_group_call_context_unmute
if (muteState != Row::State::Muted : tr::lng_group_call_context_unmute_for_me)(tr::now);
&& muteState != Row::State::MutedByMe) { };
const auto volume = real->volume();
result->addAction(QString("Increase volume (%1%)").arg(volume / 100.), [=] { const auto toggleMute = crl::guard(this, [=](bool mute, bool local) {
changeVolume(volume + 2000, false); _toggleMuteRequests.fire(Group::MuteRequest{
.user = user,
.mute = mute,
.locallyOnly = local,
}); });
result->addAction(QString("Decrease volume (%1%)").arg(volume / 100.), [=] { });
changeVolume(volume - 2000, false); const auto changeVolume = crl::guard(this, [=](
int volume,
bool local) {
_changeVolumeRequests.fire(Group::VolumeRequest{
.user = user,
.volume = std::clamp(volume, 1, Group::kMaxVolume),
.locallyOnly = local,
}); });
} });
{ const auto call = _call.get();
const auto call = _call.get(); auto otherParticipantStateValue = call
auto otherParticipantStateValue = call ? call->otherParticipantStateValue(
? call->otherParticipantStateValue( ) | rpl::filter([=](const Group::ParticipantState &data) {
) | rpl::filter([=](const Group::ParticipantState &data) { return data.user == user;
return data.user == user; })
}) : rpl::never<Group::ParticipantState>();
: rpl::never<Group::ParticipantState>();
auto volumeItem = base::make_unique_q<MenuVolumeItem>( const auto isMuted = (muteState == Row::State::Muted)
result, || (muteState == Row::State::MutedByMe);
st::groupCallPopupMenu.menu,
otherParticipantStateValue,
real->volume(),
Group::kMaxVolume,
(muteState == Row::State::Muted
|| muteState == Row::State::MutedByMe));
volumeItem->toggleMuteRequests( auto volumeItem = base::make_unique_q<MenuVolumeItem>(
) | rpl::start_with_next([=](bool muted) { result,
toggleMute_(muted, false); st::groupCallPopupMenu.menu,
}, volumeItem->lifetime()); otherParticipantStateValue,
real->volume(),
Group::kMaxVolume,
isMuted);
volumeItem->toggleMuteLocallyRequests( auto mutesFromVolume = volumeItem->toggleMuteRequests();
) | rpl::start_with_next([=](bool muted) {
toggleMute_(muted, true);
}, volumeItem->lifetime());
volumeItem->changeVolumeRequests( volumeItem->toggleMuteRequests(
) | rpl::start_with_next([=](int volume) { ) | rpl::start_with_next([=](bool muted) {
changeVolume(volume, false); toggleMute(muted, false);
}, volumeItem->lifetime()); }, volumeItem->lifetime());
volumeItem->changeVolumeLocallyRequests( volumeItem->toggleMuteLocallyRequests(
) | rpl::start_with_next([=](int volume) { ) | rpl::start_with_next([=](bool muted) {
changeVolume(volume, true); toggleMute(muted, true);
}, volumeItem->lifetime()); }, volumeItem->lifetime());
result->addAction(std::move(volumeItem)); volumeItem->changeVolumeRequests(
} ) | rpl::start_with_next([=](int volume) {
changeVolume(volume, false);
}, volumeItem->lifetime());
volumeItem->changeVolumeLocallyRequests(
) | rpl::start_with_next([=](int volume) {
changeVolume(volume, true);
}, volumeItem->lifetime());
result->addAction(std::move(volumeItem));
const auto muteAction = [&]() -> QAction* {
if (muteState == Row::State::Invited) {
return nullptr;
}
auto callback = [=] {
const auto state = real->state();
const auto muted = (state == Row::State::Muted)
|| (state == Row::State::MutedByMe);
toggleMute(!muted, false);
};
return result->addAction(
isMuted ? unmuteString() : muteString(),
std::move(callback));
}();
std::move(
mutesFromVolume
) | rpl::filter([=] {
return muteAction != nullptr;
}) | rpl::start_with_next([=](bool muted) {
muteAction->setText(muted ? unmuteString() : muteString());
}, result->lifetime());
} }
result->addAction( result->addAction(
tr::lng_context_view_profile(tr::now), tr::lng_context_view_profile(tr::now),
showProfile); showProfile);