ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-17 03:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'df923d4c7ae5abcf5ae5763b1f821ebf3838e1c7'

Browse Source
This commit is contained in:
Ali 2021-05-25 19:11:37 +04:00
commit 644f58c2b1
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/TelegramCore/Sources/GroupCalls.swift
View File

@ -383,9 +383,12 @@ public enum GetGroupCallParticipantsError {
public func getGroupCallParticipants(account: Account, callId: Int64, accessHash: Int64, offset: String, ssrcs: [UInt32], limit: Int32, sortAscending: Bool?) -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> { public func getGroupCallParticipants(account: Account, callId: Int64, accessHash: Int64, offset: String, ssrcs: [UInt32], limit: Int32, sortAscending: Bool?) -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> {
let sortAscendingValue: Signal<(Bool, Int32?, Bool, GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?, Bool), GetGroupCallParticipantsError> let sortAscendingValue: Signal<(Bool, Int32?, Bool, GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?, Bool), GetGroupCallParticipantsError>
if let sortAscending = sortAscending { // if let sortAscending = sortAscending {
sortAscendingValue = .single((sortAscending, nil, false, nil, false)) // sortAscendingValue = .single((sortAscending, nil, false, nil, false))
} else { // } else {
//
// }
sortAscendingValue = getCurrentGroupCall(account: account, callId: callId, accessHash: accessHash) sortAscendingValue = getCurrentGroupCall(account: account, callId: callId, accessHash: accessHash)
|> mapError { _ -> GetGroupCallParticipantsError in |> mapError { _ -> GetGroupCallParticipantsError in
return .generic return .generic
@ -394,8 +397,7 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash
guard let result = result else { guard let result = result else {
return .fail(.generic) return .fail(.generic)
} }
return .single((result.info.sortAscending, result.info.scheduleTimestamp, result.info.subscribedToScheduled, result.info.defaultParticipantsAreMuted, result.info.isVideoEnabled)) return .single((sortAscending ?? result.info.sortAscending, result.info.scheduleTimestamp, result.info.subscribedToScheduled, result.info.defaultParticipantsAreMuted, result.info.isVideoEnabled))
}
} }
return combineLatest( return combineLatest(

1
submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
View File

@ -14,6 +14,7 @@
#ifndef WEBRTC_IOS #ifndef WEBRTC_IOS
#import "platform/darwin/VideoMetalViewMac.h" #import "platform/darwin/VideoMetalViewMac.h"
#import "platform/darwin/GLVideoViewMac.h" #import "platform/darwin/GLVideoViewMac.h"
#import "platform/darwin/VideoSampleBufferViewMac.h"
#define UIViewContentModeScaleAspectFill kCAGravityResizeAspectFill #define UIViewContentModeScaleAspectFill kCAGravityResizeAspectFill
#define UIViewContentModeScaleAspect kCAGravityResizeAspect #define UIViewContentModeScaleAspect kCAGravityResizeAspect