diff --git a/submodules/SyncCore/Sources/Namespaces.swift b/submodules/SyncCore/Sources/Namespaces.swift index a620c1aec3..e332741483 100644 --- a/submodules/SyncCore/Sources/Namespaces.swift +++ b/submodules/SyncCore/Sources/Namespaces.swift @@ -174,16 +174,14 @@ public struct LegacyPeerSummaryCounterTags: OptionSet, Sequence, Hashable { public extension PeerSummaryCounterTags { static let contact = PeerSummaryCounterTags(rawValue: 1 << 3) static let nonContact = PeerSummaryCounterTags(rawValue: 1 << 4) - static let smallGroup = PeerSummaryCounterTags(rawValue: 1 << 5) - static let largeGroup = PeerSummaryCounterTags(rawValue: 1 << 6) + static let group = PeerSummaryCounterTags(rawValue: 1 << 5) static let bot = PeerSummaryCounterTags(rawValue: 1 << 7) static let channel = PeerSummaryCounterTags(rawValue: 1 << 8) static let all: PeerSummaryCounterTags = [ .contact, .nonContact, - .smallGroup, - .largeGroup, + .group, .bot, .channel ] diff --git a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift index bd66de5107..fee9097baa 100644 --- a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift +++ b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift @@ -28,7 +28,7 @@ public let telegramPostboxSeedConfiguration: SeedConfiguration = { return .nonContact } } else if let _ = peer as? TelegramGroup { - return .smallGroup + return .group } else if let _ = peer as? TelegramSecretChat { return .nonContact } else if let channel = peer as? TelegramChannel { @@ -37,9 +37,9 @@ public let telegramPostboxSeedConfiguration: SeedConfiguration = { return .channel case .group: if channel.username != nil { - return .largeGroup + return .group } else { - return .smallGroup + return .group } } } else { diff --git a/submodules/TelegramCore/Sources/JoinChannel.swift b/submodules/TelegramCore/Sources/JoinChannel.swift index 6189c72da2..e230dd947c 100644 --- a/submodules/TelegramCore/Sources/JoinChannel.swift +++ b/submodules/TelegramCore/Sources/JoinChannel.swift @@ -15,9 +15,6 @@ public func joinChannel(account: Account, peerId: PeerId) -> Signal take(1) |> castError(JoinChannelError.self) |> mapToSignal { peer -> Signal in - #if DEBUG - return .fail(.tooMuchJoined) - #endif if let inputChannel = apiInputChannel(peer) { return account.network.request(Api.functions.channels.joinChannel(channel: inputChannel)) |> mapError { error -> JoinChannelError in