Refactoring

This commit is contained in:
Ali
2021-07-18 01:03:43 +02:00
parent 0bfe6e52b0
commit d4572a9248
85 changed files with 959 additions and 694 deletions

View File

@@ -72,7 +72,7 @@ public final class VoiceChatJoinScreen: ViewController {
let context = self.context
let peerId = self.peerId
let invite = self.invite
let signal = updatedCurrentPeerGroupCall(account: context.account, peerId: peerId)
let signal = context.engine.calls.updatedCurrentPeerGroupCall(peerId: peerId)
|> castError(GetCurrentGroupCallError.self)
|> mapToSignal { call -> Signal<(Peer, GroupCallSummary)?, GetCurrentGroupCallError> in
if let call = call {
@@ -80,7 +80,7 @@ public final class VoiceChatJoinScreen: ViewController {
return transaction.getPeer(peerId)
}
|> castError(GetCurrentGroupCallError.self)
return combineLatest(peer, getCurrentGroupCall(account: context.account, callId: call.id, accessHash: call.accessHash))
return combineLatest(peer, context.engine.calls.getCurrentGroupCall(callId: call.id, accessHash: call.accessHash))
|> map { peer, call -> (Peer, GroupCallSummary)? in
if let peer = peer, let call = call {
return (peer, call)
@@ -125,7 +125,7 @@ public final class VoiceChatJoinScreen: ViewController {
currentGroupCall = .single(nil)
}
self.disposable.set(combineLatest(queue: Queue.mainQueue(), signal, cachedGroupCallDisplayAsAvailablePeers(account: context.account, peerId: peerId) |> castError(GetCurrentGroupCallError.self), cachedData, currentGroupCall).start(next: { [weak self] peerAndCall, availablePeers, cachedData, currentGroupCallIdAndCanUnmute in
self.disposable.set(combineLatest(queue: Queue.mainQueue(), signal, context.engine.calls.cachedGroupCallDisplayAsAvailablePeers(peerId: peerId) |> castError(GetCurrentGroupCallError.self), cachedData, currentGroupCall).start(next: { [weak self] peerAndCall, availablePeers, cachedData, currentGroupCallIdAndCanUnmute in
if let strongSelf = self {
if let (peer, call) = peerAndCall {
if let (currentGroupCall, currentGroupCallId, canUnmute) = currentGroupCallIdAndCanUnmute, call.info.id == currentGroupCallId {