mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00
Code Issues Releases Wiki Activity

Replaced args for Calls::Instance::startOrJoinGroupCall with struct.

Browse Source
This commit is contained in:
23rd
2022-02-26 06:53:29 +03:00
parent f2f4f9b24b
commit a3d00b1953
7 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@@ -282,8 +282,7 @@ void SessionNavigation::showPeerByLinkResolved(
const auto join = [=] {
parentController()->startOrJoinGroupCall(
peer,
hash,
SessionController::GroupCallJoinConfirm::Always);
{ hash, Calls::StartGroupCallArgs::JoinConfirm::Always });
};
if (call->loaded()) {
join();
@@ -1124,16 +1123,18 @@ void SessionController::showPeer(not_null<PeerData*> peer, MsgId msgId) {
void SessionController::startOrJoinGroupCall(
not_null<PeerData*> peer,
QString joinHash,
GroupCallJoinConfirm confirm) {
const Calls::StartGroupCallArgs &args) {
using JoinConfirm = Calls::StartGroupCallArgs::JoinConfirm;
auto &calls = Core::App().calls();
const auto askConfirmation = [&](QString text, QString button) {
show(Box<Ui::ConfirmBox>(text, button, crl::guard(this, [=] {
Ui::hideLayer();
startOrJoinGroupCall(peer, joinHash, GroupCallJoinConfirm::None);
startOrJoinGroupCall(
peer,
{ args.joinHash, JoinConfirm::None });
})));
};
if (confirm != GroupCallJoinConfirm::None && calls.inCall()) {
if (args.confirm != JoinConfirm::None && calls.inCall()) {
// Do you want to leave your active voice chat
// to join a voice chat in this group?
askConfirmation(
@@ -1141,13 +1142,13 @@ void SessionController::startOrJoinGroupCall(
? tr::lng_call_leave_to_other_sure_channel
: tr::lng_call_leave_to_other_sure)(tr::now),
tr::lng_call_bar_hangup(tr::now));
} else if (confirm != GroupCallJoinConfirm::None
} else if (args.confirm != JoinConfirm::None
&& calls.inGroupCall()) {
const auto now = calls.currentGroupCall()->peer();
if (now == peer) {
calls.activateCurrentCall(joinHash);
calls.activateCurrentCall(args.joinHash);
} else if (calls.currentGroupCall()->scheduleDate()) {
calls.startOrJoinGroupCall(peer, joinHash);
calls.startOrJoinGroupCall(peer, { args.joinHash });
} else {
askConfirmation(
((peer->isBroadcast() && now->isBroadcast())
@@ -1160,8 +1161,7 @@ void SessionController::startOrJoinGroupCall(
tr::lng_group_call_leave(tr::now));
}
} else {
const auto confirmNeeded = (confirm == GroupCallJoinConfirm::Always);
calls.startOrJoinGroupCall(peer, joinHash, confirmNeeded);
calls.startOrJoinGroupCall(peer, args);
}
}