ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

update api to 125 layer [skip ci]

Browse Source
This commit is contained in:
overtake 2021-03-01 18:16:31 +04:00
parent 796c77b11d
commit a5e886559b
6 changed files with 313 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramCore/Sources/AccountStateManagementUtils.swift
View File

@ -2987,7 +2987,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
})
switch call {
case let .groupCall(flags, _, _, _, _, _):
case let .groupCall(flags, _, _, _, _, _, _, _):
let isMuted = (flags & (1 << 1)) != 0
let canChange = (flags & (1 << 2)) != 0
let defaultParticipantsAreMuted = GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: isMuted, canChange: canChange)

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

@ -9,17 +9,22 @@ public struct GroupCallInfo: Equatable {
public var accessHash: Int64
public var participantCount: Int
public var clientParams: String?
public var streamDcId: Int32?
public var title: String?
public init(
id: Int64,
accessHash: Int64,
participantCount: Int,
clientParams: String?
clientParams: String?,
streamDcId: Int32?,
title: String?
) {
self.id = id
self.accessHash = accessHash
self.participantCount = participantCount
self.clientParams = clientParams
self.title = title
self.streamDcId = streamDcId
}
}
@ -31,7 +36,7 @@ public struct GroupCallSummary: Equatable {
extension GroupCallInfo {
init?(_ call: Api.GroupCall) {
switch call {
case let .groupCall(_, id, accessHash, participantCount, params, _):
case let .groupCall(_, id, accessHash, participantCount, params, title, streamDcId, _):
var clientParams: String?
if let params = params {
switch params {
@ -43,7 +48,9 @@ extension GroupCallInfo {
id: id,
accessHash: accessHash,
participantCount: Int(participantCount),
clientParams: clientParams
clientParams: clientParams,
streamDcId: streamDcId,
title: title
)
case .groupCallDiscarded:
return nil
@ -88,8 +95,18 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int
loop: for participant in participants {
switch participant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, volume):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about):
let peerId: PeerId
switch apiPeerId {
case let .peerUser(userId):
peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .peerChat(chatId):
peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
case let .peerChannel(channelId):
peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
}
let ssrc = UInt32(bitPattern: source)
guard let peer = transaction.getPeer(peerId) else {
continue loop
@ -118,7 +135,8 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int
activityTimestamp: activeDate.flatMap(Double.init),
activityRank: nil,
muteState: muteState,
volume: volume
volume: volume,
about: about
))
}
}
@ -139,17 +157,26 @@ public enum CreateGroupCallError {
case anonymousNotAllowed
}
public func createGroupCall(account: Account, peerId: PeerId) -> Signal<GroupCallInfo, CreateGroupCallError> {
return account.postbox.transaction { transaction -> Api.InputPeer? in
return transaction.getPeer(peerId).flatMap(apiInputPeer)
public func createGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?) -> Signal<GroupCallInfo, CreateGroupCallError> {
return account.postbox.transaction { transaction -> (Api.InputPeer?, Api.InputPeer?) in
let callPeer = transaction.getPeer(peerId).flatMap(apiInputPeer)
if let joinAs = joinAs {
return (callPeer, transaction.getPeer(joinAs).flatMap(apiInputPeer))
} else {
return (callPeer, nil)
}
}
|> castError(CreateGroupCallError.self)
|> mapToSignal { inputPeer -> Signal<GroupCallInfo, CreateGroupCallError> in
|> mapToSignal { (inputPeer, inputJoinAs) -> Signal<GroupCallInfo, CreateGroupCallError> in
guard let inputPeer = inputPeer else {
return .fail(.generic)
}
return account.network.request(Api.functions.phone.createGroupCall(peer: inputPeer, randomId: Int32.random(in: Int32.min ... Int32.max)))
var flags: Int32 = 0
if let _ = inputJoinAs {
flags |= (1 << 0)
}
return account.network.request(Api.functions.phone.createGroupCall(flags: flags, peer: inputPeer, joinAs: inputJoinAs, randomId: Int32.random(in: Int32.min ... Int32.max)))
|> mapError { error -> CreateGroupCallError in
if error.errorDescription == "ANONYMOUS_CALLS_DISABLED" {
return .anonymousNotAllowed
@ -237,8 +264,17 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash
loop: for participant in participants {
switch participant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, volume):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about):
let peerId: PeerId
switch apiPeerId {
case let .peerUser(userId):
peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .peerChat(chatId):
peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
case let .peerChannel(channelId):
peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
}
let ssrc = UInt32(bitPattern: source)
guard let peer = transaction.getPeer(peerId) else {
continue loop
@ -267,7 +303,8 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash
activityTimestamp: activeDate.flatMap(Double.init),
activityRank: nil,
muteState: muteState,
volume: volume
volume: volume,
about: about
))
}
}
@ -300,12 +337,28 @@ public struct JoinGroupCallResult {
public var state: GroupCallParticipantsContext.State
}
public func joinGroupCall(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64, preferMuted: Bool, joinPayload: String) -> Signal<JoinGroupCallResult, JoinGroupCallError> {
public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, callId: Int64, accessHash: Int64, preferMuted: Bool, joinPayload: String) -> Signal<JoinGroupCallResult, JoinGroupCallError> {
return account.postbox.transaction { transaction -> Api.InputPeer? in
if let joinAs = joinAs {
return transaction.getPeer(joinAs).flatMap(apiInputPeer)
} else {
return nil
}
}
|> castError(JoinGroupCallError.self)
|> mapToSignal { inputJoinAs in
var flags: Int32 = 0
if preferMuted {
flags |= (1 << 0)
}
return account.network.request(Api.functions.phone.joinGroupCall(flags: flags, call: .inputGroupCall(id: callId, accessHash: accessHash), params: .dataJSON(data: joinPayload)))
if let _ = inputJoinAs {
flags |= (1 << 1)
}
return account.network.request(Api.functions.phone.joinGroupCall(flags: flags, call: .inputGroupCall(id: callId, accessHash: accessHash), joinAs: inputJoinAs, params: .dataJSON(data: joinPayload)))
|> mapError { error -> JoinGroupCallError in
if error.errorDescription == "GROUPCALL_ANONYMOUS_FORBIDDEN" {
return .anonymousNotAllowed
@ -419,7 +472,7 @@ public func joinGroupCall(account: Account, peerId: PeerId, callId: Int64, acces
maybeParsedCall = GroupCallInfo(call)
switch call {
case let .groupCall(flags, _, _, _, _, _):
case let .groupCall(flags, _, _, _, _, _, _, _):
let isMuted = (flags & (1 << 1)) != 0
let canChange = (flags & (1 << 2)) != 0
state.defaultParticipantsAreMuted = GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: isMuted, canChange: canChange)
@ -480,6 +533,8 @@ public func joinGroupCall(account: Account, peerId: PeerId, callId: Int64, acces
}
}
}
public enum LeaveGroupCallError {
case generic
}
@ -598,7 +653,7 @@ public final class GroupCallParticipantsContext {
public var activityRank: Int?
public var muteState: MuteState?
public var volume: Int32?
public var about: String?
public init(
peer: Peer,
ssrc: UInt32,
@ -607,7 +662,8 @@ public final class GroupCallParticipantsContext {
activityTimestamp: Double?,
activityRank: Int?,
muteState: MuteState?,
volume: Int32?
volume: Int32?,
about: String?
) {
self.peer = peer
self.ssrc = ssrc
@ -617,6 +673,7 @@ public final class GroupCallParticipantsContext {
self.activityRank = activityRank
self.muteState = muteState
self.volume = volume
self.about = about
}
public static func ==(lhs: Participant, rhs: Participant) -> Bool {
@ -641,6 +698,9 @@ public final class GroupCallParticipantsContext {
if lhs.volume != rhs.volume {
return false
}
if lhs.about != rhs.about {
return false
}
return true
}
@ -740,7 +800,7 @@ public final class GroupCallParticipantsContext {
public var muteState: Participant.MuteState?
public var participationStatusChange: ParticipationStatusChange
public var volume: Int32?
public var about: String?
init(
peerId: PeerId,
ssrc: UInt32,
@ -749,7 +809,8 @@ public final class GroupCallParticipantsContext {
activityTimestamp: Double?,
muteState: Participant.MuteState?,
participationStatusChange: ParticipationStatusChange,
volume: Int32?
volume: Int32?,
about: String?
) {
self.peerId = peerId
self.ssrc = ssrc
@ -759,6 +820,7 @@ public final class GroupCallParticipantsContext {
self.muteState = muteState
self.participationStatusChange = participationStatusChange
self.volume = volume
self.about = about
}
}
@ -1213,7 +1275,8 @@ public final class GroupCallParticipantsContext {
activityTimestamp: activityTimestamp,
activityRank: previousActivityRank,
muteState: participantUpdate.muteState,
volume: participantUpdate.volume
volume: participantUpdate.volume,
about: participantUpdate.about
)
updatedParticipants.append(participant)
}
@ -1300,11 +1363,11 @@ public final class GroupCallParticipantsContext {
let id = self.id
let accessHash = self.accessHash
let signal: Signal<Api.Updates?, NoError> = self.account.postbox.transaction { transaction -> Api.InputUser? in
return transaction.getPeer(peerId).flatMap(apiInputUser)
let signal: Signal<Api.Updates?, NoError> = self.account.postbox.transaction { transaction -> Api.InputPeer? in
return transaction.getPeer(peerId).flatMap(apiInputPeer)
}
|> mapToSignal { inputUser -> Signal<Api.Updates?, NoError> in
guard let inputUser = inputUser else {
|> mapToSignal { inputPeer -> Signal<Api.Updates?, NoError> in
guard let inputPeer = inputPeer else {
return .single(nil)
}
var flags: Int32 = 0
@ -1315,7 +1378,7 @@ public final class GroupCallParticipantsContext {
flags |= 1 << 0
}
return account.network.request(Api.functions.phone.editGroupCallMember(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), userId: inputUser, volume: volume))
return account.network.request(Api.functions.phone.editGroupCallParticipant(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), participant: inputPeer, volume: volume))
|> map(Optional.init)
|> `catch` { _ -> Signal<Api.Updates?, NoError> in
return .single(nil)
@ -1407,8 +1470,16 @@ public final class GroupCallParticipantsContext {
extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
init(_ apiParticipant: Api.GroupCallParticipant) {
switch apiParticipant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, volume):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about):
let peerId: PeerId
switch apiPeerId {
case let .peerUser(userId):
peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .peerChat(chatId):
peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
case let .peerChannel(channelId):
peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
}
let ssrc = UInt32(bitPattern: source)
let muted = (flags & (1 << 0)) != 0
let mutedByYou = (flags & (1 << 9)) != 0
@ -1447,7 +1518,8 @@ extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
activityTimestamp: activeDate.flatMap(Double.init),
muteState: muteState,
participationStatusChange: participationStatusChange,
volume: volume
volume: volume,
about: about
)
}
}
@ -1458,8 +1530,16 @@ extension GroupCallParticipantsContext.Update.StateUpdate {
var participantUpdates: [GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate] = []
for participant in participants {
switch participant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, volume):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about):
let peerId: PeerId
switch apiPeerId {
case let .peerUser(userId):
peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
case let .peerChat(chatId):
peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
case let .peerChannel(channelId):
peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
}
let ssrc = UInt32(bitPattern: source)
let muted = (flags & (1 << 0)) != 0
let mutedByYou = (flags & (1 << 9)) != 0
@ -1498,7 +1578,8 @@ extension GroupCallParticipantsContext.Update.StateUpdate {
activityTimestamp: activeDate.flatMap(Double.init),
muteState: muteState,
participationStatusChange: participationStatusChange,
volume: volume
volume: volume,
about: about
))
}
}
@ -1540,6 +1621,20 @@ public func inviteToGroupCall(account: Account, callId: Int64, accessHash: Int64
}
}
public enum EditGroupCallTitleError {
case generic
}
public func editGroupCallTitle(account: Account, callId: Int64, accessHash: Int64, title: String) -> Signal<Never, EditGroupCallTitleError> {
return account.network.request(Api.functions.phone.editGroupCallTitle(call: .inputGroupCall(id: callId, accessHash: accessHash), title: title)) |> mapError { _ -> EditGroupCallTitleError in
return .generic
}
|> mapToSignal { result -> Signal<Never, EditGroupCallTitleError> in
account.stateManager.addUpdates(result)
return .complete()
}
}
public func updatedCurrentPeerGroupCall(account: Account, peerId: PeerId) -> Signal<CachedChannelData.ActiveCall?, NoError> {
return fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)
|> mapToSignal { _ -> Signal<CachedChannelData.ActiveCall?, NoError> in

14
submodules/TelegramCore/Sources/RequestMessageActionCallback.swift
View File

@ -188,14 +188,17 @@ public func requestMessageActionUrlAuth(account: Account, subject: MessageAction
|> castError(MTRpcError.self)
|> mapToSignal { peer -> Signal<Api.UrlAuthResult?, MTRpcError> in
if let inputPeer = apiInputPeer(peer) {
return account.network.request(Api.functions.messages.requestUrlAuth(peer: inputPeer, msgId: messageId.id, buttonId: buttonId))
let flags: Int32 = 1 << 1
return account.network.request(Api.functions.messages.requestUrlAuth(flags: flags, peer: inputPeer, msgId: messageId.id, buttonId: buttonId, url: nil))
|> map(Optional.init)
} else {
return .single(nil)
}
}
case let .url(url):
request = account.network.request(Api.functions.messages.requestUrlAuth(peer: .inputPeerEmpty, msgId: 0, buttonId: 0))
var flags: Int32 = 1 << 1
flags |= (1 << 2)
request = account.network.request(Api.functions.messages.requestUrlAuth(flags: flags, peer: .inputPeerEmpty, msgId: 0, buttonId: 0, url: url))
|> map(Optional.init)
}
@ -232,14 +235,17 @@ public func acceptMessageActionUrlAuth(account: Account, subject: MessageActionU
|> castError(MTRpcError.self)
|> mapToSignal { peer -> Signal<Api.UrlAuthResult?, MTRpcError> in
if let inputPeer = apiInputPeer(peer) {
return account.network.request(Api.functions.messages.acceptUrlAuth(flags: flags, peer: inputPeer, msgId: messageId.id, buttonId: buttonId))
let flags: Int32 = 1 << 1
return account.network.request(Api.functions.messages.acceptUrlAuth(flags: flags, peer: inputPeer, msgId: messageId.id, buttonId: buttonId, url: nil))
|> map(Optional.init)
} else {
return .single(nil)
}
}
case let .url(url):
request = account.network.request(Api.functions.messages.acceptUrlAuth(flags: flags, peer: .inputPeerEmpty, msgId: 0, buttonId: 0))
var flags: Int32 = 1 << 1
flags |= (1 << 2)
request = account.network.request(Api.functions.messages.acceptUrlAuth(flags: flags, peer: .inputPeerEmpty, msgId: 0, buttonId: 0, url: url))
|> map(Optional.init)
}

2
submodules/TelegramCore/Sources/Serialization.swift
View File

@ -210,7 +210,7 @@ public class BoxedMessage: NSObject {
public class Serialization: NSObject, MTSerialization {
public func currentLayer() -> UInt {
return 124
return 125
}
public func parseMessage(_ data: Data!) -> Any! {

26
submodules/TelegramVoip/Sources/GroupCallContext.swift
View File

@ -1,8 +1,8 @@
import Foundation
import SwiftSignalKit
import TgVoipWebrtc
import UniversalMediaPlayer
import AppBundle
//import UniversalMediaPlayer
//import AppBundle
import OpusBinding
private final class ContextQueueImpl: NSObject, OngoingCallThreadLocalContextQueueWebrtc {
@ -62,17 +62,17 @@ private final class DemoBroadcastPacketSource {
var packets: [OngoingGroupCallBroadcastPacket] = []
let fileName = String(format: "%04d", index)
if let path = getAppBundle().path(forResource: fileName, ofType: "ogg") {
let source = SoftwareAudioSource(path: path)
while true {
if let frame = source.readFrame() {
packets.append(OngoingGroupCallBroadcastPacket(numSamples: Int32(frame.count / 2), data: frame))
} else {
break
}
}
}
// let fileName = String(format: "%04d", index)
// if let path = getAppBundle().path(forResource: fileName, ofType: "ogg") {
// let source = SoftwareAudioSource(path: path)
// while true {
// if let frame = source.readFrame() {
// packets.append(OngoingGroupCallBroadcastPacket(numSamples: Int32(frame.count / 2), data: frame))
// } else {
// break
// }
// }
// }
if !packets.isEmpty {
self.enqueuedPackets.append(contentsOf: packets)

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

@ -1402,16 +1402,16 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
if (!_instance) {
return;
}
std::vector<tgcalls::BroadcastPacket> parsedPackets;
for (OngoingGroupCallBroadcastPacket *packet in packets) {
tgcalls::BroadcastPacket parsedPacket;
parsedPacket.numSamples = packet.numSamples;
parsedPacket.data.resize(packet.data.length);
[packet.data getBytes:parsedPacket.data.data() length:packet.data.length];
parsedPackets.push_back(std::move(parsedPacket));
}
((tgcalls::GroupInstanceCustomImpl *)(_instance.get()))->addBroadcastPackets(std::move(parsedPackets));
//
// std::vector<tgcalls::BroadcastPacket> parsedPackets;
// for (OngoingGroupCallBroadcastPacket *packet in packets) {
// tgcalls::BroadcastPacket parsedPacket;
// parsedPacket.numSamples = packet.numSamples;
// parsedPacket.data.resize(packet.data.length);
// [packet.data getBytes:parsedPacket.data.data() length:packet.data.length];
// parsedPackets.push_back(std::move(parsedPacket));
// }
// ((tgcalls::GroupInstanceCustomImpl *)(_instance.get()))->addBroadcastPackets(std::move(parsedPackets));
}
@end