diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index 8cfd6f1f19..4cd5288838 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -19,8 +19,6 @@ CFBundleIconFiles BlackIcon - BlackIconIpad - BlackIconLargeIpad UIPrerenderedIcon @@ -30,8 +28,6 @@ CFBundleIconFiles BlackClassicIcon - BlackClassicIconIpad - BlackClassicIconLargeIpad UIPrerenderedIcon @@ -41,8 +37,6 @@ CFBundleIconFiles BlackFilledIcon - BlackFilledIconIpad - BlackFilledIconLargeIpad UIPrerenderedIcon @@ -52,8 +46,6 @@ CFBundleIconFiles BlueIcon - BlueIconIpad - BlueIconLargeIpad UIPrerenderedIcon @@ -63,8 +55,6 @@ CFBundleIconFiles BlueClassicIcon - BlueClassicIconIpad - BlueClassicIconLargeIpad UIPrerenderedIcon @@ -74,8 +64,6 @@ CFBundleIconFiles BlueFilledIcon - BlueFilledIconIpad - BlueFilledIconLargeIpad UIPrerenderedIcon @@ -98,6 +86,88 @@ + CFBundleIcons~ipad + + CFBundleAlternateIcons + + Black + + CFBundleIconFiles + + BlackIconIpad + BlackIconLargeIpad + + UIPrerenderedIcon + + + BlackClassic + + CFBundleIconFiles + + BlackClassicIconIpad + BlackClassicIconLargeIpad + + UIPrerenderedIcon + + + BlackFilled + + CFBundleIconFiles + + BlackFilledIconIpad + BlackFilledIconLargeIpad + + UIPrerenderedIcon + + + Blue + + CFBundleIconFiles + + BlueIconIpad + BlueIconLargeIpad + + UIPrerenderedIcon + + + BlueClassic + + CFBundleIconFiles + + BlueClassicIconIpad + BlueClassicIconLargeIpad + + UIPrerenderedIcon + + + BlueFilled + + CFBundleIconFiles + + BlueFilledIconIpad + BlueFilledIconLargeIpad + + UIPrerenderedIcon + + + WhiteFilled + + CFBundleIconFiles + + WhiteFilledIcon + + UIPrerenderedIcon + + + + CFBundlePrimaryIcon + + CFBundleIconName + AppIconLLC + UIPrerenderedIcon + + + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index bf8021171c..84a850b335 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4361,8 +4361,9 @@ Any member of this group will be able to see messages in the channel."; "Conversation.AddToContacts" = "Add to Contacts"; "Conversation.AddNameToContacts" = "Add %@ to Contacts"; -"AddContact.ContactWillBeSharedNow" = "When you tap **Done**, your phone number will become visible to %@."; -"AddContact.ContactWillBeSharedAfterMutual" = "Phone number will be visible once %1$@ adds you as a contact. Your phone number will become visible to %1$@."; +"AddContact.ContactWillBeSharedAfterMutual" = "Phone number will be visible once %1$@ adds you as a contact."; +"AddContact.SharedContactException" = "Share My Phone Number"; +"AddContact.SharedContactExceptionInfo" = "You can make your phone visible to %@."; "AddContact.StatusSuccess" = "%@ is now in your contacts list."; "Conversation.ShareMyPhoneNumber.StatusSuccess" = "%@ can now see your phone number."; @@ -4409,3 +4410,27 @@ Any member of this group will be able to see messages in the channel."; "ContactInfo.PhoneNumberHidden" = "Hidden"; "Common.ActionNotAllowedError" = "Sorry, you are not allowed to do this."; + +"Group.Location.Title" = "Location (Optional)"; +"Group.Location.SetLocation" = "Set Location"; +"Group.Location.ChangeLocation" = "Change Location"; +"Group.Location.RemoveLocation" = "Remove Location"; +"Group.Location.Info" = "People will be able to find your group using People Nearby section"; + +"Channel.AdminLog.MessageTransferedName" = "transferred ownership to %1$@"; +"Channel.AdminLog.MessageTransferedNameUsername" = "transferred ownership to %1$@ (%2$@)"; + +"Channel.AdminLog.MessageChangedGroupGeoLocation" = "changed group location to \"%@\""; +"Channel.AdminLog.MessageRemovedGroupGeoLocation" = "%@ removed group location"; + +"Map.SetThisLocation" = "Set This Location"; + +"Permissions.PeopleNearbyTitle.v0" = "People Nearby"; +"Permissions.PeopleNearbyText.v0" = "Use this section to quickly add people near you and discover nearby group chats.\n\nPlease allow location access\nto start using this feature."; +"Permissions.PeopleNearbyAllow.v0" = "Allow Access"; +"Permissions.PeopleNearbyAllowInSettings.v0" = "Allow in Settings"; + +"Conversation.ReportGroupLocation" = "Group unrelated to tocation?"; +"ReportGroupLocation.Title" = "Report Unrelated Group"; +"ReportGroupLocation.Text" = "Please tell us if this group is not related to this location."; +"ReportGroupLocation.Report" = "Report"; diff --git a/submodules/DeviceAccess/Sources/DeviceAccess.swift b/submodules/DeviceAccess/Sources/DeviceAccess.swift index c6e4ee45bd..b93e023d00 100644 --- a/submodules/DeviceAccess/Sources/DeviceAccess.swift +++ b/submodules/DeviceAccess/Sources/DeviceAccess.swift @@ -78,6 +78,11 @@ public final class DeviceAccess { return self.siriPromise.get() } + private static let locationPromise = Promise(nil) + static var location: Signal { + return self.locationPromise.get() + } + public static func isMicrophoneAccessAuthorized() -> Bool? { return AVAudioSession.sharedInstance().recordPermission == .granted } @@ -173,12 +178,12 @@ public final class DeviceAccess { if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { func statusForCellularState(_ state: CTCellularDataRestrictedState) -> AccessType? { switch state { - case .restricted: - return .denied - case .notRestricted: - return .allowed - default: - return nil + case .restricted: + return .denied + case .notRestricted: + return .allowed + default: + return nil } } let cellState = CTCellularData.init() @@ -215,6 +220,29 @@ public final class DeviceAccess { } else { return .single(.denied) } + case .location: + return Signal { subscriber in + let status = CLLocationManager.authorizationStatus() + switch status { + case .authorizedAlways, .authorizedWhenInUse: + subscriber.putNext(.allowed) + case .denied, .restricted: + subscriber.putNext(.denied) + case .notDetermined: + subscriber.putNext(.notDetermined) + } + subscriber.putCompletion() + return EmptyDisposable + } + |> then(self.location + |> mapToSignal { authorized -> Signal in + if let authorized = authorized { + return .single(authorized ? .allowed : .denied) + } else { + return .complete() + } + } + ) default: return .single(.notDetermined) } diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.h b/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.h index 7280b79f4f..930f9352ac 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.h +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.h @@ -12,6 +12,7 @@ - (void)configureForCurrentLocationWithAccuracy:(CLLocationAccuracy)accuracy; - (void)configureForCustomLocationWithAddress:(NSString *)address; +- (void)configureForGroupLocationWithAddress:(NSString *)address; - (void)configureForLiveLocationWithAccuracy:(CLLocationAccuracy)accuracy; - (void)configureForStopWithMessage:(TGMessage *)message remaining:(SSignal *)remaining; diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.m b/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.m index 2b1c9b5c58..39541e7d75 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.m @@ -341,6 +341,48 @@ const CGFloat TGLocationCurrentLocationCellHeight = 68; [self setNeedsLayout]; } +- (void)configureForGroupLocationWithAddress:(NSString *)address +{ + _messageId = 0; + + UIImage *icon = TGComponentsImageNamed(@"LocationMessagePinIcon"); + if (_pallete != nil) + icon = TGTintedImage(icon, _pallete.iconColor); + _iconView.image = icon; + _titleLabel.textColor = self.pallete != nil ? self.pallete.accentColor : TGAccentColor(); + _elapsedView.hidden = true; + + if (_isCurrentLocation) + { + [UIView transitionWithView:self duration:0.2f options:UIViewAnimationOptionTransitionCrossDissolve animations:^ + { + _titleLabel.text = TGLocalized(@"Map.SetThisLocation"); + _subtitleLabel.text = [self _subtitleForAddress:address]; + + _circleView.alpha = 1.0f; + _titleLabel.alpha = 1.0f; + _subtitleLabel.alpha = 1.0f; + } completion:nil]; + + _isCurrentLocation = false; + } + else + { + [UIView transitionWithView:self duration:0.2f options:UIViewAnimationOptionTransitionCrossDissolve animations:^ + { + _subtitleLabel.text = [self _subtitleForAddress:address]; + } completion:nil]; + } + + [self setCircleColor:_pallete != nil ? _pallete.locationColor : UIColorRGB(0x008df2)]; + + _separatorView.hidden = true; + [_wavesView stop]; + _wavesView.hidden = true; + + [self setNeedsLayout]; +} + - (NSString *)_subtitleForAddress:(NSString *)address { if (address != nil && address.length == 0) diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m b/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m index 5dcb1fbb89..fdc5c42d5a 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m @@ -373,7 +373,7 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; _pinMovedFromUserLocation = false; [self hidePickerAnnotationAnimated:true]; - [_pickerPinView setPinRaised:true animated:true completion:nil]; + [_pickerPinView setPinRaised:true avatar:_intent == TGLocationPickerControllerCustomLocationIntent animated:true completion:nil]; MKCoordinateSpan span = _fullScreenMapSpan != nil ? _fullScreenMapSpan.MKCoordinateSpanValue : TGLocationDefaultSpan; [self setMapCenterCoordinate:_mapView.userLocation.location.coordinate span:span offset:TGLocationPickerPinOffset animated:true]; @@ -399,7 +399,7 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; [self switchToFullscreen]; } - [_pickerPinView setPinRaised:true animated:true completion:nil]; + [_pickerPinView setPinRaised:true avatar:_intent == TGLocationPickerControllerCustomLocationIntent animated:true completion:nil]; _pinMovedFromUserLocation = true; _updatePinAnnotation = false; @@ -435,7 +435,7 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; - (void)pinPinView { __weak TGLocationPickerController *weakSelf = self; - [_pickerPinView setPinRaised:false animated:true completion:^ + [_pickerPinView setPinRaised:false avatar:_intent == TGLocationPickerControllerCustomLocationIntent animated:true completion:^ { __strong TGLocationPickerController *strongSelf = weakSelf; if (strongSelf == nil) @@ -662,7 +662,9 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; _ownLocationView.hidden = true; _pickerPinWrapper.hidden = false; - [_pickerPinView setCustomPin:true animated:true]; + if (_intent != TGLocationPickerControllerCustomLocationIntent) { + [_pickerPinView setCustomPin:true animated:true]; + } _mapView.tapEnabled = false; _mapView.longPressAsTapEnabled = false; @@ -767,6 +769,9 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; - (UIBarButtonItem *)controllerRightBarButtonItem { + if (_intent == TGLocationPickerControllerCustomLocationIntent) { + return nil; + } if (iosMajorVersion() < 7) { TGModernBarButton *searchButton = [[TGModernBarButton alloc] initWithImage:TGComponentsImageNamed(@"NavigationSearchIcon.png")]; @@ -944,7 +949,9 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; if (_currentUserLocation != nil) [self fetchNearbyVenuesWithLocation:_currentUserLocation]; } - [cell configureWithTitle:TGLocalized(@"Map.ChooseAPlace")]; + if (_intent != TGLocationPickerControllerCustomLocationIntent) { + [cell configureWithTitle:TGLocalized(@"Map.ChooseAPlace")]; + } if (scrollView.contentOffset.y > -scrollView.contentInset.top + TGLocationSectionHeaderHeight) { @@ -975,7 +982,9 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; else { _activityIndicator.alpha = 0.0f; - [cell configureWithTitle:TGLocalized(@"Map.PullUpForPlaces")]; + if (_intent != TGLocationPickerControllerCustomLocationIntent) { + [cell configureWithTitle:TGLocalized(@"Map.PullUpForPlaces")]; + } if (_safeAreaCurtainView != nil) { @@ -1004,10 +1013,14 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; { TGLocationCurrentLocationCell *locationCell = (TGLocationCurrentLocationCell *)cell; - if (_mapInFullScreenMode) - [locationCell configureForCustomLocationWithAddress:_customAddress]; - else - [locationCell configureForCurrentLocationWithAccuracy:_currentUserLocation.horizontalAccuracy]; + if (_intent == TGLocationPickerControllerCustomLocationIntent) { + [locationCell configureForGroupLocationWithAddress:_customAddress]; + } else { + if (_mapInFullScreenMode) + [locationCell configureForCustomLocationWithAddress:_customAddress]; + else + [locationCell configureForCurrentLocationWithAccuracy:_currentUserLocation.horizontalAccuracy]; + } } cell = [_tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]]; @@ -1096,7 +1109,9 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; } else if ((_allowLiveLocationSharing && indexPath.row == 2) || (!_allowLiveLocationSharing && indexPath.row == 1)) { - [self _presentVenuesList]; + if (_intent != TGLocationPickerControllerCustomLocationIntent) { + [self _presentVenuesList]; + } } } else @@ -1151,10 +1166,14 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; locationCell.pallete = self.pallete; locationCell.edgeView = _edgeHighlightView; - if (_mapInFullScreenMode) - [locationCell configureForCustomLocationWithAddress:_customAddress]; - else - [locationCell configureForCurrentLocationWithAccuracy:_currentUserLocation.horizontalAccuracy]; + if (_intent == TGLocationPickerControllerCustomLocationIntent) { + [locationCell configureForGroupLocationWithAddress:_customAddress]; + } else { + if (_mapInFullScreenMode) + [locationCell configureForCustomLocationWithAddress:_customAddress]; + else + [locationCell configureForCurrentLocationWithAccuracy:_currentUserLocation.horizontalAccuracy]; + } cell = locationCell; } @@ -1180,10 +1199,12 @@ const CGPoint TGLocationPickerPinOffset = { 0.0f, 33.0f }; sectionCell = [[TGLocationSectionHeaderCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:TGLocationSectionHeaderKind]; sectionCell.pallete = self.pallete; - if (tableView.contentOffset.y > -tableView.contentInset.top) - [sectionCell configureWithTitle:TGLocalized(@"Map.ChooseAPlace")]; - else - [sectionCell configureWithTitle:TGLocalized(@"Map.PullUpForPlaces")]; + if (_intent != TGLocationPickerControllerCustomLocationIntent) { + if (tableView.contentOffset.y > -tableView.contentInset.top) + [sectionCell configureWithTitle:TGLocalized(@"Map.ChooseAPlace")]; + else + [sectionCell configureWithTitle:TGLocalized(@"Map.PullUpForPlaces")]; + } cell = sectionCell; } diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.h b/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.h index a43aa71896..9332f8d00e 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.h +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.h @@ -7,7 +7,7 @@ - (instancetype)initWithAnnotation:(id)annotation; @property (nonatomic, assign, getter=isPinRaised) bool pinRaised; -- (void)setPinRaised:(bool)raised animated:(bool)animated completion:(void (^)(void))completion; +- (void)setPinRaised:(bool)raised avatar:(bool)avatar animated:(bool)animated completion:(void (^)(void))completion; - (void)setCustomPin:(bool)customPin animated:(bool)animated; diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m b/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m index 3bd7548fb6..bd7adacbe8 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m @@ -429,10 +429,10 @@ NSString *const TGLocationPinAnnotationKind = @"TGLocationPinAnnotation"; - (void)setPinRaised:(bool)raised { - [self setPinRaised:raised animated:false completion:nil]; + [self setPinRaised:raised avatar:false animated:false completion:nil]; } -- (void)setPinRaised:(bool)raised animated:(bool)animated completion:(void (^)(void))completion +- (void)setPinRaised:(bool)raised avatar:(bool)avatar animated:(bool)animated completion:(void (^)(void))completion { _pinRaised = raised; @@ -447,6 +447,8 @@ NSString *const TGLocationPinAnnotationKind = @"TGLocationPinAnnotation"; [UIView animateWithDuration:0.2 delay:0.0 options:7 << 16 | UIViewAnimationOptionAllowAnimatedContent animations:^ { _shadowView.center = CGPointMake(TGScreenPixel, -66.0f); + if (avatar) + _avatarView.center = CGPointMake(TGScreenPixel, -71.0f); } completion:^(BOOL finished) { if (finished && completion != nil) completion(); @@ -457,6 +459,8 @@ NSString *const TGLocationPinAnnotationKind = @"TGLocationPinAnnotation"; [UIView animateWithDuration:0.2 delay:0.0 usingSpringWithDamping:0.6 initialSpringVelocity:0.0 options:UIViewAnimationOptionAllowAnimatedContent animations:^ { _shadowView.center = CGPointMake(TGScreenPixel, -36.0f); + if (avatar) + _avatarView.center = CGPointMake(TGScreenPixel, -41.0f); } completion:^(BOOL finished) { if (finished && completion != nil) @@ -467,6 +471,8 @@ NSString *const TGLocationPinAnnotationKind = @"TGLocationPinAnnotation"; else { _shadowView.center = CGPointMake(TGScreenPixel, raised ? -66.0f : -36.0f); + if (avatar) + _avatarView.center = CGPointMake(TGScreenPixel, raised ? -71.0 : -41.0f); if (completion != nil) completion(); diff --git a/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift b/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift index d6e9890cf8..f346292343 100644 --- a/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift +++ b/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift @@ -1291,10 +1291,10 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo updatedState.updatePeerChatInclusion(peerId: peer.peerId, groupId: PeerGroupId(rawValue: folderId), changedGroup: true) } } - case let .updateContactLocated(contacts): + case let .updatePeerLocated(peers): var peersNearby: [PeerNearby] = [] - for case let .contactLocated(userId, expires, distance) in contacts { - peersNearby.append(PeerNearby(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), expires: expires, distance: distance)) + for case let .peerLocated(peer, expires, distance) in peers { + peersNearby.append(PeerNearby(id: peer.peerId, expires: expires, distance: distance)) } updatedState.updatePeersNearby(peersNearby) default: diff --git a/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift b/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift index b1153c0a04..16cae6c844 100644 --- a/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift +++ b/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift @@ -202,7 +202,7 @@ private func wrappedHistoryViewAdditionalData(chatLocation: ChatLocation, additi private final class PeerCachedDataContext { var viewIds = Set() var timestamp: Double? - var referenceData: CachedPeerData? + var hasCachedData: Bool = false let disposable = MetaDisposable() deinit { @@ -780,22 +780,22 @@ public final class AccountViewTracker { } } - private func updateCachedPeerData(peerId: PeerId, viewId: Int32, referenceData: CachedPeerData?) { + private func updateCachedPeerData(peerId: PeerId, viewId: Int32, hasCachedData: Bool) { self.queue.async { let context: PeerCachedDataContext var dataUpdated = false if let existingContext = self.cachedDataContexts[peerId] { context = existingContext - context.referenceData = referenceData + context.hasCachedData = hasCachedData if context.timestamp == nil || abs(CFAbsoluteTimeGetCurrent() - context.timestamp!) > 60.0 * 5 { context.timestamp = CFAbsoluteTimeGetCurrent() dataUpdated = true } } else { context = PeerCachedDataContext() - context.referenceData = referenceData + context.hasCachedData = hasCachedData self.cachedDataContexts[peerId] = context - if context.referenceData == nil || context.timestamp == nil || abs(CFAbsoluteTimeGetCurrent() - context.timestamp!) > 60.0 * 5 { + if !context.hasCachedData || context.timestamp == nil || abs(CFAbsoluteTimeGetCurrent() - context.timestamp!) > 60.0 * 5 { context.timestamp = CFAbsoluteTimeGetCurrent() dataUpdated = true } @@ -816,7 +816,7 @@ public final class AccountViewTracker { context.viewIds.remove(id) if context.viewIds.isEmpty { context.disposable.set(nil) - context.referenceData = nil + context.hasCachedData = false } } } @@ -968,7 +968,7 @@ public final class AccountViewTracker { } }, next: { [weak self] next, viewId in if let strongSelf = self { - strongSelf.updateCachedPeerData(peerId: peerId, viewId: viewId, referenceData: next.cachedData) + strongSelf.updateCachedPeerData(peerId: peerId, viewId: viewId, hasCachedData: next.cachedData != nil) } }, disposed: { [weak self] viewId in if let strongSelf = self { diff --git a/submodules/TelegramCore/TelegramCore/Api0.swift b/submodules/TelegramCore/TelegramCore/Api0.swift index 2ad93261ee..c7bc885f34 100644 --- a/submodules/TelegramCore/TelegramCore/Api0.swift +++ b/submodules/TelegramCore/TelegramCore/Api0.swift @@ -10,7 +10,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-206066487] = { return Api.InputGeoPoint.parse_inputGeoPoint($0) } dict[-784000893] = { return Api.payments.ValidatedRequestedInfo.parse_validatedRequestedInfo($0) } dict[461151667] = { return Api.ChatFull.parse_chatFull($0) } - dict[-1736252138] = { return Api.ChatFull.parse_channelFull($0) } + dict[277964371] = { return Api.ChatFull.parse_channelFull($0) } dict[1465219162] = { return Api.PollResults.parse_pollResults($0) } dict[-925415106] = { return Api.ChatParticipant.parse_chatParticipant($0) } dict[-636267638] = { return Api.ChatParticipant.parse_chatParticipantCreator($0) } @@ -172,7 +172,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[469489699] = { return Api.Update.parse_updateUserStatus($0) } dict[-1489818765] = { return Api.Update.parse_updateUserName($0) } dict[-1791935732] = { return Api.Update.parse_updateUserPhoto($0) } - dict[-1657903163] = { return Api.Update.parse_updateContactLink($0) } dict[314359194] = { return Api.Update.parse_updateNewEncryptedMessage($0) } dict[386986326] = { return Api.Update.parse_updateEncryptedChatTyping($0) } dict[-1264392051] = { return Api.Update.parse_updateEncryption($0) } @@ -234,7 +233,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[856380452] = { return Api.Update.parse_updateReadChannelInbox($0) } dict[-1667805217] = { return Api.Update.parse_updateReadHistoryInbox($0) } dict[1786671974] = { return Api.Update.parse_updatePeerSettings($0) } - dict[1602468195] = { return Api.Update.parse_updateContactLocated($0) } + dict[-1263546448] = { return Api.Update.parse_updatePeerLocated($0) } dict[1558266229] = { return Api.PopularContact.parse_popularContact($0) } dict[-373643672] = { return Api.FolderPeer.parse_folderPeer($0) } dict[367766557] = { return Api.ChannelParticipant.parse_channelParticipant($0) } @@ -247,7 +246,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-55902537] = { return Api.InputDialogPeer.parse_inputDialogPeer($0) } dict[1684014375] = { return Api.InputDialogPeer.parse_inputDialogPeerFolder($0) } dict[-994444869] = { return Api.Error.parse_error($0) } - dict[-1150339286] = { return Api.ContactLocated.parse_contactLocated($0) } dict[-1560655744] = { return Api.KeyboardButton.parse_keyboardButton($0) } dict[629866245] = { return Api.KeyboardButton.parse_keyboardButtonUrl($0) } dict[1748655686] = { return Api.KeyboardButton.parse_keyboardButtonCallback($0) } @@ -384,6 +382,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1895328189] = { return Api.ChannelAdminLogEventAction.parse_channelAdminLogEventActionStopPoll($0) } dict[1129042607] = { return Api.ChannelAdminLogEventAction.parse_channelAdminLogEventActionChangePhoto($0) } dict[-1569748965] = { return Api.ChannelAdminLogEventAction.parse_channelAdminLogEventActionChangeLinkedChat($0) } + dict[241923758] = { return Api.ChannelAdminLogEventAction.parse_channelAdminLogEventActionChangeLocation($0) } dict[-526508104] = { return Api.help.ProxyData.parse_proxyDataEmpty($0) } dict[737668643] = { return Api.help.ProxyData.parse_proxyDataPromo($0) } dict[-543777747] = { return Api.auth.ExportedAuthorization.parse_exportedAuthorization($0) } @@ -456,6 +455,8 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[871426631] = { return Api.SecureCredentialsEncrypted.parse_secureCredentialsEncrypted($0) } dict[157948117] = { return Api.upload.File.parse_file($0) } dict[-242427324] = { return Api.upload.File.parse_fileCdnRedirect($0) } + dict[-1078612597] = { return Api.ChannelLocation.parse_channelLocationEmpty($0) } + dict[547062491] = { return Api.ChannelLocation.parse_channelLocation($0) } dict[182649427] = { return Api.MessageRange.parse_messageRange($0) } dict[946083368] = { return Api.messages.StickerSetInstallResult.parse_stickerSetInstallResultSuccess($0) } dict[904138920] = { return Api.messages.StickerSetInstallResult.parse_stickerSetInstallResultArchive($0) } @@ -702,9 +703,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[1674235686] = { return Api.account.AutoDownloadSettings.parse_autoDownloadSettings($0) } dict[-445792507] = { return Api.DialogPeer.parse_dialogPeer($0) } dict[1363483106] = { return Api.DialogPeer.parse_dialogPeerFolder($0) } - dict[1599050311] = { return Api.ContactLink.parse_contactLinkUnknown($0) } - dict[-17968211] = { return Api.ContactLink.parse_contactLinkNone($0) } - dict[-721239344] = { return Api.ContactLink.parse_contactLinkContact($0) } dict[-104284986] = { return Api.WebDocument.parse_webDocumentNoProxy($0) } dict[475467473] = { return Api.WebDocument.parse_webDocument($0) } dict[-1290580579] = { return Api.contacts.Found.parse_found($0) } @@ -757,6 +755,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-931638658] = { return Api.EncryptedChat.parse_encryptedChatRequested($0) } dict[-94974410] = { return Api.EncryptedChat.parse_encryptedChat($0) } dict[332848423] = { return Api.EncryptedChat.parse_encryptedChatDiscarded($0) } + dict[-901375139] = { return Api.PeerLocated.parse_peerLocated($0) } dict[922273905] = { return Api.Document.parse_documentEmpty($0) } dict[-1683841855] = { return Api.Document.parse_document($0) } dict[-1707344487] = { return Api.messages.HighScores.parse_highScores($0) } @@ -929,8 +928,6 @@ struct Api { _1.serialize(buffer, boxed) case let _1 as Api.Error: _1.serialize(buffer, boxed) - case let _1 as Api.ContactLocated: - _1.serialize(buffer, boxed) case let _1 as Api.KeyboardButton: _1.serialize(buffer, boxed) case let _1 as Api.ContactStatus: @@ -1095,6 +1092,8 @@ struct Api { _1.serialize(buffer, boxed) case let _1 as Api.upload.File: _1.serialize(buffer, boxed) + case let _1 as Api.ChannelLocation: + _1.serialize(buffer, boxed) case let _1 as Api.MessageRange: _1.serialize(buffer, boxed) case let _1 as Api.messages.StickerSetInstallResult: @@ -1285,8 +1284,6 @@ struct Api { _1.serialize(buffer, boxed) case let _1 as Api.DialogPeer: _1.serialize(buffer, boxed) - case let _1 as Api.ContactLink: - _1.serialize(buffer, boxed) case let _1 as Api.WebDocument: _1.serialize(buffer, boxed) case let _1 as Api.contacts.Found: @@ -1325,6 +1322,8 @@ struct Api { _1.serialize(buffer, boxed) case let _1 as Api.EncryptedChat: _1.serialize(buffer, boxed) + case let _1 as Api.PeerLocated: + _1.serialize(buffer, boxed) case let _1 as Api.Document: _1.serialize(buffer, boxed) case let _1 as Api.messages.HighScores: diff --git a/submodules/TelegramCore/TelegramCore/Api1.swift b/submodules/TelegramCore/TelegramCore/Api1.swift index 98bc5ae237..e6cd2eef09 100644 --- a/submodules/TelegramCore/TelegramCore/Api1.swift +++ b/submodules/TelegramCore/TelegramCore/Api1.swift @@ -51,7 +51,7 @@ extension Api { } enum ChatFull: TypeConstructorDescription { case chatFull(flags: Int32, id: Int32, about: String, participants: Api.ChatParticipants, chatPhoto: Api.Photo?, notifySettings: Api.PeerNotifySettings, exportedInvite: Api.ExportedChatInvite, botInfo: [Api.BotInfo]?, pinnedMsgId: Int32?, folderId: Int32?) - case channelFull(flags: Int32, id: Int32, about: String, participantsCount: Int32?, adminsCount: Int32?, kickedCount: Int32?, bannedCount: Int32?, onlineCount: Int32?, readInboxMaxId: Int32, readOutboxMaxId: Int32, unreadCount: Int32, chatPhoto: Api.Photo, notifySettings: Api.PeerNotifySettings, exportedInvite: Api.ExportedChatInvite, botInfo: [Api.BotInfo], migratedFromChatId: Int32?, migratedFromMaxId: Int32?, pinnedMsgId: Int32?, stickerset: Api.StickerSet?, availableMinId: Int32?, folderId: Int32?, linkedChatId: Int32?, pts: Int32) + case channelFull(flags: Int32, id: Int32, about: String, participantsCount: Int32?, adminsCount: Int32?, kickedCount: Int32?, bannedCount: Int32?, onlineCount: Int32?, readInboxMaxId: Int32, readOutboxMaxId: Int32, unreadCount: Int32, chatPhoto: Api.Photo, notifySettings: Api.PeerNotifySettings, exportedInvite: Api.ExportedChatInvite, botInfo: [Api.BotInfo], migratedFromChatId: Int32?, migratedFromMaxId: Int32?, pinnedMsgId: Int32?, stickerset: Api.StickerSet?, availableMinId: Int32?, folderId: Int32?, linkedChatId: Int32?, location: Api.ChannelLocation?, pts: Int32) func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -74,9 +74,9 @@ extension Api { if Int(flags) & Int(1 << 6) != 0 {serializeInt32(pinnedMsgId!, buffer: buffer, boxed: false)} if Int(flags) & Int(1 << 11) != 0 {serializeInt32(folderId!, buffer: buffer, boxed: false)} break - case .channelFull(let flags, let id, let about, let participantsCount, let adminsCount, let kickedCount, let bannedCount, let onlineCount, let readInboxMaxId, let readOutboxMaxId, let unreadCount, let chatPhoto, let notifySettings, let exportedInvite, let botInfo, let migratedFromChatId, let migratedFromMaxId, let pinnedMsgId, let stickerset, let availableMinId, let folderId, let linkedChatId, let pts): + case .channelFull(let flags, let id, let about, let participantsCount, let adminsCount, let kickedCount, let bannedCount, let onlineCount, let readInboxMaxId, let readOutboxMaxId, let unreadCount, let chatPhoto, let notifySettings, let exportedInvite, let botInfo, let migratedFromChatId, let migratedFromMaxId, let pinnedMsgId, let stickerset, let availableMinId, let folderId, let linkedChatId, let location, let pts): if boxed { - buffer.appendInt32(-1736252138) + buffer.appendInt32(277964371) } serializeInt32(flags, buffer: buffer, boxed: false) serializeInt32(id, buffer: buffer, boxed: false) @@ -103,7 +103,8 @@ extension Api { if Int(flags) & Int(1 << 8) != 0 {stickerset!.serialize(buffer, true)} if Int(flags) & Int(1 << 9) != 0 {serializeInt32(availableMinId!, buffer: buffer, boxed: false)} if Int(flags) & Int(1 << 11) != 0 {serializeInt32(folderId!, buffer: buffer, boxed: false)} - if Int(flags) & Int(1 << 13) != 0 {serializeInt32(linkedChatId!, buffer: buffer, boxed: false)} + if Int(flags) & Int(1 << 14) != 0 {serializeInt32(linkedChatId!, buffer: buffer, boxed: false)} + if Int(flags) & Int(1 << 15) != 0 {location!.serialize(buffer, true)} serializeInt32(pts, buffer: buffer, boxed: false) break } @@ -113,8 +114,8 @@ extension Api { switch self { case .chatFull(let flags, let id, let about, let participants, let chatPhoto, let notifySettings, let exportedInvite, let botInfo, let pinnedMsgId, let folderId): return ("chatFull", [("flags", flags), ("id", id), ("about", about), ("participants", participants), ("chatPhoto", chatPhoto), ("notifySettings", notifySettings), ("exportedInvite", exportedInvite), ("botInfo", botInfo), ("pinnedMsgId", pinnedMsgId), ("folderId", folderId)]) - case .channelFull(let flags, let id, let about, let participantsCount, let adminsCount, let kickedCount, let bannedCount, let onlineCount, let readInboxMaxId, let readOutboxMaxId, let unreadCount, let chatPhoto, let notifySettings, let exportedInvite, let botInfo, let migratedFromChatId, let migratedFromMaxId, let pinnedMsgId, let stickerset, let availableMinId, let folderId, let linkedChatId, let pts): - return ("channelFull", [("flags", flags), ("id", id), ("about", about), ("participantsCount", participantsCount), ("adminsCount", adminsCount), ("kickedCount", kickedCount), ("bannedCount", bannedCount), ("onlineCount", onlineCount), ("readInboxMaxId", readInboxMaxId), ("readOutboxMaxId", readOutboxMaxId), ("unreadCount", unreadCount), ("chatPhoto", chatPhoto), ("notifySettings", notifySettings), ("exportedInvite", exportedInvite), ("botInfo", botInfo), ("migratedFromChatId", migratedFromChatId), ("migratedFromMaxId", migratedFromMaxId), ("pinnedMsgId", pinnedMsgId), ("stickerset", stickerset), ("availableMinId", availableMinId), ("folderId", folderId), ("linkedChatId", linkedChatId), ("pts", pts)]) + case .channelFull(let flags, let id, let about, let participantsCount, let adminsCount, let kickedCount, let bannedCount, let onlineCount, let readInboxMaxId, let readOutboxMaxId, let unreadCount, let chatPhoto, let notifySettings, let exportedInvite, let botInfo, let migratedFromChatId, let migratedFromMaxId, let pinnedMsgId, let stickerset, let availableMinId, let folderId, let linkedChatId, let location, let pts): + return ("channelFull", [("flags", flags), ("id", id), ("about", about), ("participantsCount", participantsCount), ("adminsCount", adminsCount), ("kickedCount", kickedCount), ("bannedCount", bannedCount), ("onlineCount", onlineCount), ("readInboxMaxId", readInboxMaxId), ("readOutboxMaxId", readOutboxMaxId), ("unreadCount", unreadCount), ("chatPhoto", chatPhoto), ("notifySettings", notifySettings), ("exportedInvite", exportedInvite), ("botInfo", botInfo), ("migratedFromChatId", migratedFromChatId), ("migratedFromMaxId", migratedFromMaxId), ("pinnedMsgId", pinnedMsgId), ("stickerset", stickerset), ("availableMinId", availableMinId), ("folderId", folderId), ("linkedChatId", linkedChatId), ("location", location), ("pts", pts)]) } } @@ -220,9 +221,13 @@ extension Api { var _21: Int32? if Int(_1!) & Int(1 << 11) != 0 {_21 = reader.readInt32() } var _22: Int32? - if Int(_1!) & Int(1 << 13) != 0 {_22 = reader.readInt32() } - var _23: Int32? - _23 = reader.readInt32() + if Int(_1!) & Int(1 << 14) != 0 {_22 = reader.readInt32() } + var _23: Api.ChannelLocation? + if Int(_1!) & Int(1 << 15) != 0 {if let signature = reader.readInt32() { + _23 = Api.parse(reader, signature: signature) as? Api.ChannelLocation + } } + var _24: Int32? + _24 = reader.readInt32() let _c1 = _1 != nil let _c2 = _2 != nil let _c3 = _3 != nil @@ -244,10 +249,11 @@ extension Api { let _c19 = (Int(_1!) & Int(1 << 8) == 0) || _19 != nil let _c20 = (Int(_1!) & Int(1 << 9) == 0) || _20 != nil let _c21 = (Int(_1!) & Int(1 << 11) == 0) || _21 != nil - let _c22 = (Int(_1!) & Int(1 << 13) == 0) || _22 != nil - let _c23 = _23 != nil - if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 && _c15 && _c16 && _c17 && _c18 && _c19 && _c20 && _c21 && _c22 && _c23 { - return Api.ChatFull.channelFull(flags: _1!, id: _2!, about: _3!, participantsCount: _4, adminsCount: _5, kickedCount: _6, bannedCount: _7, onlineCount: _8, readInboxMaxId: _9!, readOutboxMaxId: _10!, unreadCount: _11!, chatPhoto: _12!, notifySettings: _13!, exportedInvite: _14!, botInfo: _15!, migratedFromChatId: _16, migratedFromMaxId: _17, pinnedMsgId: _18, stickerset: _19, availableMinId: _20, folderId: _21, linkedChatId: _22, pts: _23!) + let _c22 = (Int(_1!) & Int(1 << 14) == 0) || _22 != nil + let _c23 = (Int(_1!) & Int(1 << 15) == 0) || _23 != nil + let _c24 = _24 != nil + if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 && _c15 && _c16 && _c17 && _c18 && _c19 && _c20 && _c21 && _c22 && _c23 && _c24 { + return Api.ChatFull.channelFull(flags: _1!, id: _2!, about: _3!, participantsCount: _4, adminsCount: _5, kickedCount: _6, bannedCount: _7, onlineCount: _8, readInboxMaxId: _9!, readOutboxMaxId: _10!, unreadCount: _11!, chatPhoto: _12!, notifySettings: _13!, exportedInvite: _14!, botInfo: _15!, migratedFromChatId: _16, migratedFromMaxId: _17, pinnedMsgId: _18, stickerset: _19, availableMinId: _20, folderId: _21, linkedChatId: _22, location: _23, pts: _24!) } else { return nil @@ -3943,7 +3949,6 @@ extension Api { case updateUserStatus(userId: Int32, status: Api.UserStatus) case updateUserName(userId: Int32, firstName: String, lastName: String, username: String) case updateUserPhoto(userId: Int32, date: Int32, photo: Api.UserProfilePhoto, previous: Api.Bool) - case updateContactLink(userId: Int32, myLink: Api.ContactLink, foreignLink: Api.ContactLink) case updateNewEncryptedMessage(message: Api.EncryptedMessage, qts: Int32) case updateEncryptedChatTyping(chatId: Int32) case updateEncryption(chat: Api.EncryptedChat, date: Int32) @@ -4005,7 +4010,7 @@ extension Api { case updateReadChannelInbox(flags: Int32, folderId: Int32?, channelId: Int32, maxId: Int32, stillUnreadCount: Int32, pts: Int32) case updateReadHistoryInbox(flags: Int32, folderId: Int32?, peer: Api.Peer, maxId: Int32, stillUnreadCount: Int32, pts: Int32, ptsCount: Int32) case updatePeerSettings(peer: Api.Peer, settings: Api.PeerSettings) - case updateContactLocated(contacts: [Api.ContactLocated]) + case updatePeerLocated(peers: [Api.PeerLocated]) func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -4082,14 +4087,6 @@ extension Api { photo.serialize(buffer, true) previous.serialize(buffer, true) break - case .updateContactLink(let userId, let myLink, let foreignLink): - if boxed { - buffer.appendInt32(-1657903163) - } - serializeInt32(userId, buffer: buffer, boxed: false) - myLink.serialize(buffer, true) - foreignLink.serialize(buffer, true) - break case .updateNewEncryptedMessage(let message, let qts): if boxed { buffer.appendInt32(314359194) @@ -4605,13 +4602,13 @@ extension Api { peer.serialize(buffer, true) settings.serialize(buffer, true) break - case .updateContactLocated(let contacts): + case .updatePeerLocated(let peers): if boxed { - buffer.appendInt32(1602468195) + buffer.appendInt32(-1263546448) } buffer.appendInt32(481674261) - buffer.appendInt32(Int32(contacts.count)) - for item in contacts { + buffer.appendInt32(Int32(peers.count)) + for item in peers { item.serialize(buffer, true) } break @@ -4638,8 +4635,6 @@ extension Api { return ("updateUserName", [("userId", userId), ("firstName", firstName), ("lastName", lastName), ("username", username)]) case .updateUserPhoto(let userId, let date, let photo, let previous): return ("updateUserPhoto", [("userId", userId), ("date", date), ("photo", photo), ("previous", previous)]) - case .updateContactLink(let userId, let myLink, let foreignLink): - return ("updateContactLink", [("userId", userId), ("myLink", myLink), ("foreignLink", foreignLink)]) case .updateNewEncryptedMessage(let message, let qts): return ("updateNewEncryptedMessage", [("message", message), ("qts", qts)]) case .updateEncryptedChatTyping(let chatId): @@ -4762,8 +4757,8 @@ extension Api { return ("updateReadHistoryInbox", [("flags", flags), ("folderId", folderId), ("peer", peer), ("maxId", maxId), ("stillUnreadCount", stillUnreadCount), ("pts", pts), ("ptsCount", ptsCount)]) case .updatePeerSettings(let peer, let settings): return ("updatePeerSettings", [("peer", peer), ("settings", settings)]) - case .updateContactLocated(let contacts): - return ("updateContactLocated", [("contacts", contacts)]) + case .updatePeerLocated(let peers): + return ("updatePeerLocated", [("peers", peers)]) } } @@ -4927,27 +4922,6 @@ extension Api { return nil } } - static func parse_updateContactLink(_ reader: BufferReader) -> Update? { - var _1: Int32? - _1 = reader.readInt32() - var _2: Api.ContactLink? - if let signature = reader.readInt32() { - _2 = Api.parse(reader, signature: signature) as? Api.ContactLink - } - var _3: Api.ContactLink? - if let signature = reader.readInt32() { - _3 = Api.parse(reader, signature: signature) as? Api.ContactLink - } - let _c1 = _1 != nil - let _c2 = _2 != nil - let _c3 = _3 != nil - if _c1 && _c2 && _c3 { - return Api.Update.updateContactLink(userId: _1!, myLink: _2!, foreignLink: _3!) - } - else { - return nil - } - } static func parse_updateNewEncryptedMessage(_ reader: BufferReader) -> Update? { var _1: Api.EncryptedMessage? if let signature = reader.readInt32() { @@ -5986,14 +5960,14 @@ extension Api { return nil } } - static func parse_updateContactLocated(_ reader: BufferReader) -> Update? { - var _1: [Api.ContactLocated]? + static func parse_updatePeerLocated(_ reader: BufferReader) -> Update? { + var _1: [Api.PeerLocated]? if let _ = reader.readInt32() { - _1 = Api.parseVector(reader, elementSignature: 0, elementType: Api.ContactLocated.self) + _1 = Api.parseVector(reader, elementSignature: 0, elementType: Api.PeerLocated.self) } let _c1 = _1 != nil if _c1 { - return Api.Update.updateContactLocated(contacts: _1!) + return Api.Update.updatePeerLocated(peers: _1!) } else { return nil @@ -6338,48 +6312,6 @@ extension Api { } } - } - enum ContactLocated: TypeConstructorDescription { - case contactLocated(userId: Int32, expires: Int32, distance: Int32) - - func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { - switch self { - case .contactLocated(let userId, let expires, let distance): - if boxed { - buffer.appendInt32(-1150339286) - } - serializeInt32(userId, buffer: buffer, boxed: false) - serializeInt32(expires, buffer: buffer, boxed: false) - serializeInt32(distance, buffer: buffer, boxed: false) - break - } - } - - func descriptionFields() -> (String, [(String, Any)]) { - switch self { - case .contactLocated(let userId, let expires, let distance): - return ("contactLocated", [("userId", userId), ("expires", expires), ("distance", distance)]) - } - } - - static func parse_contactLocated(_ reader: BufferReader) -> ContactLocated? { - var _1: Int32? - _1 = reader.readInt32() - var _2: Int32? - _2 = reader.readInt32() - var _3: Int32? - _3 = reader.readInt32() - let _c1 = _1 != nil - let _c2 = _2 != nil - let _c3 = _3 != nil - if _c1 && _c2 && _c3 { - return Api.ContactLocated.contactLocated(userId: _1!, expires: _2!, distance: _3!) - } - else { - return nil - } - } - } enum KeyboardButton: TypeConstructorDescription { case keyboardButton(text: String) @@ -9267,6 +9199,7 @@ extension Api { case channelAdminLogEventActionStopPoll(message: Api.Message) case channelAdminLogEventActionChangePhoto(prevPhoto: Api.Photo, newPhoto: Api.Photo) case channelAdminLogEventActionChangeLinkedChat(prevValue: Int32, newValue: Int32) + case channelAdminLogEventActionChangeLocation(prevValue: Api.ChannelLocation, newValue: Api.ChannelLocation) func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -9394,6 +9327,13 @@ extension Api { serializeInt32(prevValue, buffer: buffer, boxed: false) serializeInt32(newValue, buffer: buffer, boxed: false) break + case .channelAdminLogEventActionChangeLocation(let prevValue, let newValue): + if boxed { + buffer.appendInt32(241923758) + } + prevValue.serialize(buffer, true) + newValue.serialize(buffer, true) + break } } @@ -9437,6 +9377,8 @@ extension Api { return ("channelAdminLogEventActionChangePhoto", [("prevPhoto", prevPhoto), ("newPhoto", newPhoto)]) case .channelAdminLogEventActionChangeLinkedChat(let prevValue, let newValue): return ("channelAdminLogEventActionChangeLinkedChat", [("prevValue", prevValue), ("newValue", newValue)]) + case .channelAdminLogEventActionChangeLocation(let prevValue, let newValue): + return ("channelAdminLogEventActionChangeLocation", [("prevValue", prevValue), ("newValue", newValue)]) } } @@ -9701,6 +9643,24 @@ extension Api { return nil } } + static func parse_channelAdminLogEventActionChangeLocation(_ reader: BufferReader) -> ChannelAdminLogEventAction? { + var _1: Api.ChannelLocation? + if let signature = reader.readInt32() { + _1 = Api.parse(reader, signature: signature) as? Api.ChannelLocation + } + var _2: Api.ChannelLocation? + if let signature = reader.readInt32() { + _2 = Api.parse(reader, signature: signature) as? Api.ChannelLocation + } + let _c1 = _1 != nil + let _c2 = _2 != nil + if _c1 && _c2 { + return Api.ChannelAdminLogEventAction.channelAdminLogEventActionChangeLocation(prevValue: _1!, newValue: _2!) + } + else { + return nil + } + } } enum SecurePlainData: TypeConstructorDescription { @@ -11404,6 +11364,58 @@ extension Api { } } + } + enum ChannelLocation: TypeConstructorDescription { + case channelLocationEmpty + case channelLocation(geoPoint: Api.GeoPoint, address: String) + + func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .channelLocationEmpty: + if boxed { + buffer.appendInt32(-1078612597) + } + + break + case .channelLocation(let geoPoint, let address): + if boxed { + buffer.appendInt32(547062491) + } + geoPoint.serialize(buffer, true) + serializeString(address, buffer: buffer, boxed: false) + break + } + } + + func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .channelLocationEmpty: + return ("channelLocationEmpty", []) + case .channelLocation(let geoPoint, let address): + return ("channelLocation", [("geoPoint", geoPoint), ("address", address)]) + } + } + + static func parse_channelLocationEmpty(_ reader: BufferReader) -> ChannelLocation? { + return Api.ChannelLocation.channelLocationEmpty + } + static func parse_channelLocation(_ reader: BufferReader) -> ChannelLocation? { + var _1: Api.GeoPoint? + if let signature = reader.readInt32() { + _1 = Api.parse(reader, signature: signature) as? Api.GeoPoint + } + var _2: String? + _2 = parseString(reader) + let _c1 = _1 != nil + let _c2 = _2 != nil + if _c1 && _c2 { + return Api.ChannelLocation.channelLocation(geoPoint: _1!, address: _2!) + } + else { + return nil + } + } + } enum MessageRange: TypeConstructorDescription { case messageRange(minId: Int32, maxId: Int32) @@ -17788,56 +17800,6 @@ extension Api { } } - } - enum ContactLink: TypeConstructorDescription { - case contactLinkUnknown - case contactLinkNone - case contactLinkContact - - func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { - switch self { - case .contactLinkUnknown: - if boxed { - buffer.appendInt32(1599050311) - } - - break - case .contactLinkNone: - if boxed { - buffer.appendInt32(-17968211) - } - - break - case .contactLinkContact: - if boxed { - buffer.appendInt32(-721239344) - } - - break - } - } - - func descriptionFields() -> (String, [(String, Any)]) { - switch self { - case .contactLinkUnknown: - return ("contactLinkUnknown", []) - case .contactLinkNone: - return ("contactLinkNone", []) - case .contactLinkContact: - return ("contactLinkContact", []) - } - } - - static func parse_contactLinkUnknown(_ reader: BufferReader) -> ContactLink? { - return Api.ContactLink.contactLinkUnknown - } - static func parse_contactLinkNone(_ reader: BufferReader) -> ContactLink? { - return Api.ContactLink.contactLinkNone - } - static func parse_contactLinkContact(_ reader: BufferReader) -> ContactLink? { - return Api.ContactLink.contactLinkContact - } - } enum WebDocument: TypeConstructorDescription { case webDocumentNoProxy(url: String, size: Int32, mimeType: String, attributes: [Api.DocumentAttribute]) @@ -19086,6 +19048,50 @@ extension Api { } } + } + enum PeerLocated: TypeConstructorDescription { + case peerLocated(peer: Api.Peer, expires: Int32, distance: Int32) + + func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .peerLocated(let peer, let expires, let distance): + if boxed { + buffer.appendInt32(-901375139) + } + peer.serialize(buffer, true) + serializeInt32(expires, buffer: buffer, boxed: false) + serializeInt32(distance, buffer: buffer, boxed: false) + break + } + } + + func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .peerLocated(let peer, let expires, let distance): + return ("peerLocated", [("peer", peer), ("expires", expires), ("distance", distance)]) + } + } + + static func parse_peerLocated(_ reader: BufferReader) -> PeerLocated? { + var _1: Api.Peer? + if let signature = reader.readInt32() { + _1 = Api.parse(reader, signature: signature) as? Api.Peer + } + var _2: Int32? + _2 = reader.readInt32() + var _3: Int32? + _3 = reader.readInt32() + let _c1 = _1 != nil + let _c2 = _2 != nil + let _c3 = _3 != nil + if _c1 && _c2 && _c3 { + return Api.PeerLocated.peerLocated(peer: _1!, expires: _2!, distance: _3!) + } + else { + return nil + } + } + } enum Document: TypeConstructorDescription { case documentEmpty(id: Int64) diff --git a/submodules/TelegramCore/TelegramCore/Api3.swift b/submodules/TelegramCore/TelegramCore/Api3.swift index efd1324bb8..41506939c9 100644 --- a/submodules/TelegramCore/TelegramCore/Api3.swift +++ b/submodules/TelegramCore/TelegramCore/Api3.swift @@ -2674,24 +2674,6 @@ extension Api { }) } - static func searchGlobal(q: String, offsetRate: Int32, offsetPeer: Api.InputPeer, offsetId: Int32, limit: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { - let buffer = Buffer() - buffer.appendInt32(259638801) - serializeString(q, buffer: buffer, boxed: false) - serializeInt32(offsetRate, buffer: buffer, boxed: false) - offsetPeer.serialize(buffer, true) - serializeInt32(offsetId, buffer: buffer, boxed: false) - serializeInt32(limit, buffer: buffer, boxed: false) - return (FunctionDescription(name: "messages.searchGlobal", parameters: [("q", q), ("offsetRate", offsetRate), ("offsetPeer", offsetPeer), ("offsetId", offsetId), ("limit", limit)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.messages.Messages? in - let reader = BufferReader(buffer) - var result: Api.messages.Messages? - if let signature = reader.readInt32() { - result = Api.parse(reader, signature: signature) as? Api.messages.Messages - } - return result - }) - } - static func getSearchCounters(peer: Api.InputPeer, filters: [Api.MessagesFilter]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Api.messages.SearchCounter]>) { let buffer = Buffer() buffer.appendInt32(1932455680) @@ -2744,6 +2726,26 @@ extension Api { }) } + static func searchGlobal(flags: Int32, folderId: Int32?, q: String, offsetRate: Int32, offsetPeer: Api.InputPeer, offsetId: Int32, limit: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(-1083038300) + serializeInt32(flags, buffer: buffer, boxed: false) + if Int(flags) & Int(1 << 0) != 0 {serializeInt32(folderId!, buffer: buffer, boxed: false)} + serializeString(q, buffer: buffer, boxed: false) + serializeInt32(offsetRate, buffer: buffer, boxed: false) + offsetPeer.serialize(buffer, true) + serializeInt32(offsetId, buffer: buffer, boxed: false) + serializeInt32(limit, buffer: buffer, boxed: false) + return (FunctionDescription(name: "messages.searchGlobal", parameters: [("flags", flags), ("folderId", folderId), ("q", q), ("offsetRate", offsetRate), ("offsetPeer", offsetPeer), ("offsetId", offsetId), ("limit", limit)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.messages.Messages? in + let reader = BufferReader(buffer) + var result: Api.messages.Messages? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.messages.Messages + } + return result + }) + } + static func hidePeerSettingsBar(peer: Api.InputPeer) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() buffer.appendInt32(1336717624) @@ -3289,6 +3291,22 @@ extension Api { return result }) } + + static func editLocation(channel: Api.InputChannel, geoPoint: Api.InputGeoPoint, address: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(1491484525) + channel.serialize(buffer, true) + geoPoint.serialize(buffer, true) + serializeString(address, buffer: buffer, boxed: false) + return (FunctionDescription(name: "channels.editLocation", parameters: [("channel", channel), ("geoPoint", geoPoint), ("address", address)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in + let reader = BufferReader(buffer) + var result: Api.Bool? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.Bool + } + return result + }) + } } struct payments { static func getPaymentForm(msgId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { @@ -3956,14 +3974,15 @@ extension Api { }) } - static func addContact(id: Api.InputUser, firstName: String, lastName: String, phone: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + static func addContact(flags: Int32, id: Api.InputUser, firstName: String, lastName: String, phone: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() - buffer.appendInt32(-2035792455) + buffer.appendInt32(-386636848) + serializeInt32(flags, buffer: buffer, boxed: false) id.serialize(buffer, true) serializeString(firstName, buffer: buffer, boxed: false) serializeString(lastName, buffer: buffer, boxed: false) serializeString(phone, buffer: buffer, boxed: false) - return (FunctionDescription(name: "contacts.addContact", parameters: [("id", id), ("firstName", firstName), ("lastName", lastName), ("phone", phone)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in + return (FunctionDescription(name: "contacts.addContact", parameters: [("flags", flags), ("id", id), ("firstName", firstName), ("lastName", lastName), ("phone", phone)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in let reader = BufferReader(buffer) var result: Api.Updates? if let signature = reader.readInt32() { @@ -4005,12 +4024,11 @@ extension Api { }) } - static func getLocated(geoPoint: Api.InputGeoPoint, radius: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + static func getLocated(geoPoint: Api.InputGeoPoint) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() - buffer.appendInt32(-261936023) + buffer.appendInt32(171270230) geoPoint.serialize(buffer, true) - serializeInt32(radius, buffer: buffer, boxed: false) - return (FunctionDescription(name: "contacts.getLocated", parameters: [("geoPoint", geoPoint), ("radius", radius)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in + return (FunctionDescription(name: "contacts.getLocated", parameters: [("geoPoint", geoPoint)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in let reader = BufferReader(buffer) var result: Api.Updates? if let signature = reader.readInt32() { diff --git a/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift b/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift index 32572b8d4a..2b4e11e291 100644 --- a/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift +++ b/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift @@ -57,7 +57,9 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? { return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), title: "", photo: [], participantCount: 0, role: .member, membership: .Removed, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) case let .chatForbidden(id, title): return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), title: title, photo: [], participantCount: 0, role: .member, membership: .Removed, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) - case let .channel(flags, id, accessHash, title, username, photo, date, version, restrictionReason, adminRights, bannedRights, defaultBannedRights, _/*feed*//*, feedId*/): + case let .channel(flags, id, accessHash, title, username, photo, date, version, restrictionReason, adminRights, bannedRights, defaultBannedRights, _): + let isMin = (flags & (1 << 20)) != 0 + let participationStatus: TelegramChannelParticipationStatus if (flags & Int32(1 << 1)) != 0 { participationStatus = .kicked diff --git a/submodules/TelegramCore/TelegramCore/CachedChannelData.swift b/submodules/TelegramCore/TelegramCore/CachedChannelData.swift index 9f6b9a4be2..56205a7588 100644 --- a/submodules/TelegramCore/TelegramCore/CachedChannelData.swift +++ b/submodules/TelegramCore/TelegramCore/CachedChannelData.swift @@ -125,6 +125,34 @@ public struct ChannelMigrationReference: PostboxCoding, Equatable { } } +public struct PeerGeoLocation: PostboxCoding, Equatable { + public let latitude: Double + public let longitude: Double + public let address: String + + public init(latitude: Double, longitude: Double, address: String) { + self.latitude = latitude + self.longitude = longitude + self.address = address + } + + public init(decoder: PostboxDecoder) { + self.latitude = decoder.decodeDoubleForKey("la", orElse: 0.0) + self.longitude = decoder.decodeDoubleForKey("lo", orElse: 0.0) + self.address = decoder.decodeStringForKey("a", orElse: "") + } + + public func encode(_ encoder: PostboxEncoder) { + encoder.encodeDouble(self.latitude, forKey: "la") + encoder.encodeDouble(self.longitude, forKey: "lo") + encoder.encodeString(self.address, forKey: "a") + } + + public static func ==(lhs: PeerGeoLocation, rhs: PeerGeoLocation) -> Bool { + return lhs.latitude == rhs.latitude && lhs.longitude == rhs.longitude && lhs.address == rhs.address + } +} + public final class CachedChannelData: CachedPeerData { public let isNotAccessible: Bool public let flags: CachedChannelFlags @@ -137,8 +165,8 @@ public final class CachedChannelData: CachedPeerData { public let stickerPack: StickerPackCollectionInfo? public let minAvailableMessageId: MessageId? public let migrationReference: ChannelMigrationReference? - public let linkedDiscussionPeerId: PeerId? + public let peerGeoLocation: PeerGeoLocation? public let peerIds: Set public let messageIds: Set @@ -161,9 +189,10 @@ public final class CachedChannelData: CachedPeerData { self.minAvailableMessageId = nil self.migrationReference = nil self.linkedDiscussionPeerId = nil + self.peerGeoLocation = nil } - init(isNotAccessible: Bool, flags: CachedChannelFlags, about: String?, participantsSummary: CachedChannelParticipantsSummary, exportedInvitation: ExportedInvitation?, botInfos: [CachedPeerBotInfo], peerStatusSettings: PeerStatusSettings?, pinnedMessageId: MessageId?, stickerPack: StickerPackCollectionInfo?, minAvailableMessageId: MessageId?, migrationReference: ChannelMigrationReference?, linkedDiscussionPeerId: PeerId?) { + init(isNotAccessible: Bool, flags: CachedChannelFlags, about: String?, participantsSummary: CachedChannelParticipantsSummary, exportedInvitation: ExportedInvitation?, botInfos: [CachedPeerBotInfo], peerStatusSettings: PeerStatusSettings?, pinnedMessageId: MessageId?, stickerPack: StickerPackCollectionInfo?, minAvailableMessageId: MessageId?, migrationReference: ChannelMigrationReference?, linkedDiscussionPeerId: PeerId?, peerGeoLocation: PeerGeoLocation?) { self.isNotAccessible = isNotAccessible self.flags = flags self.about = about @@ -176,6 +205,7 @@ public final class CachedChannelData: CachedPeerData { self.minAvailableMessageId = minAvailableMessageId self.migrationReference = migrationReference self.linkedDiscussionPeerId = linkedDiscussionPeerId + self.peerGeoLocation = peerGeoLocation var peerIds = Set() for botInfo in botInfos { @@ -196,51 +226,55 @@ public final class CachedChannelData: CachedPeerData { } func withUpdatedIsNotAccessible(_ isNotAccessible: Bool) -> CachedChannelData { - return CachedChannelData(isNotAccessible: isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedFlags(_ flags: CachedChannelFlags) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedAbout(_ about: String?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedParticipantsSummary(_ participantsSummary: CachedChannelParticipantsSummary) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedExportedInvitation(_ exportedInvitation: ExportedInvitation?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedBotInfos(_ botInfos: [CachedPeerBotInfo]) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedPeerStatusSettings(_ peerStatusSettings: PeerStatusSettings?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedPinnedMessageId(_ pinnedMessageId: MessageId?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedStickerPack(_ stickerPack: StickerPackCollectionInfo?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedMinAvailableMessageId(_ minAvailableMessageId: MessageId?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedMigrationReference(_ migrationReference: ChannelMigrationReference?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) } func withUpdatedLinkedDiscussionPeerId(_ linkedDiscussionPeerId: PeerId?) -> CachedChannelData { - return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: linkedDiscussionPeerId) + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: linkedDiscussionPeerId, peerGeoLocation: self.peerGeoLocation) + } + + func withUpdatedPeerGeoLocation(peerGeoLocation: PeerGeoLocation?) -> CachedChannelData { + return CachedChannelData(isNotAccessible: self.isNotAccessible, flags: self.flags, about: self.about, participantsSummary: self.participantsSummary, exportedInvitation: self.exportedInvitation, botInfos: self.botInfos, peerStatusSettings: self.peerStatusSettings, pinnedMessageId: self.pinnedMessageId, stickerPack: self.stickerPack, minAvailableMessageId: self.minAvailableMessageId, migrationReference: self.migrationReference, linkedDiscussionPeerId: self.linkedDiscussionPeerId, peerGeoLocation: peerGeoLocation) } public init(decoder: PostboxDecoder) { @@ -286,6 +320,12 @@ public final class CachedChannelData: CachedPeerData { self.linkedDiscussionPeerId = nil } + if let peerGeoLocation = decoder.decodeObjectForKey("pgl", decoder: { PeerGeoLocation(decoder: $0) }) as? PeerGeoLocation { + self.peerGeoLocation = peerGeoLocation + } else { + self.peerGeoLocation = nil + } + if let linkedDiscussionPeerId = self.linkedDiscussionPeerId { peerIds.insert(linkedDiscussionPeerId) } @@ -352,6 +392,11 @@ public final class CachedChannelData: CachedPeerData { } else { encoder.encodeNil(forKey: "dgi") } + if let peerGeoLocation = self.peerGeoLocation { + encoder.encodeObject(peerGeoLocation, forKey: "pgl") + } else { + encoder.encodeNil(forKey: "pgl") + } } public func isEqual(to: CachedPeerData) -> Bool { @@ -407,6 +452,25 @@ public final class CachedChannelData: CachedPeerData { return false } + if other.peerGeoLocation != self.peerGeoLocation { + return false + } + return true } } + +extension PeerGeoLocation { + init?(apiLocation: Api.ChannelLocation) { + switch apiLocation { + case let .channelLocation(geopoint, address): + if case let .geoPoint(longitude, latitude, _) = geopoint { + self.init(latitude: latitude, longitude: longitude, address: address) + } else { + return nil + } + default: + return nil + } + } +} diff --git a/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift b/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift index 1efe8f3cee..2529d0d0f3 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift @@ -56,10 +56,10 @@ public enum AdminLogEventAction { case participantToggleAdmin(prev: RenderedChannelParticipant, new: RenderedChannelParticipant) case changeStickerPack(prev: StickerPackReference?, new: StickerPackReference?) case togglePreHistoryHidden(Bool) - case updateDefaultBannedRights(prev: TelegramChatBannedRights, new: TelegramChatBannedRights - ) + case updateDefaultBannedRights(prev: TelegramChatBannedRights, new: TelegramChatBannedRights) case pollStopped(Message) case linkedPeerUpdated(previous: Peer?, updated: Peer?) + case changeGeoLocation(previous: PeerGeoLocation?, updated: PeerGeoLocation?) } public enum ChannelAdminLogEventError { @@ -214,6 +214,8 @@ public func channelAdminLogEvents(postbox: Postbox, network: Network, peerId: Pe } case let .channelAdminLogEventActionChangeLinkedChat(prevValue, newValue): action = .linkedPeerUpdated(previous: prevValue == 0 ? nil : peers[PeerId(namespace: Namespaces.Peer.CloudChannel, id: prevValue)], updated: newValue == 0 ? nil : peers[PeerId(namespace: Namespaces.Peer.CloudChannel, id: newValue)]) + case let .channelAdminLogEventActionChangeLocation(prevValue, newValue): + action = .changeGeoLocation(previous: PeerGeoLocation(apiLocation: prevValue), updated: PeerGeoLocation(apiLocation: newValue)) } let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) if let action = action { diff --git a/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift b/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift index 079826663b..fd34aa1cc6 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift @@ -20,7 +20,58 @@ public enum ChannelOwnershipTransferError { case userBlocked } -public func updateChannelOwnership(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, channelId: PeerId, memberId: PeerId, password: String?) -> Signal { +public func checkOwnershipTranfserAvailability(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, memberId: PeerId) -> Signal { + return postbox.transaction { transaction -> Peer? in + return transaction.getPeer(memberId) + } + |> introduceError(ChannelOwnershipTransferError.self) + |> mapToSignal { user -> Signal in + guard let user = user else { + return .fail(.generic) + } + guard let apiUser = apiInputUser(user) else { + return .fail(.generic) + } + + return network.request(Api.functions.channels.editCreator(channel: .inputChannelEmpty, userId: apiUser, password: .inputCheckPasswordEmpty)) + |> mapError { error -> ChannelOwnershipTransferError in + if error.errorDescription == "PASSWORD_HASH_INVALID" { + return .requestPassword + } else if error.errorDescription == "PASSWORD_MISSING" { + return .twoStepAuthMissing + } else if error.errorDescription.hasPrefix("PASSWORD_TOO_FRESH_") { + let timeout = String(error.errorDescription[error.errorDescription.index(error.errorDescription.startIndex, offsetBy: "PASSWORD_TOO_FRESH_".count)...]) + if let value = Int32(timeout) { + return .twoStepAuthTooFresh(value) + } + } else if error.errorDescription.hasPrefix("SESSION_TOO_FRESH_") { + let timeout = String(error.errorDescription[error.errorDescription.index(error.errorDescription.startIndex, offsetBy: "SESSION_TOO_FRESH_".count)...]) + if let value = Int32(timeout) { + return .authSessionTooFresh(value) + } + } else if error.errorDescription == "CHANNELS_ADMIN_PUBLIC_TOO_MUCH" { + return .userPublicChannelsTooMuch + } else if error.errorDescription == "ADMINS_TOO_MUCH" { + return .adminsTooMuch + } else if error.errorDescription == "USER_PRIVACY_RESTRICTED" { + return .restricted + } else if error.errorDescription == "USER_BLOCKED" { + return .userBlocked + } + return .generic + } + |> mapToSignal { updates -> Signal in + accountStateManager.addUpdates(updates) + return.complete() + } + } +} + +public func updateChannelOwnership(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, channelId: PeerId, memberId: PeerId, password: String) -> Signal { + guard !password.isEmpty else { + return .fail(.invalidPassword) + } + return postbox.transaction { transaction -> (channel: Peer?, user: Peer?) in return (channel: transaction.getPeer(channelId), user: transaction.getPeer(memberId)) } @@ -36,22 +87,17 @@ public func updateChannelOwnership(postbox: Postbox, network: Network, accountSt return .fail(.generic) } - let checkPassword: Signal - if let password = password, !password.isEmpty { - checkPassword = twoStepAuthData(network) - |> mapError { _ in ChannelOwnershipTransferError.generic } - |> mapToSignal { authData -> Signal in - if let currentPasswordDerivation = authData.currentPasswordDerivation, let srpSessionData = authData.srpSessionData { - guard let kdfResult = passwordKDF(password: password, derivation: currentPasswordDerivation, srpSessionData: srpSessionData) else { - return .fail(.generic) - } - return .single(.inputCheckPasswordSRP(srpId: kdfResult.id, A: Buffer(data: kdfResult.A), M1: Buffer(data: kdfResult.M1))) - } else { - return .fail(.twoStepAuthMissing) + let checkPassword = twoStepAuthData(network) + |> mapError { _ in ChannelOwnershipTransferError.generic } + |> mapToSignal { authData -> Signal in + if let currentPasswordDerivation = authData.currentPasswordDerivation, let srpSessionData = authData.srpSessionData { + guard let kdfResult = passwordKDF(password: password, derivation: currentPasswordDerivation, srpSessionData: srpSessionData) else { + return .fail(.generic) } + return .single(.inputCheckPasswordSRP(srpId: kdfResult.id, A: Buffer(data: kdfResult.A), M1: Buffer(data: kdfResult.M1))) + } else { + return .fail(.twoStepAuthMissing) } - } else { - checkPassword = .single(.inputCheckPasswordEmpty) } return checkPassword @@ -59,11 +105,7 @@ public func updateChannelOwnership(postbox: Postbox, network: Network, accountSt return network.request(Api.functions.channels.editCreator(channel: apiChannel, userId: apiUser, password: password)) |> mapError { error -> ChannelOwnershipTransferError in if error.errorDescription == "PASSWORD_HASH_INVALID" { - if case .inputCheckPasswordEmpty = password { - return .requestPassword - } else { - return .invalidPassword - } + return .invalidPassword } else if error.errorDescription == "PASSWORD_MISSING" { return .twoStepAuthMissing } else if error.errorDescription.hasPrefix("PASSWORD_TOO_FRESH_") { diff --git a/submodules/TelegramCore/TelegramCore/ImportContact.swift b/submodules/TelegramCore/TelegramCore/ImportContact.swift index 37e0f5eb40..801906dc47 100644 --- a/submodules/TelegramCore/TelegramCore/ImportContact.swift +++ b/submodules/TelegramCore/TelegramCore/ImportContact.swift @@ -44,7 +44,7 @@ public enum AddContactError { case generic } -public func addContactInteractively(account: Account, peerId: PeerId, firstName: String, lastName: String, phoneNumber: String) -> Signal { +public func addContactInteractively(account: Account, peerId: PeerId, firstName: String, lastName: String, phoneNumber: String, addToPrivacyExceptions: Bool) -> Signal { return account.postbox.transaction { transaction -> (Api.InputUser, String)? in if let user = transaction.getPeer(peerId) as? TelegramUser, let inputUser = apiInputUser(user) { return (inputUser, user.phone == nil ? phoneNumber : "") @@ -57,7 +57,11 @@ public func addContactInteractively(account: Account, peerId: PeerId, firstName: guard let (inputUser, phone) = inputUserAndPhone else { return .fail(.generic) } - return account.network.request(Api.functions.contacts.addContact(id: inputUser, firstName: firstName, lastName: lastName, phone: phone)) + var flags: Int32 = 0 + if addToPrivacyExceptions { + flags |= (1 << 0) + } + return account.network.request(Api.functions.contacts.addContact(flags: flags, id: inputUser, firstName: firstName, lastName: lastName, phone: phone)) |> mapError { _ -> AddContactError in return .generic } diff --git a/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift b/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift index 41a3bf19c9..93cca877a7 100644 --- a/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift +++ b/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift @@ -41,7 +41,6 @@ public enum ChannelDiscussionGroupError { } public func updateGroupDiscussionForChannel(network: Network, postbox: Postbox, channelId: PeerId, groupId: PeerId?) -> Signal { - return postbox.transaction { transaction -> (channel: Peer?, group: Peer?) in return (channel: transaction.getPeer(channelId), group: groupId != nil ? transaction.getPeer(groupId!) : nil) } @@ -101,5 +100,4 @@ public func updateGroupDiscussionForChannel(network: Network, postbox: Postbox, return .single(result) } } - } diff --git a/submodules/TelegramCore/TelegramCore/PeerAccessHash.swift b/submodules/TelegramCore/TelegramCore/PeerAccessHash.swift new file mode 100644 index 0000000000..44a5c34699 --- /dev/null +++ b/submodules/TelegramCore/TelegramCore/PeerAccessHash.swift @@ -0,0 +1,6 @@ +import Foundation + +public enum TelegramPeerAccessHash: Hashable { + case personal(Int64) + case genericPublic(Int64) +} diff --git a/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift b/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift index e890899267..ba3ac18f28 100644 --- a/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift +++ b/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift @@ -16,6 +16,7 @@ public struct PeerStatusSettings: OptionSet { public static let canShareContact = PeerStatusSettings(rawValue: 1 << 2) public static let canBlock = PeerStatusSettings(rawValue: 1 << 3) public static let canAddContact = PeerStatusSettings(rawValue: 1 << 4) + public static let addExceptionWhenAddingContact = PeerStatusSettings(rawValue: 1 << 5) } extension PeerStatusSettings { @@ -35,6 +36,9 @@ extension PeerStatusSettings { if (flags & (1 << 3)) != 0 { result.insert(.canShareContact) } + if (flags & (1 << 4)) != 0 { + result.insert(.addExceptionWhenAddingContact) + } self = result } } diff --git a/submodules/TelegramCore/TelegramCore/PeersNearby.swift b/submodules/TelegramCore/TelegramCore/PeersNearby.swift index 86e6639658..b6906588c1 100644 --- a/submodules/TelegramCore/TelegramCore/PeersNearby.swift +++ b/submodules/TelegramCore/TelegramCore/PeersNearby.swift @@ -13,34 +13,156 @@ public struct PeerNearby { public let distance: Int32 } -public func peersNearby(network: Network, accountStateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double), radius: Int32) -> Signal<[PeerNearby], NoError> { - let inputGeoPoint = Api.InputGeoPoint.inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude) +public final class PeersNearbyContext { + private let queue: Queue = Queue.mainQueue() + private var subscribers = Bag<([PeerNearby]) -> Void>() + private let disposable = MetaDisposable() + private var timer: SwiftSignalKit.Timer? - return network.request(Api.functions.contacts.getLocated(geoPoint: inputGeoPoint, radius: radius)) - |> map(Optional.init) - |> `catch` { _ -> Signal in - return .single(nil) - } - |> mapToSignal { updates in - var peersNearby: [PeerNearby] = [] - if let updates = updates { - switch updates { + private var entries: [PeerNearby] = [] + + public init(network: Network, accountStateManager: AccountStateManager, coordinate: (latitude: Double, longitude: Double)) { + self.disposable.set((network.request(Api.functions.contacts.getLocated(geoPoint: .inputGeoPoint(lat: coordinate.latitude, long: coordinate.longitude))) + |> map(Optional.init) + |> `catch` { _ -> Signal in + return .single(nil) + } + |> mapToSignal { updates -> Signal<[PeerNearby], NoError> in + var peersNearby: [PeerNearby] = [] + if let updates = updates { + switch updates { case let .updates(updates, _, _, _, _): for update in updates { - if case let .updateContactLocated(contacts) = update { - for case let .contactLocated(userId, expires, distance) in contacts { - peersNearby.append(PeerNearby(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), expires: expires, distance: distance)) + if case let .updatePeerLocated(peers) = update { + for case let .peerLocated(peer, expires, distance) in peers { + peersNearby.append(PeerNearby(id: peer.peerId, expires: expires, distance: distance)) } } } default: break + } + accountStateManager.addUpdates(updates) + } + return .single(peersNearby) + |> then(accountStateManager.updatedPeersNearby()) + }).start(next: { [weak self] updatedEntries in + guard let strongSelf = self else { + return } - accountStateManager.addUpdates(updates) - } + let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + var entries = strongSelf.entries.filter { Double($0.expires) > timestamp } + let updatedEntries = updatedEntries.filter { Double($0.expires) > timestamp } + + var existingPeerIds: [PeerId: Int] = [:] + for i in 0 ..< entries.count { + existingPeerIds[entries[i].id] = i + } + + for entry in updatedEntries { + if let index = existingPeerIds[entry.id] { + entries[index] = entry + } else { + entries.append(entry) + } + } + + strongSelf.entries = entries + + for subscriber in strongSelf.subscribers.copyItems() { + subscriber(strongSelf.entries) + } + })) - return .single(peersNearby) - |> then(accountStateManager.updatedPeersNearby()) + self.timer = SwiftSignalKit.Timer(timeout: 5.0, repeat: true, completion: { [weak self] in + guard let strongSelf = self else { + return + } + + let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + strongSelf.entries = strongSelf.entries.filter { Double($0.expires) > timestamp } + }, queue: self.queue) + self.timer?.start() + } + + deinit { + self.disposable.dispose() + self.timer?.invalidate() + } + + public func get() -> Signal<[PeerNearby], NoError> { + let queue = self.queue + return Signal { [weak self] subscriber in + if let strongSelf = self { + subscriber.putNext(strongSelf.entries) + + let index = strongSelf.subscribers.add({ entries in + subscriber.putNext(entries) + }) + + return ActionDisposable { + queue.async { + if let strongSelf = self { + strongSelf.subscribers.remove(index) + } + } + } + } else { + return EmptyDisposable + } + } |> runOn(queue) + } +} + +public func updateChannelGeoLocation(postbox: Postbox, network: Network, channelId: PeerId, coordinate: (latitude: Double, longitude: Double)?, address: String?) -> Signal { + return postbox.transaction { transaction -> Peer? in + return transaction.getPeer(channelId) + } + |> mapToSignal { channel -> Signal in + guard let channel = channel, let apiChannel = apiInputChannel(channel) else { + return .single(false) + } + + let geoPoint: Api.InputGeoPoint + if let (latitude, longitude) = coordinate, let _ = address { + geoPoint = .inputGeoPoint(lat: latitude, long: longitude) + } else { + geoPoint = .inputGeoPointEmpty + } + + return network.request(Api.functions.channels.editLocation(channel: apiChannel, geoPoint: geoPoint, address: address ?? "")) + |> map { result -> Bool in + switch result { + case .boolTrue: + return true + case .boolFalse: + return false + } + } + |> `catch` { error -> Signal in + return .single(false) + } + |> mapToSignal { result in + if result { + return postbox.transaction { transaction in + transaction.updatePeerCachedData(peerIds: Set([channelId]), update: { (_, current) -> CachedPeerData? in + let current: CachedChannelData = current as? CachedChannelData ?? CachedChannelData() + let peerGeoLocation: PeerGeoLocation? + if let (latitude, longitude) = coordinate, let address = address { + peerGeoLocation = PeerGeoLocation(latitude: latitude, longitude: longitude, address: address) + } else { + peerGeoLocation = nil + } + return current.withUpdatedPeerGeoLocation(peerGeoLocation: peerGeoLocation) + }) + } + |> map { _ in + return result + } + } else { + return .single(result) + } + } } } diff --git a/submodules/TelegramCore/TelegramCore/RemovePeerChat.swift b/submodules/TelegramCore/TelegramCore/RemovePeerChat.swift index b91778ae2f..fcfd0c524c 100644 --- a/submodules/TelegramCore/TelegramCore/RemovePeerChat.swift +++ b/submodules/TelegramCore/TelegramCore/RemovePeerChat.swift @@ -13,6 +13,20 @@ public func removePeerChat(account: Account, peerId: PeerId, reportChatSpam: Boo } } +public func terminateSecretChat(transaction: Transaction, peerId: PeerId) { + if let state = transaction.getPeerChatState(peerId) as? SecretChatState, state.embeddedState != .terminated { + let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.terminate(reportSpam: false), state: state).withUpdatedEmbeddedState(.terminated) + if updatedState != state { + transaction.setPeerChatState(peerId, state: updatedState) + if let peer = transaction.getPeer(peerId) as? TelegramSecretChat { + updatePeers(transaction: transaction, peers: [peer.withUpdatedEmbeddedState(updatedState.embeddedState.peerState)], update: { _, updated in + return updated + }) + } + } + } +} + public func removePeerChat(account: Account, transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, reportChatSpam: Bool, deleteGloballyIfPossible: Bool) { if let _ = transaction.getPeerChatInterfaceState(peerId) { transaction.updatePeerChatInterfaceState(peerId, update: { current in @@ -24,8 +38,7 @@ public func removePeerChat(account: Account, transaction: Transaction, mediaBox: }) } if peerId.namespace == Namespaces.Peer.SecretChat { - if let state = transaction.getPeerChatState(peerId) as? SecretChatState { - + if let state = transaction.getPeerChatState(peerId) as? SecretChatState, state.embeddedState != .terminated { let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.terminate(reportSpam: reportChatSpam), state: state).withUpdatedEmbeddedState(.terminated) if updatedState != state { transaction.setPeerChatState(peerId, state: updatedState) diff --git a/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift b/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift index e4255b051d..412072acb3 100644 --- a/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift +++ b/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift @@ -19,8 +19,9 @@ public struct TelegramPeerPhoto { public let image: TelegramMediaImage public let date: Int32 public let reference: TelegramMediaImageReference? - public let index:Int - public let totalCount:Int + public let index: Int + public let totalCount: Int + public let messageId: MessageId? } public func requestPeerPhotos(account:Account, peerId: PeerId) -> Signal<[TelegramPeerPhoto], NoError> { @@ -38,7 +39,7 @@ public func requestPeerPhotos(account:Account, peerId: PeerId) -> Signal<[Telegr |> map { result -> [TelegramPeerPhoto] in if let result = result { let totalCount:Int - let photos:[Api.Photo] + let photos: [Api.Photo] switch result { case let .photos(data): photos = data.photos @@ -58,7 +59,7 @@ public func requestPeerPhotos(account:Account, peerId: PeerId) -> Signal<[Telegr case .photoEmpty: break } - images.append(TelegramPeerPhoto(image: image, date: date, reference: reference, index: i, totalCount: totalCount)) + images.append(TelegramPeerPhoto(image: image, date: date, reference: reference, index: i, totalCount: totalCount, messageId: nil)) } } @@ -128,7 +129,7 @@ public func requestPeerPhotos(account:Account, peerId: PeerId) -> Signal<[Telegr switch media.action { case let .photoUpdated(image): if let image = image { - photos.append(TelegramPeerPhoto(image: image, date: message.timestamp, reference: nil, index: index, totalCount: messages.count)) + photos.append(TelegramPeerPhoto(image: image, date: message.timestamp, reference: nil, index: index, totalCount: messages.count, messageId: message.id)) } default: break diff --git a/submodules/TelegramCore/TelegramCore/SearchMessages.swift b/submodules/TelegramCore/TelegramCore/SearchMessages.swift index 004020cd3c..1230fcfecb 100644 --- a/submodules/TelegramCore/TelegramCore/SearchMessages.swift +++ b/submodules/TelegramCore/TelegramCore/SearchMessages.swift @@ -291,7 +291,7 @@ public func searchMessages(account: Account, location: SearchMessagesLocation, q } } |> mapToSignal { (nextRate, lowerBound, inputPeer) in - account.network.request(Api.functions.messages.searchGlobal(q: query, offsetRate: nextRate, offsetPeer: inputPeer, offsetId: lowerBound?.id.id ?? 0, limit: limit), automaticFloodWait: false) + account.network.request(Api.functions.messages.searchGlobal(flags: 0, folderId: nil, q: query, offsetRate: nextRate, offsetPeer: inputPeer, offsetId: lowerBound?.id.id ?? 0, limit: limit), automaticFloodWait: false) |> map { result -> (Api.messages.Messages?, Api.messages.Messages?) in return (result, nil) } diff --git a/submodules/TelegramCore/TelegramCore/TelegramUser.swift b/submodules/TelegramCore/TelegramCore/TelegramUser.swift index 9182029c21..5e03f673be 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramUser.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramUser.swift @@ -302,8 +302,9 @@ extension TelegramUser { static func merge(_ lhs: TelegramUser?, rhs: Api.User) -> TelegramUser? { switch rhs { - case let .user(flags, _, accessHash, _, _, username, _, photo, _, _, restrictionReason, botInlinePlaceholder, _): - if let _ = accessHash { + case let .user(flags, _, _, _, _, username, _, photo, _, _, restrictionReason, botInlinePlaceholder, _): + let isMin = (flags & (1 << 20)) != 0 + if !isMin { return TelegramUser(user: rhs) } else { let telegramPhoto = photo.flatMap(parsedTelegramProfilePhoto) ?? [] diff --git a/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift b/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift index f21684ad0b..8d9b03b2e1 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift @@ -7,112 +7,140 @@ import Foundation import SwiftSignalKit #endif -func fetchAndUpdateSupplementalCachedPeerData(peerId: PeerId, network: Network, postbox: Postbox) -> Signal { +func fetchAndUpdateSupplementalCachedPeerData(peerId rawPeerId: PeerId, network: Network, postbox: Postbox) -> Signal { return postbox.transaction { transaction -> Signal in - if let peer = transaction.getPeer(peerId) { - let cachedData = transaction.getPeerCachedData(peerId: peerId) - - if let cachedData = cachedData as? CachedUserData { - if cachedData.peerStatusSettings != nil { - return .complete() - } - } else if let cachedData = cachedData as? CachedGroupData { - if cachedData.peerStatusSettings != nil { - return .complete() - } - } else if let cachedData = cachedData as? CachedChannelData { - if cachedData.peerStatusSettings != nil { - return .complete() - } - } else if let cachedData = cachedData as? CachedSecretChatData { - if cachedData.peerStatusSettings != nil { - return .complete() - } + guard let rawPeer = transaction.getPeer(rawPeerId) else { + return .complete() + } + + let peer: Peer + if let secretChat = rawPeer as? TelegramSecretChat { + guard let user = transaction.getPeer(secretChat.regularPeerId) else { + return .complete() } + peer = user + } else { + peer = rawPeer + } - if peerId.namespace == Namespaces.Peer.SecretChat { - return postbox.transaction { transaction -> Void in - var peerStatusSettings: PeerStatusSettings - if let peer = transaction.getPeer(peerId), let associatedPeerId = peer.associatedPeerId, !transaction.isPeerContact(peerId: associatedPeerId) { - if let peer = peer as? TelegramSecretChat, case .creator = peer.role { - peerStatusSettings = PeerStatusSettings() - peerStatusSettings = [] - } else { - peerStatusSettings = PeerStatusSettings() - peerStatusSettings.insert(.canReport) - } - } else { + let cachedData = transaction.getPeerCachedData(peerId: peer.id) + + if let cachedData = cachedData as? CachedUserData { + if cachedData.peerStatusSettings != nil { + return .complete() + } + } else if let cachedData = cachedData as? CachedGroupData { + if cachedData.peerStatusSettings != nil { + return .complete() + } + } else if let cachedData = cachedData as? CachedChannelData { + if cachedData.peerStatusSettings != nil { + return .complete() + } + } else if let cachedData = cachedData as? CachedSecretChatData { + if cachedData.peerStatusSettings != nil { + return .complete() + } + } + + if peer.id.namespace == Namespaces.Peer.SecretChat { + return postbox.transaction { transaction -> Void in + var peerStatusSettings: PeerStatusSettings + if let peer = transaction.getPeer(peer.id), let associatedPeerId = peer.associatedPeerId, !transaction.isPeerContact(peerId: associatedPeerId) { + if let peer = peer as? TelegramSecretChat, case .creator = peer.role { peerStatusSettings = PeerStatusSettings() peerStatusSettings = [] + } else { + peerStatusSettings = PeerStatusSettings() + peerStatusSettings.insert(.canReport) } - - transaction.updatePeerCachedData(peerIds: [peerId], update: { peerId, current in - if let current = current as? CachedSecretChatData { - return current.withUpdatedPeerStatusSettings(peerStatusSettings) - } else { - return CachedSecretChatData(peerStatusSettings: peerStatusSettings) + } else { + peerStatusSettings = PeerStatusSettings() + peerStatusSettings = [] + } + + transaction.updatePeerCachedData(peerIds: [peer.id], update: { peerId, current in + if let current = current as? CachedSecretChatData { + return current.withUpdatedPeerStatusSettings(peerStatusSettings) + } else { + return CachedSecretChatData(peerStatusSettings: peerStatusSettings) + } + }) + } + } else if let inputPeer = apiInputPeer(peer) { + return network.request(Api.functions.messages.getPeerSettings(peer: inputPeer)) + |> retryRequest + |> mapToSignal { peerSettings -> Signal in + let peerStatusSettings = PeerStatusSettings(apiSettings: peerSettings) + + return postbox.transaction { transaction -> Void in + transaction.updatePeerCachedData(peerIds: Set([peer.id]), update: { _, current in + switch peer.id.namespace { + case Namespaces.Peer.CloudUser: + let previous: CachedUserData + if let current = current as? CachedUserData { + previous = current + } else { + previous = CachedUserData() + } + return previous.withUpdatedPeerStatusSettings(peerStatusSettings) + case Namespaces.Peer.CloudGroup: + let previous: CachedGroupData + if let current = current as? CachedGroupData { + previous = current + } else { + previous = CachedGroupData() + } + return previous.withUpdatedPeerStatusSettings(peerStatusSettings) + case Namespaces.Peer.CloudChannel: + let previous: CachedChannelData + if let current = current as? CachedChannelData { + previous = current + } else { + previous = CachedChannelData() + } + return previous.withUpdatedPeerStatusSettings(peerStatusSettings) + default: + break } + return current }) } - } else if let inputPeer = apiInputPeer(peer) { - return network.request(Api.functions.messages.getPeerSettings(peer: inputPeer)) - |> retryRequest - |> mapToSignal { peerSettings -> Signal in - let peerStatusSettings = PeerStatusSettings(apiSettings: peerSettings) - - return postbox.transaction { transaction -> Void in - transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in - switch peerId.namespace { - case Namespaces.Peer.CloudUser: - let previous: CachedUserData - if let current = current as? CachedUserData { - previous = current - } else { - previous = CachedUserData() - } - return previous.withUpdatedPeerStatusSettings(peerStatusSettings) - case Namespaces.Peer.CloudGroup: - let previous: CachedGroupData - if let current = current as? CachedGroupData { - previous = current - } else { - previous = CachedGroupData() - } - return previous.withUpdatedPeerStatusSettings(peerStatusSettings) - case Namespaces.Peer.CloudChannel: - let previous: CachedChannelData - if let current = current as? CachedChannelData { - previous = current - } else { - previous = CachedChannelData() - } - return previous.withUpdatedPeerStatusSettings(peerStatusSettings) - default: - break - } - return current - }) - } - } - } else { - return .complete() } } else { return .complete() } - } |> switchToLatest + } + |> switchToLatest } -func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId: PeerId, network: Network, postbox: Postbox) -> Signal { - return postbox.transaction { transaction -> (Api.InputUser?, Peer?) in - if peerId == accountPeerId { - return (.inputUserSelf, transaction.getPeer(peerId)) +func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerId, network: Network, postbox: Postbox) -> Signal { + return postbox.transaction { transaction -> (Api.InputUser?, Peer?, PeerId) in + guard let rawPeer = transaction.getPeer(rawPeerId) else { + if rawPeerId == accountPeerId { + return (.inputUserSelf, transaction.getPeer(rawPeerId), rawPeerId) + } else { + return (nil, nil, rawPeerId) + } + } + + let peer: Peer + if let secretChat = rawPeer as? TelegramSecretChat { + guard let user = transaction.getPeer(secretChat.regularPeerId) else { + return (nil, nil, rawPeerId) + } + peer = user } else { - let peer = transaction.getPeer(peerId) - return (peer.flatMap(apiInputUser), peer) + peer = rawPeer + } + + if rawPeerId == accountPeerId { + return (.inputUserSelf, transaction.getPeer(rawPeerId), rawPeerId) + } else { + return (apiInputUser(peer), peer, peer.id) } } - |> mapToSignal { inputUser, maybePeer -> Signal in + |> mapToSignal { inputUser, maybePeer, peerId -> Signal in if let inputUser = inputUser { return network.request(Api.functions.users.getFullUser(id: inputUser)) |> retryRequest @@ -250,7 +278,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId: PeerId, network } switch fullChat { - case let .channelFull(flags, _, about, participantsCount, adminsCount, kickedCount, bannedCount, _, _, _, _, _, _, apiExportedInvite, apiBotInfos, migratedFromChatId, migratedFromMaxId, pinnedMsgId, stickerSet, minAvailableMsgId, folderId, linkedChatId, pts): + case let .channelFull(flags, _, about, participantsCount, adminsCount, kickedCount, bannedCount, _, _, _, _, _, _, apiExportedInvite, apiBotInfos, migratedFromChatId, migratedFromMaxId, pinnedMsgId, stickerSet, minAvailableMsgId, folderId, linkedChatId, location, pts): var channelFlags = CachedChannelFlags() if (flags & (1 << 3)) != 0 { channelFlags.insert(.canDisplayParticipants) @@ -269,13 +297,19 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId: PeerId, network } let linkedDiscussionPeerId: PeerId? - if let linkedChatId = linkedChatId, linkedChatId != 0 { linkedDiscussionPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: linkedChatId) } else { linkedDiscussionPeerId = nil } + let peerGeoLocation: PeerGeoLocation? + if let location = location { + peerGeoLocation = PeerGeoLocation(apiLocation: location) + } else { + peerGeoLocation = nil + } + var botInfos: [CachedPeerBotInfo] = [] for botInfo in apiBotInfos { switch botInfo { @@ -363,6 +397,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId: PeerId, network .withUpdatedMinAvailableMessageId(minAvailableMessageId) .withUpdatedMigrationReference(migrationReference) .withUpdatedLinkedDiscussionPeerId(linkedDiscussionPeerId) + .withUpdatedPeerGeoLocation(peerGeoLocation: peerGeoLocation) }) if let minAvailableMessageId = minAvailableMessageId, minAvailableMessageIdUpdated { diff --git a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj index c35cf28d1a..9f0cd7d362 100644 --- a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj @@ -451,6 +451,8 @@ D073CEA11DCBF3D3007511FD /* StickerPack.swift in Sources */ = {isa = PBXBuildFile; fileRef = D021E0DE1DB539FC00C6B04F /* StickerPack.swift */; }; D073CEA41DCBF3EA007511FD /* MultipartUpload.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03C53761DAFF20F004C17B3 /* MultipartUpload.swift */; }; D073CEA51DCBF3F5007511FD /* StickerManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = D021E0E11DB5401A00C6B04F /* StickerManagement.swift */; }; + D0750C9022B2FD8300BE5F6E /* PeerAccessHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0750C8F22B2FD8300BE5F6E /* PeerAccessHash.swift */; }; + D0750C9122B2FD8300BE5F6E /* PeerAccessHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0750C8F22B2FD8300BE5F6E /* PeerAccessHash.swift */; }; D0754D2A1EEE10FC00884F6E /* BotPaymentForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0754D291EEE10FC00884F6E /* BotPaymentForm.swift */; }; D0754D2B1EEE10FC00884F6E /* BotPaymentForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0754D291EEE10FC00884F6E /* BotPaymentForm.swift */; }; D076F8892296D8E9004F895A /* ManageChannelDiscussionGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = D076F8882296D8E9004F895A /* ManageChannelDiscussionGroup.swift */; }; @@ -1066,6 +1068,7 @@ D07047B91F3DF75500F6A8D4 /* ConsumePersonalMessageAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsumePersonalMessageAction.swift; sourceTree = ""; }; D073CE5C1DCB97F6007511FD /* ForwardSourceInfoAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForwardSourceInfoAttribute.swift; sourceTree = ""; }; D073CE5F1DCB9D14007511FD /* OutgoingMessageInfoAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutgoingMessageInfoAttribute.swift; sourceTree = ""; }; + D0750C8F22B2FD8300BE5F6E /* PeerAccessHash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerAccessHash.swift; sourceTree = ""; }; D0754D291EEE10FC00884F6E /* BotPaymentForm.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BotPaymentForm.swift; sourceTree = ""; }; D076F8882296D8E9004F895A /* ManageChannelDiscussionGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManageChannelDiscussionGroup.swift; sourceTree = ""; }; D07827BA1E00451F00071108 /* SearchPeers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchPeers.swift; sourceTree = ""; }; @@ -1445,6 +1448,7 @@ D03B0CDA1D62245F00955575 /* ApiUtils.swift */, D03B0CD81D62245B00955575 /* PeerUtils.swift */, D09A2FEA1D7CDC320018FB72 /* PeerAccessRestrictionInfo.swift */, + D0750C8F22B2FD8300BE5F6E /* PeerAccessHash.swift */, D03B0CD41D62245300955575 /* TelegramUser.swift */, D03B0CD51D62245300955575 /* TelegramGroup.swift */, D09A2FE51D7CD4940018FB72 /* TelegramChannel.swift */, @@ -2398,6 +2402,7 @@ D0E412E7206ABC7500BEE4A2 /* EncryptedMediaResource.swift in Sources */, D0AB262621C2F991008F6685 /* TelegramMediaPoll.swift in Sources */, D0BC38791E40BAF20044D6FE /* SynchronizePinnedChatsOperation.swift in Sources */, + D0750C9022B2FD8300BE5F6E /* PeerAccessHash.swift in Sources */, D0FC195B2020D1CA00FEDBB2 /* PeerGroupMessageStateVersionAttribute.swift in Sources */, D0B1671D1F9EA2C300976B40 /* ChatHistoryPreloadManager.swift in Sources */, D02B199021FB1D520094A764 /* RegisterNotificationToken.swift in Sources */, @@ -2661,6 +2666,7 @@ D0C26D6A1FE02402004ABF18 /* ManagedSynchronizeGroupedPeersOperations.swift in Sources */, D01C7F051EFC1C49008305F1 /* DeviceContact.swift in Sources */, D050F26A1E4A5B6D00988324 /* ManagedGlobalNotificationSettings.swift in Sources */, + D0750C9122B2FD8300BE5F6E /* PeerAccessHash.swift in Sources */, D050F26B1E4A5B6D00988324 /* ApplyMaxReadIndexInteractively.swift in Sources */, D033FEB11E61EB0200644997 /* PeerContactSettings.swift in Sources */, D0458C891E69B4AB00FB34C1 /* OutgoingContentInfoMessageAttribute.swift in Sources */, diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift index cfa34ff969..ec501447e5 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift @@ -136,6 +136,8 @@ private let chatList = PresentationThemeChatList( messageDraftTextColor: UIColor(rgb: 0xdd4b39), //!!! checkmarkColor: accentColor, pendingIndicatorColor: UIColor(rgb: 0x8E8E93), + failedFillColor: destructiveColor, + failedForegroundColor: .white, muteIconColor: UIColor(rgb: 0x8E8E93), unreadBadgeActiveBackgroundColor: accentColor, unreadBadgeActiveTextColor: UIColor(rgb: 0xffffff), diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index 5a321e7e17..33f1543c78 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -134,6 +134,8 @@ private let chatList = PresentationThemeChatList( messageDraftTextColor: UIColor(rgb: 0xdd4b39), //!!! checkmarkColor: UIColor(rgb: 0xffffff), pendingIndicatorColor: UIColor(rgb: 0xffffff), //!!! + failedFillColor: destructiveColor, + failedForegroundColor: .white, muteIconColor: UIColor(rgb: 0x8e8e93), //!!! unreadBadgeActiveBackgroundColor: UIColor(rgb: 0xffffff), unreadBadgeActiveTextColor: UIColor(rgb: 0x000000), diff --git a/submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift index a59421ae56..68f6c6bfbe 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift @@ -134,6 +134,8 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun messageDraftTextColor: UIColor(rgb: 0xdd4b39), checkmarkColor: UIColor(rgb: 0x21c004), pendingIndicatorColor: UIColor(rgb: 0x8e8e93), + failedFillColor: destructiveColor, + failedForegroundColor: .white, muteIconColor: UIColor(rgb: 0xa7a7ad), unreadBadgeActiveBackgroundColor: accentColor, unreadBadgeActiveTextColor: .white, @@ -168,6 +170,8 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun messageDraftTextColor: UIColor(rgb: 0xdd4b39), checkmarkColor: accentColor, pendingIndicatorColor: UIColor(rgb: 0x8e8e93), + failedFillColor: destructiveColor, + failedForegroundColor: .white, muteIconColor: UIColor(rgb: 0xa7a7ad), unreadBadgeActiveBackgroundColor: accentColor, unreadBadgeActiveTextColor: .white, @@ -184,7 +188,7 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun secretIconColor: secretColor, pinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: (UIColor(rgb: 0x72d5fd), UIColor(rgb: 0x2a9ef1)), foregroundColor: .white), unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: (UIColor(rgb: 0xDEDEE5), UIColor(rgb: 0xC5C6CC)), foregroundColor: .white), - onlineDotColor: accentColor + onlineDotColor: UIColor(rgb: 0x4cc91f) ) let bubble = PresentationThemeChatBubble( diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 4b889b9837..4a0a6e1733 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -88,7 +88,7 @@ private func extractArgumentRanges(_ value: String) -> [(Int, NSRange)] { return result } -public func formatWithArgumentRanges(_ value: String, _ ranges: [(Int, NSRange)], _ arguments: [String]) -> (String, [(Int, NSRange)]) { +func formatWithArgumentRanges(_ value: String, _ ranges: [(Int, NSRange)], _ arguments: [String]) -> (String, [(Int, NSRange)]) { let string = value as NSString var resultingRanges: [(Int, NSRange)] = [] @@ -139,7 +139,7 @@ private final class DataReader { } private func loadMapping() -> ([Int], [String], [Int], [Int], [String]) { - guard let filePath = Bundle(for: PresentationStrings.self).path(forResource: "PresentationStrings", ofType: "mapping") else { + guard let filePath = frameworkBundle.path(forResource: "PresentationStrings", ofType: "mapping") else { fatalError() } guard let data = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else { @@ -371,3523 +371,3550 @@ public final class PresentationStrings { public var WallpaperPreview_SwipeTopText: String { return self._s[174]! } public var ArchivedChats_IntroText2: String { return self._s[175]! } public var Notification_Exceptions_DeleteAll: String { return self._s[176]! } - public var ChatSearch_SearchPlaceholder: String { return self._s[178]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[179]! } - public var NotificationsSound_Aurora: String { return self._s[180]! } + public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[177]!, self._r[177]!, [_1, _2]) + } + public var ChatSearch_SearchPlaceholder: String { return self._s[179]! } + public var Passport_FieldAddressTranslationHelp: String { return self._s[180]! } + public var NotificationsSound_Aurora: String { return self._s[181]! } public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[181]!, self._r[181]!, [_0]) + return formatWithArgumentRanges(self._s[182]!, self._r[182]!, [_0]) } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[184]! } + public var AuthSessions_LoggedInWithTelegram: String { return self._s[185]! } public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[185]!, self._r[185]!, [_0, _1]) + return formatWithArgumentRanges(self._s[186]!, self._r[186]!, [_0, _1]) } - public var Passport_PasswordNext: String { return self._s[186]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[187]! } - public var EmptyGroupInfo_Line2: String { return self._s[188]! } - public var Settings_FAQ_Intro: String { return self._s[190]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[192]! } - public var FeaturedStickerPacks_Title: String { return self._s[193]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[194]! } - public var Username_Title: String { return self._s[195]! } + public var Passport_PasswordNext: String { return self._s[187]! } + public var Bot_GroupStatusReadsHistory: String { return self._s[188]! } + public var EmptyGroupInfo_Line2: String { return self._s[189]! } + public var Settings_FAQ_Intro: String { return self._s[191]! } + public var PrivacySettings_PasscodeAndTouchId: String { return self._s[193]! } + public var FeaturedStickerPacks_Title: String { return self._s[194]! } + public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[195]! } + public var Username_Title: String { return self._s[196]! } public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[196]!, self._r[196]!, [_0]) + return formatWithArgumentRanges(self._s[197]!, self._r[197]!, [_0]) } - public var PasscodeSettings_AlphanumericCode: String { return self._s[197]! } - public var Localization_LanguageOther: String { return self._s[198]! } - public var Stickers_SuggestStickers: String { return self._s[199]! } + public var PasscodeSettings_AlphanumericCode: String { return self._s[198]! } + public var Localization_LanguageOther: String { return self._s[199]! } + public var Stickers_SuggestStickers: String { return self._s[200]! } public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[200]!, self._r[200]!, [_0]) + return formatWithArgumentRanges(self._s[201]!, self._r[201]!, [_0]) } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[201]! } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[202]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[203]! } + public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[202]! } + public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[203]! } + public var Conversation_DefaultRestrictedStickers: String { return self._s[204]! } public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[204]!, self._r[204]!, [_0]) + return formatWithArgumentRanges(self._s[205]!, self._r[205]!, [_0]) } - public var Group_UpgradeConfirmation: String { return self._s[206]! } - public var DialogList_Unpin: String { return self._s[207]! } - public var Passport_Identity_DateOfBirth: String { return self._s[208]! } - public var Month_ShortOctober: String { return self._s[209]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[210]! } - public var Notification_CallCanceledShort: String { return self._s[211]! } - public var Passport_Phone_Help: String { return self._s[212]! } - public var Passport_Language_az: String { return self._s[214]! } - public var CreatePoll_TextPlaceholder: String { return self._s[216]! } - public var PeopleNearby_Channels: String { return self._s[217]! } - public var Passport_Identity_DocumentNumber: String { return self._s[218]! } - public var PhotoEditor_CurvesRed: String { return self._s[219]! } - public var PhoneNumberHelp_Alert: String { return self._s[221]! } - public var SocksProxySetup_Port: String { return self._s[222]! } - public var Checkout_PayNone: String { return self._s[223]! } - public var AutoDownloadSettings_WiFi: String { return self._s[224]! } - public var GroupInfo_GroupType: String { return self._s[225]! } - public var StickerSettings_ContextHide: String { return self._s[226]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[227]! } - public var Group_Setup_HistoryTitle: String { return self._s[229]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[230]! } - public var PasscodeSettings_AutoLock: String { return self._s[231]! } - public var Passport_Title: String { return self._s[232]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[233]! } - public var GroupPermission_NoSendGifs: String { return self._s[234]! } - public var PrivacySettings_PasscodeOn: String { return self._s[235]! } - public var State_WaitingForNetwork: String { return self._s[237]! } + public var Group_UpgradeConfirmation: String { return self._s[207]! } + public var DialogList_Unpin: String { return self._s[208]! } + public var Passport_Identity_DateOfBirth: String { return self._s[209]! } + public var Month_ShortOctober: String { return self._s[210]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[211]! } + public var Notification_CallCanceledShort: String { return self._s[212]! } + public var Passport_Phone_Help: String { return self._s[213]! } + public var Passport_Language_az: String { return self._s[215]! } + public var CreatePoll_TextPlaceholder: String { return self._s[217]! } + public var PeopleNearby_Channels: String { return self._s[218]! } + public var Passport_Identity_DocumentNumber: String { return self._s[219]! } + public var PhotoEditor_CurvesRed: String { return self._s[220]! } + public var PhoneNumberHelp_Alert: String { return self._s[222]! } + public var SocksProxySetup_Port: String { return self._s[223]! } + public var Checkout_PayNone: String { return self._s[224]! } + public var AutoDownloadSettings_WiFi: String { return self._s[225]! } + public var GroupInfo_GroupType: String { return self._s[226]! } + public var StickerSettings_ContextHide: String { return self._s[227]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[228]! } + public var Group_Setup_HistoryTitle: String { return self._s[230]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[231]! } + public var PasscodeSettings_AutoLock: String { return self._s[232]! } + public var Passport_Title: String { return self._s[233]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[234]! } + public var GroupPermission_NoSendGifs: String { return self._s[235]! } + public var PrivacySettings_PasscodeOn: String { return self._s[236]! } + public var State_WaitingForNetwork: String { return self._s[238]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[238]!, self._r[238]!, [_0, _1]) + return formatWithArgumentRanges(self._s[239]!, self._r[239]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[240]! } + public var Calls_NotNow: String { return self._s[241]! } public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[241]!, self._r[241]!, [_0]) + return formatWithArgumentRanges(self._s[242]!, self._r[242]!, [_0]) } - public var UserInfo_SendMessage: String { return self._s[242]! } - public var TwoStepAuth_PasswordSet: String { return self._s[243]! } - public var Passport_DeleteDocument: String { return self._s[244]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[245]! } + public var UserInfo_SendMessage: String { return self._s[243]! } + public var TwoStepAuth_PasswordSet: String { return self._s[244]! } + public var Passport_DeleteDocument: String { return self._s[245]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[246]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[246]!, self._r[246]!, [_1]) + return formatWithArgumentRanges(self._s[247]!, self._r[247]!, [_1]) } - public var GroupRemoved_Remove: String { return self._s[247]! } - public var Passport_FieldIdentity: String { return self._s[248]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[249]! } - public var Conversation_Processing: String { return self._s[251]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[253]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[256]! } - public var Month_GenFebruary: String { return self._s[257]! } + public var GroupRemoved_Remove: String { return self._s[248]! } + public var Passport_FieldIdentity: String { return self._s[249]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[250]! } + public var Conversation_Processing: String { return self._s[252]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[254]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[257]! } + public var Month_GenFebruary: String { return self._s[258]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[259]!, self._r[259]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[260]!, self._r[260]!, [_1, _2, _3, _4, _5]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[260]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[262]! } - public var GroupInfo_AddParticipant: String { return self._s[263]! } - public var KeyCommand_SendMessage: String { return self._s[264]! } - public var Map_LiveLocationShowAll: String { return self._s[266]! } - public var WallpaperSearch_ColorOrange: String { return self._s[268]! } - public var Appearance_AppIconDefaultX: String { return self._s[269]! } - public var Checkout_Receipt_Title: String { return self._s[270]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[271]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[272]! } - public var Message_Contact: String { return self._s[273]! } - public var Call_StatusIncoming: String { return self._s[274]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[261]! } + public var AutoDownloadSettings_DataUsageMedium: String { return self._s[263]! } + public var GroupInfo_AddParticipant: String { return self._s[264]! } + public var KeyCommand_SendMessage: String { return self._s[265]! } + public var Map_LiveLocationShowAll: String { return self._s[267]! } + public var WallpaperSearch_ColorOrange: String { return self._s[269]! } + public var Appearance_AppIconDefaultX: String { return self._s[270]! } + public var Checkout_Receipt_Title: String { return self._s[271]! } + public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[272]! } + public var WallpaperPreview_PreviewTopText: String { return self._s[273]! } + public var Message_Contact: String { return self._s[274]! } + public var Call_StatusIncoming: String { return self._s[275]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[275]!, self._r[275]!, [_1]) + return formatWithArgumentRanges(self._s[276]!, self._r[276]!, [_1]) } public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[277]!, self._r[277]!, [_1]) + return formatWithArgumentRanges(self._s[278]!, self._r[278]!, [_1]) } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[278]! } - public var Conversation_ViewChannel: String { return self._s[279]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[279]! } + public var Conversation_ViewChannel: String { return self._s[280]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[280]!, self._r[280]!, [_0]) + return formatWithArgumentRanges(self._s[281]!, self._r[281]!, [_0]) } - public var Passport_Language_nl: String { return self._s[282]! } - public var Camera_Retake: String { return self._s[283]! } + public var Passport_Language_nl: String { return self._s[283]! } + public var Camera_Retake: String { return self._s[284]! } public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[284]!, self._r[284]!, [_0]) + return formatWithArgumentRanges(self._s[285]!, self._r[285]!, [_0]) } - public var AuthSessions_LogOutApplications: String { return self._s[285]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[286]! } - public var Tour_Title6: String { return self._s[287]! } - public var Map_ChooseAPlace: String { return self._s[288]! } - public var CallSettings_Never: String { return self._s[290]! } + public var AuthSessions_LogOutApplications: String { return self._s[286]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[287]! } + public var Tour_Title6: String { return self._s[288]! } + public var Map_ChooseAPlace: String { return self._s[289]! } + public var CallSettings_Never: String { return self._s[291]! } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[291]!, self._r[291]!, [_0]) + return formatWithArgumentRanges(self._s[292]!, self._r[292]!, [_0]) } - public var ChannelRemoved_RemoveInfo: String { return self._s[292]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[293]! } public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[293]!, self._r[293]!, [_0]) + return formatWithArgumentRanges(self._s[294]!, self._r[294]!, [_0]) } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[294]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[295]! } public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[295]!, self._r[295]!, [_0]) + return formatWithArgumentRanges(self._s[296]!, self._r[296]!, [_0]) } - public var GroupInfo_InviteLink_Title: String { return self._s[296]! } + public var GroupInfo_InviteLink_Title: String { return self._s[297]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[297]!, self._r[297]!, [_1, _2]) + return formatWithArgumentRanges(self._s[298]!, self._r[298]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[298]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[299]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[300]! } + public var KeyCommand_ScrollUp: String { return self._s[299]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[300]! } + public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[301]! } public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[301]!, self._r[301]!, [_0]) + return formatWithArgumentRanges(self._s[302]!, self._r[302]!, [_0]) } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[302]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[303]! } - public var Weekday_Tuesday: String { return self._s[305]! } - public var UserInfo_StartSecretChat: String { return self._s[307]! } - public var Passport_Identity_FilesTitle: String { return self._s[308]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[309]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[311]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[312]! } - public var AuthSessions_Sessions: String { return self._s[313]! } + public var CallFeedback_ReasonDistortedSpeech: String { return self._s[303]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[304]! } + public var Weekday_Tuesday: String { return self._s[306]! } + public var UserInfo_StartSecretChat: String { return self._s[308]! } + public var Passport_Identity_FilesTitle: String { return self._s[309]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[310]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[312]! } + public var ChatList_UndoArchiveRevealedTitle: String { return self._s[313]! } + public var AuthSessions_Sessions: String { return self._s[314]! } public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[315]!, self._r[315]!, [_0]) + return formatWithArgumentRanges(self._s[316]!, self._r[316]!, [_0]) } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[316]! } - public var Call_StatusWaiting: String { return self._s[317]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[318]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[319]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[320]! } - public var LogoutOptions_AddAccountText: String { return self._s[321]! } - public var PasscodeSettings_6DigitCode: String { return self._s[322]! } - public var Settings_LogoutConfirmationText: String { return self._s[323]! } - public var Passport_Identity_TypePassport: String { return self._s[325]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[317]! } + public var Call_StatusWaiting: String { return self._s[318]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[319]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[320]! } + public var WallpaperPreview_CustomColorBottomText: String { return self._s[321]! } + public var LogoutOptions_AddAccountText: String { return self._s[322]! } + public var PasscodeSettings_6DigitCode: String { return self._s[323]! } + public var Settings_LogoutConfirmationText: String { return self._s[324]! } + public var Passport_Identity_TypePassport: String { return self._s[326]! } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[328]!, self._r[328]!, [_1, _2]) + return formatWithArgumentRanges(self._s[329]!, self._r[329]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[329]! } - public var AccessDenied_SaveMedia: String { return self._s[330]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[332]! } - public var Settings_Title: String { return self._s[334]! } - public var Contacts_InviteSearchLabel: String { return self._s[336]! } - public var ConvertToSupergroup_Title: String { return self._s[337]! } + public var SocksProxySetup_SaveProxy: String { return self._s[330]! } + public var AccessDenied_SaveMedia: String { return self._s[331]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[333]! } + public var Settings_Title: String { return self._s[335]! } + public var Contacts_InviteSearchLabel: String { return self._s[337]! } + public var ConvertToSupergroup_Title: String { return self._s[338]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[338]!, self._r[338]!, [_0]) + return formatWithArgumentRanges(self._s[339]!, self._r[339]!, [_0]) } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[339]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[340]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[340]!, self._r[340]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[341]!, self._r[341]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[341]! } - public var UserInfo_BotHelp: String { return self._s[342]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[343]! } - public var Checkout_Name: String { return self._s[344]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[345]! } - public var Channel_BanUser_BlockFor: String { return self._s[346]! } - public var Checkout_ShippingAddress: String { return self._s[347]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[348]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[349]! } - public var Privacy_Forwards: String { return self._s[350]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[351]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[342]! } + public var UserInfo_BotHelp: String { return self._s[343]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[344]! } + public var Checkout_Name: String { return self._s[345]! } + public var AutoDownloadSettings_DataUsage: String { return self._s[346]! } + public var Channel_BanUser_BlockFor: String { return self._s[347]! } + public var Checkout_ShippingAddress: String { return self._s[348]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[349]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[350]! } + public var Privacy_Forwards: String { return self._s[351]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[352]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_0]) + return formatWithArgumentRanges(self._s[355]!, self._r[355]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[355]! } - public var Group_OwnershipTransfer_Title: String { return self._s[356]! } - public var Group_LeaveGroup: String { return self._s[357]! } - public var Settings_UsernameEmpty: String { return self._s[358]! } + public var Contacts_SortedByName: String { return self._s[356]! } + public var Group_OwnershipTransfer_Title: String { return self._s[357]! } + public var Group_LeaveGroup: String { return self._s[358]! } + public var Settings_UsernameEmpty: String { return self._s[359]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[359]!, self._r[359]!, [_0]) + return formatWithArgumentRanges(self._s[360]!, self._r[360]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[360]!, self._r[360]!, [_1]) + return formatWithArgumentRanges(self._s[361]!, self._r[361]!, [_1]) } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[361]!, self._r[361]!, [_1, _2]) + return formatWithArgumentRanges(self._s[362]!, self._r[362]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[362]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[364]! } - public var UserInfo_AddToExisting: String { return self._s[365]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[366]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[367]! } + public var Message_ImageExpired: String { return self._s[363]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[365]! } + public var UserInfo_AddToExisting: String { return self._s[366]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[367]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[368]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[368]!, self._r[368]!, [_1]) + return formatWithArgumentRanges(self._s[369]!, self._r[369]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[369]! } - public var Passport_Language_km: String { return self._s[370]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[372]! } - public var Notification_CallMissedShort: String { return self._s[373]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[374]! } - public var Watch_Compose_Send: String { return self._s[375]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[378]! } - public var Conversation_HoldForVideo: String { return self._s[379]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[381]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[383]! } - public var Channel_LinkItem: String { return self._s[384]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[370]! } + public var Passport_Language_km: String { return self._s[371]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[373]! } + public var Notification_CallMissedShort: String { return self._s[374]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[375]! } + public var Watch_Compose_Send: String { return self._s[376]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[379]! } + public var Conversation_HoldForVideo: String { return self._s[380]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[382]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[384]! } + public var Channel_LinkItem: String { return self._s[385]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[385]!, self._r[385]!, [_0, _1]) + return formatWithArgumentRanges(self._s[386]!, self._r[386]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[388]!, self._r[388]!, [_0]) + return formatWithArgumentRanges(self._s[389]!, self._r[389]!, [_0]) } - public var Passport_Language_dv: String { return self._s[389]! } - public var Undo_LeftChannel: String { return self._s[390]! } - public var Notifications_ExceptionsMuted: String { return self._s[391]! } - public var ChatList_UnhideAction: String { return self._s[392]! } - public var Conversation_ContextMenuShare: String { return self._s[393]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[394]! } - public var ShareFileTip_Title: String { return self._s[395]! } - public var NotificationsSound_Chord: String { return self._s[396]! } + public var Passport_Language_dv: String { return self._s[390]! } + public var Undo_LeftChannel: String { return self._s[391]! } + public var Notifications_ExceptionsMuted: String { return self._s[392]! } + public var ChatList_UnhideAction: String { return self._s[393]! } + public var Conversation_ContextMenuShare: String { return self._s[394]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[395]! } + public var ShareFileTip_Title: String { return self._s[396]! } + public var NotificationsSound_Chord: String { return self._s[397]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[397]!, self._r[397]!, [_1, _2]) + return formatWithArgumentRanges(self._s[398]!, self._r[398]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[398]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[399]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[399]!, self._r[399]!, [_0]) + return formatWithArgumentRanges(self._s[400]!, self._r[400]!, [_0]) } - public var Notification_CallOutgoingShort: String { return self._s[401]! } + public var Notification_CallOutgoingShort: String { return self._s[402]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[402]!, self._r[402]!, [_1, _2]) + return formatWithArgumentRanges(self._s[403]!, self._r[403]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[403]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[404]! } - public var ReportPeer_Report: String { return self._s[405]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[406]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[407]! } - public var StickerPack_Send: String { return self._s[408]! } - public var Login_CodeSentInternal: String { return self._s[409]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[410]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[404]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[405]! } + public var ReportPeer_Report: String { return self._s[406]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[407]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[408]! } + public var StickerPack_Send: String { return self._s[409]! } + public var Login_CodeSentInternal: String { return self._s[410]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[411]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[411]!, self._r[411]!, [_0]) + return formatWithArgumentRanges(self._s[412]!, self._r[412]!, [_0]) } public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[413]!, self._r[413]!, [_0]) + return formatWithArgumentRanges(self._s[414]!, self._r[414]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[414]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[415]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[415]!, self._r[415]!, [_1]) + return formatWithArgumentRanges(self._s[416]!, self._r[416]!, [_1]) } - public var ReportPeer_ReasonViolence: String { return self._s[417]! } - public var Map_Locating: String { return self._s[418]! } - public var AutoDownloadSettings_GroupChats: String { return self._s[420]! } - public var CheckoutInfo_SaveInfo: String { return self._s[421]! } - public var SharedMedia_EmptyLinksText: String { return self._s[423]! } - public var Passport_Address_CityPlaceholder: String { return self._s[424]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[425]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[426]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[428]! } + public var ReportPeer_ReasonViolence: String { return self._s[418]! } + public var Map_Locating: String { return self._s[419]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[421]! } + public var CheckoutInfo_SaveInfo: String { return self._s[422]! } + public var SharedMedia_EmptyLinksText: String { return self._s[424]! } + public var Passport_Address_CityPlaceholder: String { return self._s[425]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[426]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[427]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[429]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[429]!, self._r[429]!, [_1]) + return formatWithArgumentRanges(self._s[430]!, self._r[430]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[430]!, self._r[430]!, [_0]) + return formatWithArgumentRanges(self._s[431]!, self._r[431]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[431]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[432]! } - public var ChangePhoneNumberCode_Code: String { return self._s[433]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[432]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[433]! } + public var ChangePhoneNumberCode_Code: String { return self._s[434]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[434]!, self._r[434]!, [_0]) + return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[435]! } - public var HashtagSearch_AllChats: String { return self._s[436]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[438]! } + public var TwoStepAuth_SetupEmail: String { return self._s[436]! } + public var HashtagSearch_AllChats: String { return self._s[437]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[439]! } public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[439]!, self._r[439]!, [_0]) + return formatWithArgumentRanges(self._s[440]!, self._r[440]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[441]! } + public var PhotoEditor_QualityHigh: String { return self._s[442]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[442]!, self._r[442]!, [_0]) + return formatWithArgumentRanges(self._s[443]!, self._r[443]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[443]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[444]! } - public var Message_LiveLocation: String { return self._s[445]! } - public var Cache_LowDiskSpaceText: String { return self._s[446]! } - public var Conversation_SendMessage: String { return self._s[447]! } - public var AuthSessions_EmptyTitle: String { return self._s[448]! } - public var Privacy_PhoneNumber: String { return self._s[449]! } - public var PeopleNearby_CreateGroup: String { return self._s[450]! } - public var CallSettings_UseLessData: String { return self._s[451]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[452]! } - public var Stickers_AddToFavorites: String { return self._s[453]! } - public var PhotoEditor_QualityLow: String { return self._s[454]! } - public var Watch_UserInfo_Unblock: String { return self._s[455]! } - public var Settings_Logout: String { return self._s[456]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[444]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[445]! } + public var Message_LiveLocation: String { return self._s[446]! } + public var Cache_LowDiskSpaceText: String { return self._s[447]! } + public var Conversation_SendMessage: String { return self._s[448]! } + public var AuthSessions_EmptyTitle: String { return self._s[449]! } + public var Privacy_PhoneNumber: String { return self._s[450]! } + public var PeopleNearby_CreateGroup: String { return self._s[451]! } + public var CallSettings_UseLessData: String { return self._s[452]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[453]! } + public var Stickers_AddToFavorites: String { return self._s[454]! } + public var PhotoEditor_QualityLow: String { return self._s[455]! } + public var Watch_UserInfo_Unblock: String { return self._s[456]! } + public var Settings_Logout: String { return self._s[457]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[457]!, self._r[457]!, [_1]) + return formatWithArgumentRanges(self._s[458]!, self._r[458]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[458]! } - public var ChannelInfo_Stats: String { return self._s[459]! } - public var TextFormat_Link: String { return self._s[460]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[459]! } + public var ChannelInfo_Stats: String { return self._s[460]! } + public var TextFormat_Link: String { return self._s[461]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[461]!, self._r[461]!, [_1, _2]) + return formatWithArgumentRanges(self._s[462]!, self._r[462]!, [_1, _2]) } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[462]!, self._r[462]!, [_0]) + return formatWithArgumentRanges(self._s[463]!, self._r[463]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[463]! } - public var Group_Setup_TypePublicHelp: String { return self._s[464]! } - public var Passport_Scans_UploadNew: String { return self._s[465]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[466]! } - public var DialogList_Title: String { return self._s[469]! } - public var NotificationSettings_ContactJoined: String { return self._s[470]! } - public var GroupInfo_LabelAdmin: String { return self._s[471]! } - public var KeyCommand_ChatInfo: String { return self._s[472]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[473]! } - public var Call_ReportIncludeLog: String { return self._s[474]! } + public var Watch_Notification_Joined: String { return self._s[464]! } + public var Group_Setup_TypePublicHelp: String { return self._s[465]! } + public var Passport_Scans_UploadNew: String { return self._s[466]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[467]! } + public var DialogList_Title: String { return self._s[470]! } + public var NotificationSettings_ContactJoined: String { return self._s[471]! } + public var GroupInfo_LabelAdmin: String { return self._s[472]! } + public var KeyCommand_ChatInfo: String { return self._s[473]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[474]! } + public var Call_ReportIncludeLog: String { return self._s[475]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[477]!, self._r[477]!, [_0]) + return formatWithArgumentRanges(self._s[478]!, self._r[478]!, [_0]) } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[478]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[479]! } - public var Message_Sticker: String { return self._s[480]! } - public var LastSeen_JustNow: String { return self._s[482]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[484]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[485]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[486]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[487]! } - public var TwoStepAuth_Email: String { return self._s[488]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[489]! } - public var PhotoEditor_BlurToolOff: String { return self._s[490]! } - public var Message_PinnedStickerMessage: String { return self._s[491]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[492]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[493]! } - public var Passport_DiscardMessageTitle: String { return self._s[494]! } - public var Privacy_PaymentsTitle: String { return self._s[495]! } - public var Channel_DiscussionGroup_Header: String { return self._s[497]! } - public var Appearance_ColorTheme: String { return self._s[498]! } - public var UserInfo_ShareContact: String { return self._s[499]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[500]! } - public var Common_More: String { return self._s[501]! } - public var Watch_Message_Call: String { return self._s[502]! } - public var Profile_EncryptionKey: String { return self._s[505]! } - public var Privacy_TopPeers: String { return self._s[506]! } - public var Conversation_StopPollConfirmation: String { return self._s[507]! } - public var Privacy_TopPeersWarning: String { return self._s[509]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[510]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[511]! } - public var DialogList_SearchSectionMessages: String { return self._s[514]! } - public var Notifications_ChannelNotifications: String { return self._s[515]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[516]! } - public var Passport_Language_sk: String { return self._s[517]! } - public var Notification_MessageLifetime1h: String { return self._s[518]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[519]! } - public var Call_ReportSkip: String { return self._s[521]! } - public var Cache_ServiceFiles: String { return self._s[522]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[523]! } - public var Map_Hybrid: String { return self._s[524]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[526]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[528]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[529]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[530]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[533]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[479]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[480]! } + public var Message_Sticker: String { return self._s[481]! } + public var LastSeen_JustNow: String { return self._s[483]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[485]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[486]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[487]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[488]! } + public var TwoStepAuth_Email: String { return self._s[489]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[490]! } + public var PhotoEditor_BlurToolOff: String { return self._s[491]! } + public var Message_PinnedStickerMessage: String { return self._s[492]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[493]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[494]! } + public var Passport_DiscardMessageTitle: String { return self._s[495]! } + public var Privacy_PaymentsTitle: String { return self._s[496]! } + public var Channel_DiscussionGroup_Header: String { return self._s[498]! } + public var Appearance_ColorTheme: String { return self._s[499]! } + public var UserInfo_ShareContact: String { return self._s[500]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[501]! } + public var Common_More: String { return self._s[502]! } + public var Watch_Message_Call: String { return self._s[503]! } + public var Profile_EncryptionKey: String { return self._s[506]! } + public var Privacy_TopPeers: String { return self._s[507]! } + public var Conversation_StopPollConfirmation: String { return self._s[508]! } + public var Privacy_TopPeersWarning: String { return self._s[510]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[511]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[512]! } + public var DialogList_SearchSectionMessages: String { return self._s[515]! } + public var Notifications_ChannelNotifications: String { return self._s[516]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[517]! } + public var Passport_Language_sk: String { return self._s[518]! } + public var Notification_MessageLifetime1h: String { return self._s[519]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[520]! } + public var Call_ReportSkip: String { return self._s[522]! } + public var Cache_ServiceFiles: String { return self._s[523]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[524]! } + public var Map_Hybrid: String { return self._s[525]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[527]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[529]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[530]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[531]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[534]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_1]) + return formatWithArgumentRanges(self._s[535]!, self._r[535]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[536]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[537]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[537]!, self._r[537]!, [_1, _2]) + return formatWithArgumentRanges(self._s[538]!, self._r[538]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[538]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[539]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[540]! } - public var UserInfo_ShareBot: String { return self._s[543]! } + public var Conversation_LiveLocationYou: String { return self._s[539]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[540]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[541]! } + public var UserInfo_ShareBot: String { return self._s[544]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[544]!, self._r[544]!, [_1, _2]) + return formatWithArgumentRanges(self._s[545]!, self._r[545]!, [_1, _2]) } - public var PhotoEditor_ShadowsTint: String { return self._s[545]! } - public var Message_Audio: String { return self._s[546]! } - public var Passport_Language_lt: String { return self._s[547]! } + public var PhotoEditor_ShadowsTint: String { return self._s[546]! } + public var Message_Audio: String { return self._s[547]! } + public var Passport_Language_lt: String { return self._s[548]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[548]!, self._r[548]!, [_0]) + return formatWithArgumentRanges(self._s[549]!, self._r[549]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[549]! } - public var Conversation_FileICloudDrive: String { return self._s[550]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[551]! } + public var Permissions_SiriText_v0: String { return self._s[550]! } + public var Conversation_FileICloudDrive: String { return self._s[551]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[552]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[552]!, self._r[552]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[553]!, self._r[553]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[553]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[554]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[554]!, self._r[554]!, [_0]) + return formatWithArgumentRanges(self._s[555]!, self._r[555]!, [_0]) } - public var Channel_SignMessages: String { return self._s[555]! } + public var Channel_SignMessages: String { return self._s[556]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_1]) + return formatWithArgumentRanges(self._s[557]!, self._r[557]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[557]! } - public var Passport_ScanPassport: String { return self._s[558]! } - public var Watch_Suggestion_Thanks: String { return self._s[559]! } - public var BlockedUsers_AddNew: String { return self._s[560]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[558]! } + public var Passport_ScanPassport: String { return self._s[559]! } + public var Watch_Suggestion_Thanks: String { return self._s[560]! } + public var BlockedUsers_AddNew: String { return self._s[561]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[561]!, self._r[561]!, [_1, _2]) + return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[562]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[563]! } - public var Month_GenJuly: String { return self._s[564]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[565]! } - public var Notification_ChannelInviterSelf: String { return self._s[567]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[568]! } + public var Watch_Message_Invoice: String { return self._s[563]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[564]! } + public var Month_GenJuly: String { return self._s[565]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[566]! } + public var Notification_ChannelInviterSelf: String { return self._s[568]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[569]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[569]!, self._r[569]!, [_1, _2]) + return formatWithArgumentRanges(self._s[570]!, self._r[570]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[570]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[571]! } + public var CheckoutInfo_Title: String { return self._s[571]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[572]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[572]!, self._r[572]!, [_0]) + return formatWithArgumentRanges(self._s[573]!, self._r[573]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[573]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[574]! } - public var Passport_Language_de: String { return self._s[575]! } - public var Update_Title: String { return self._s[576]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[577]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[578]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[579]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[580]! } - public var NotificationsSound_Telegraph: String { return self._s[581]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[582]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[583]! } + public var Passport_Identity_MainPage: String { return self._s[574]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[575]! } + public var Passport_Language_de: String { return self._s[576]! } + public var Update_Title: String { return self._s[577]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[578]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[579]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[580]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[581]! } + public var NotificationsSound_Telegraph: String { return self._s[582]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[583]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[584]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[584]!, self._r[584]!, [_0]) + return formatWithArgumentRanges(self._s[585]!, self._r[585]!, [_0]) } - public var Stickers_SuggestAll: String { return self._s[585]! } - public var Conversation_ForwardTitle: String { return self._s[586]! } + public var Stickers_SuggestAll: String { return self._s[586]! } + public var Conversation_ForwardTitle: String { return self._s[587]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[587]!, self._r[587]!, [_0]) + return formatWithArgumentRanges(self._s[588]!, self._r[588]!, [_0]) } - public var Calls_NewCall: String { return self._s[588]! } - public var Call_StatusEnded: String { return self._s[589]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[590]! } - public var Settings_ProxyConnected: String { return self._s[591]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[592]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[593]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[594]! } - public var Passport_PasswordPlaceholder: String { return self._s[595]! } - public var Message_PinnedInvoice: String { return self._s[596]! } - public var Passport_Identity_IssueDate: String { return self._s[597]! } - public var Passport_Language_pl: String { return self._s[598]! } + public var Calls_NewCall: String { return self._s[589]! } + public var Call_StatusEnded: String { return self._s[590]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[591]! } + public var Settings_ProxyConnected: String { return self._s[592]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[593]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[594]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[595]! } + public var Passport_PasswordPlaceholder: String { return self._s[596]! } + public var Message_PinnedInvoice: String { return self._s[597]! } + public var Passport_Identity_IssueDate: String { return self._s[598]! } + public var Passport_Language_pl: String { return self._s[599]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[599]!, self._r[599]!, [_0]) + return formatWithArgumentRanges(self._s[600]!, self._r[600]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[600]! } - public var Call_StatusConnecting: String { return self._s[601]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[601]! } + public var Call_StatusConnecting: String { return self._s[602]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[602]!, self._r[602]!, [_0]) + return formatWithArgumentRanges(self._s[603]!, self._r[603]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[604]! } - public var Common_Edit: String { return self._s[605]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[606]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[605]! } + public var Common_Edit: String { return self._s[606]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[607]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[607]!, self._r[607]!, [_0]) + return formatWithArgumentRanges(self._s[608]!, self._r[608]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[608]! } - public var PrivateDataSettings_Title: String { return self._s[609]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[610]! } - public var ChatList_Read: String { return self._s[611]! } - public var Undo_ChatClearedForBothSides: String { return self._s[612]! } - public var GroupPermission_SectionTitle: String { return self._s[613]! } + public var GroupInfo_ChatAdmins: String { return self._s[609]! } + public var PrivateDataSettings_Title: String { return self._s[610]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[611]! } + public var ChatList_Read: String { return self._s[612]! } + public var Undo_ChatClearedForBothSides: String { return self._s[613]! } + public var GroupPermission_SectionTitle: String { return self._s[614]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[615]!, self._r[615]!, [_1, _2]) + return formatWithArgumentRanges(self._s[616]!, self._r[616]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[616]! } - public var Update_UpdateApp: String { return self._s[617]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[618]! } - public var Settings_Appearance: String { return self._s[619]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[621]! } - public var Watch_Location_Access: String { return self._s[622]! } - public var ShareMenu_CopyShareLink: String { return self._s[624]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[625]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[617]! } + public var Update_UpdateApp: String { return self._s[618]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[619]! } + public var Settings_Appearance: String { return self._s[620]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[622]! } + public var Watch_Location_Access: String { return self._s[623]! } + public var Group_Location_RemoveLocation: String { return self._s[624]! } + public var ShareMenu_CopyShareLink: String { return self._s[626]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[627]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[627]!, self._r[627]!, [_0]) + return formatWithArgumentRanges(self._s[629]!, self._r[629]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[628]! } - public var Weekday_ShortWednesday: String { return self._s[629]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[630]! } - public var Undo_LeftGroup: String { return self._s[633]! } - public var Conversation_LinkDialogCopy: String { return self._s[634]! } - public var KeyCommand_FocusOnInputField: String { return self._s[636]! } - public var Contacts_SelectAll: String { return self._s[637]! } - public var Preview_SaveToCameraRoll: String { return self._s[638]! } - public var PrivacySettings_PasscodeOff: String { return self._s[639]! } - public var Wallpaper_Title: String { return self._s[640]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[641]! } - public var AccessDenied_Camera: String { return self._s[642]! } - public var Watch_Compose_CurrentLocation: String { return self._s[643]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[645]! } + public var Notifications_ClassicTones: String { return self._s[630]! } + public var Weekday_ShortWednesday: String { return self._s[631]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[632]! } + public var Undo_LeftGroup: String { return self._s[635]! } + public var Conversation_LinkDialogCopy: String { return self._s[636]! } + public var KeyCommand_FocusOnInputField: String { return self._s[638]! } + public var Contacts_SelectAll: String { return self._s[639]! } + public var Preview_SaveToCameraRoll: String { return self._s[640]! } + public var PrivacySettings_PasscodeOff: String { return self._s[641]! } + public var Wallpaper_Title: String { return self._s[642]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[643]! } + public var AccessDenied_Camera: String { return self._s[644]! } + public var Watch_Compose_CurrentLocation: String { return self._s[645]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[647]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[646]!, self._r[646]!, [_0]) + return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[647]! } - public var Passport_Language_ro: String { return self._s[648]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[649]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[649]! } + public var Passport_Language_ro: String { return self._s[650]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[651]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[650]!, self._r[650]!, [_0]) + return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[651]! } - public var State_ConnectingToProxy: String { return self._s[652]! } - public var Calls_RatingTitle: String { return self._s[653]! } - public var Generic_ErrorMoreInfo: String { return self._s[654]! } - public var Appearance_PreviewReplyText: String { return self._s[655]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[656]! } - public var SharedMedia_CategoryLinks: String { return self._s[657]! } - public var Calls_Missed: String { return self._s[658]! } - public var Cache_Photos: String { return self._s[662]! } - public var GroupPermission_NoAddMembers: String { return self._s[663]! } + public var Login_CancelPhoneVerification: String { return self._s[653]! } + public var State_ConnectingToProxy: String { return self._s[654]! } + public var Calls_RatingTitle: String { return self._s[655]! } + public var Generic_ErrorMoreInfo: String { return self._s[656]! } + public var Appearance_PreviewReplyText: String { return self._s[657]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[658]! } + public var SharedMedia_CategoryLinks: String { return self._s[659]! } + public var Calls_Missed: String { return self._s[660]! } + public var Cache_Photos: String { return self._s[664]! } + public var GroupPermission_NoAddMembers: String { return self._s[665]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_0]) + return formatWithArgumentRanges(self._s[666]!, self._r[666]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[665]! } - public var Settings_ProxyDisabled: String { return self._s[666]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[667]! } + public var Settings_ProxyDisabled: String { return self._s[668]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[667]!, self._r[667]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[669]!, self._r[669]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[668]!, self._r[668]!, [_0]) + return formatWithArgumentRanges(self._s[670]!, self._r[670]!, [_0]) } - public var Appearance_Title: String { return self._s[669]! } + public var Appearance_Title: String { return self._s[671]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_0]) + return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_0]) } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[672]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[673]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[674]! } - public var Preview_DeletePhoto: String { return self._s[675]! } - public var Appearance_AppIconFilledX: String { return self._s[676]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[677]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[674]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[675]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[676]! } + public var Preview_DeletePhoto: String { return self._s[677]! } + public var Appearance_AppIconFilledX: String { return self._s[678]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[679]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_0]) + return formatWithArgumentRanges(self._s[680]!, self._r[680]!, [_0]) } - public var Coub_TapForSound: String { return self._s[680]! } - public var Map_LocatingError: String { return self._s[681]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[683]! } - public var Passport_ForgottenPassword: String { return self._s[684]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[685]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[686]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[688]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[689]! } - public var Message_Location: String { return self._s[690]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[691]! } - public var Channel_Management_Title: String { return self._s[692]! } - public var DialogList_SearchSectionDialogs: String { return self._s[694]! } - public var Compose_NewChannel_Members: String { return self._s[695]! } + public var Coub_TapForSound: String { return self._s[682]! } + public var Map_LocatingError: String { return self._s[683]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[685]! } + public var Passport_ForgottenPassword: String { return self._s[686]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[687]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[688]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[690]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[691]! } + public var Message_Location: String { return self._s[692]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[693]! } + public var Channel_Management_Title: String { return self._s[694]! } + public var DialogList_SearchSectionDialogs: String { return self._s[696]! } + public var Compose_NewChannel_Members: String { return self._s[697]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[696]!, self._r[696]!, [_0]) + return formatWithArgumentRanges(self._s[698]!, self._r[698]!, [_0]) } - public var AutoNightTheme_ScheduledFrom: String { return self._s[697]! } - public var PhotoEditor_WarmthTool: String { return self._s[698]! } - public var Passport_Language_tr: String { return self._s[699]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[699]! } + public var PhotoEditor_WarmthTool: String { return self._s[700]! } + public var Passport_Language_tr: String { return self._s[701]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[700]!, self._r[700]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_1, _2, _3]) } - public var Login_ResetAccountProtected_Reset: String { return self._s[702]! } - public var Watch_PhotoView_Title: String { return self._s[703]! } - public var Passport_Phone_Delete: String { return self._s[704]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[705]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[706]! } - public var GroupInfo_Permissions: String { return self._s[707]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[708]! } - public var Profile_ShareContactButton: String { return self._s[709]! } - public var ChatSettings_Other: String { return self._s[710]! } - public var UserInfo_NotificationsDisabled: String { return self._s[711]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[712]! } - public var LastSeen_WithinAMonth: String { return self._s[713]! } - public var Conversation_EncryptionCanceled: String { return self._s[714]! } - public var MediaPicker_GroupDescription: String { return self._s[715]! } - public var WebSearch_Images: String { return self._s[716]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[704]! } + public var Watch_PhotoView_Title: String { return self._s[705]! } + public var Passport_Phone_Delete: String { return self._s[706]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[707]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[708]! } + public var GroupInfo_Permissions: String { return self._s[709]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[710]! } + public var Profile_ShareContactButton: String { return self._s[711]! } + public var ChatSettings_Other: String { return self._s[712]! } + public var UserInfo_NotificationsDisabled: String { return self._s[713]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[714]! } + public var LastSeen_WithinAMonth: String { return self._s[715]! } + public var Conversation_ReportGroupLocation: String { return self._s[716]! } + public var Conversation_EncryptionCanceled: String { return self._s[717]! } + public var MediaPicker_GroupDescription: String { return self._s[718]! } + public var WebSearch_Images: String { return self._s[719]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[717]!, self._r[717]!, [_0]) + return formatWithArgumentRanges(self._s[720]!, self._r[720]!, [_0]) } - public var Message_Photo: String { return self._s[718]! } - public var PasscodeSettings_HelpBottom: String { return self._s[719]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[720]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[721]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[722]! } - public var NotificationsSound_Calypso: String { return self._s[723]! } - public var Map_Map: String { return self._s[724]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[726]! } - public var ChatSettings_TextSizeUnits: String { return self._s[727]! } - public var Common_of: String { return self._s[728]! } - public var Conversation_ForwardContacts: String { return self._s[730]! } + public var Message_Photo: String { return self._s[721]! } + public var PasscodeSettings_HelpBottom: String { return self._s[722]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[723]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[724]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[725]! } + public var NotificationsSound_Calypso: String { return self._s[726]! } + public var Map_Map: String { return self._s[727]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[729]! } + public var ChatSettings_TextSizeUnits: String { return self._s[730]! } + public var Common_of: String { return self._s[731]! } + public var Conversation_ForwardContacts: String { return self._s[733]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[732]!, self._r[732]!, [_0]) + return formatWithArgumentRanges(self._s[735]!, self._r[735]!, [_0]) } - public var Passport_Language_hy: String { return self._s[733]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[734]! } - public var AutoDownloadSettings_Reset: String { return self._s[735]! } - public var Paint_ClearConfirm: String { return self._s[736]! } - public var Camera_VideoMode: String { return self._s[737]! } + public var Passport_Language_hy: String { return self._s[736]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[737]! } + public var AutoDownloadSettings_Reset: String { return self._s[738]! } + public var Paint_ClearConfirm: String { return self._s[739]! } + public var Camera_VideoMode: String { return self._s[740]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[738]!, self._r[738]!, [_0]) + return formatWithArgumentRanges(self._s[741]!, self._r[741]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[739]! } - public var Conversation_ViewBackground: String { return self._s[740]! } - public var Passport_Language_el: String { return self._s[741]! } - public var PhotoEditor_Original: String { return self._s[742]! } - public var Settings_FAQ_Button: String { return self._s[744]! } - public var Channel_Setup_PublicNoLink: String { return self._s[746]! } - public var Conversation_UnsupportedMedia: String { return self._s[747]! } - public var Conversation_SlideToCancel: String { return self._s[748]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[749]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[750]! } - public var AutoNightTheme_NotAvailable: String { return self._s[751]! } - public var Common_Create: String { return self._s[752]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[753]! } - public var Localization_ChooseLanguage: String { return self._s[755]! } - public var Settings_Proxy: String { return self._s[758]! } - public var Privacy_TopPeersHelp: String { return self._s[759]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[760]! } - public var Chat_UnsendMyMessages: String { return self._s[761]! } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[762]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[742]! } + public var Conversation_ViewBackground: String { return self._s[743]! } + public var Passport_Language_el: String { return self._s[744]! } + public var PhotoEditor_Original: String { return self._s[745]! } + public var Settings_FAQ_Button: String { return self._s[747]! } + public var Channel_Setup_PublicNoLink: String { return self._s[749]! } + public var Conversation_UnsupportedMedia: String { return self._s[750]! } + public var Conversation_SlideToCancel: String { return self._s[751]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[752]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[753]! } + public var AutoNightTheme_NotAvailable: String { return self._s[754]! } + public var Common_Create: String { return self._s[755]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[756]! } + public var Localization_ChooseLanguage: String { return self._s[758]! } + public var Settings_Proxy: String { return self._s[761]! } + public var Privacy_TopPeersHelp: String { return self._s[762]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[763]! } + public var Chat_UnsendMyMessages: String { return self._s[764]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[765]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[764]!, self._r[764]!, [_0]) + return formatWithArgumentRanges(self._s[767]!, self._r[767]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[765]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[766]! } - public var Cache_Title: String { return self._s[767]! } + public var Contacts_SortedByPresence: String { return self._s[768]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[769]! } + public var Cache_Title: String { return self._s[770]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[768]!, self._r[768]!, [_0]) + return formatWithArgumentRanges(self._s[771]!, self._r[771]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[769]! } - public var Channel_Moderator_Title: String { return self._s[770]! } - public var InstantPage_AutoNightTheme: String { return self._s[772]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[772]! } + public var Channel_Moderator_Title: String { return self._s[773]! } + public var InstantPage_AutoNightTheme: String { return self._s[775]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[775]!, self._r[775]!, [_1]) + return formatWithArgumentRanges(self._s[778]!, self._r[778]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[776]! } - public var Undo_Undo: String { return self._s[778]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[779]! } - public var TwoStepAuth_RemovePassword: String { return self._s[780]! } - public var Common_Delete: String { return self._s[781]! } - public var Contacts_AddPeopleNearby: String { return self._s[783]! } - public var Conversation_ContextMenuDelete: String { return self._s[784]! } - public var SocksProxySetup_Credentials: String { return self._s[785]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[787]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[790]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[791]! } - public var Passport_Language_id: String { return self._s[793]! } - public var WallpaperSearch_ColorTeal: String { return self._s[794]! } - public var ChannelIntro_Title: String { return self._s[795]! } + public var Passport_Scans_Upload: String { return self._s[779]! } + public var Undo_Undo: String { return self._s[781]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[782]! } + public var TwoStepAuth_RemovePassword: String { return self._s[783]! } + public var Common_Delete: String { return self._s[784]! } + public var Contacts_AddPeopleNearby: String { return self._s[786]! } + public var Conversation_ContextMenuDelete: String { return self._s[787]! } + public var SocksProxySetup_Credentials: String { return self._s[788]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[790]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[793]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[794]! } + public var Passport_Language_id: String { return self._s[796]! } + public var WallpaperSearch_ColorTeal: String { return self._s[797]! } + public var ChannelIntro_Title: String { return self._s[798]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[796]!, self._r[796]!, [_0]) + return formatWithArgumentRanges(self._s[799]!, self._r[799]!, [_0]) } - public var Channel_Info_Description: String { return self._s[798]! } - public var Stickers_FavoriteStickers: String { return self._s[799]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[800]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[801]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[802]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[803]! } + public var Channel_Info_Description: String { return self._s[801]! } + public var Stickers_FavoriteStickers: String { return self._s[802]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[803]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[804]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[805]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[806]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[804]!, self._r[804]!, [_1]) + return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_1]) } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[805]!, self._r[805]!, [_1, _2]) + return formatWithArgumentRanges(self._s[808]!, self._r[808]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[806]!, self._r[806]!, [_0]) + return formatWithArgumentRanges(self._s[809]!, self._r[809]!, [_0]) } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_1, _2]) + return formatWithArgumentRanges(self._s[810]!, self._r[810]!, [_1, _2]) } - public var GroupPermission_Delete: String { return self._s[808]! } - public var Passport_Language_uk: String { return self._s[809]! } - public var StickerPack_HideStickers: String { return self._s[811]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[812]! } + public var GroupPermission_Delete: String { return self._s[811]! } + public var Passport_Language_uk: String { return self._s[812]! } + public var StickerPack_HideStickers: String { return self._s[814]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[815]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[813]!, self._r[813]!, [_1, _2]) + return formatWithArgumentRanges(self._s[816]!, self._r[816]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[814]! } + public var Activity_UploadingVideoMessage: String { return self._s[817]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[815]!, self._r[815]!, [_0]) + return formatWithArgumentRanges(self._s[818]!, self._r[818]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[816]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[817]! } - public var Settings_CallSettings: String { return self._s[818]! } - public var Camera_SquareMode: String { return self._s[819]! } - public var GroupInfo_SharedMediaNone: String { return self._s[820]! } + public var Channel_TitleInfo: String { return self._s[819]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[820]! } + public var Settings_CallSettings: String { return self._s[821]! } + public var Camera_SquareMode: String { return self._s[822]! } + public var GroupInfo_SharedMediaNone: String { return self._s[823]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[821]!, self._r[821]!, [_1]) + return formatWithArgumentRanges(self._s[824]!, self._r[824]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[822]! } - public var Application_Update: String { return self._s[824]! } - public var Month_ShortJanuary: String { return self._s[825]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[826]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[827]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[828]! } - public var Passport_Address_Street2Placeholder: String { return self._s[829]! } + public var Bot_GenericBotStatus: String { return self._s[825]! } + public var Application_Update: String { return self._s[827]! } + public var Month_ShortJanuary: String { return self._s[828]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[829]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[830]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[831]! } + public var Passport_Address_Street2Placeholder: String { return self._s[832]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[830]!, self._r[830]!, [_0]) + return formatWithArgumentRanges(self._s[833]!, self._r[833]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[831]! } - public var Appearance_PreviewOutgoingText: String { return self._s[832]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[833]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[835]! } - public var Map_Directions: String { return self._s[836]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[838]! } - public var Appearance_ThemeDay: String { return self._s[839]! } - public var LogoutOptions_LogOut: String { return self._s[840]! } - public var Channel_AddBotErrorNoRights: String { return self._s[842]! } - public var Passport_Identity_AddPassport: String { return self._s[843]! } - public var Call_Message: String { return self._s[844]! } - public var PhotoEditor_ExposureTool: String { return self._s[845]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[847]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[849]! } - public var Appearance_Preview: String { return self._s[850]! } - public var Compose_ChannelMembers: String { return self._s[851]! } - public var Conversation_DeleteManyMessages: String { return self._s[852]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[853]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[854]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[855]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[858]! } - public var Conversation_UpdateTelegram: String { return self._s[859]! } + public var NetworkUsageSettings_Cellular: String { return self._s[834]! } + public var Appearance_PreviewOutgoingText: String { return self._s[835]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[836]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[838]! } + public var Map_Directions: String { return self._s[839]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[841]! } + public var Appearance_ThemeDay: String { return self._s[842]! } + public var LogoutOptions_LogOut: String { return self._s[843]! } + public var Channel_AddBotErrorNoRights: String { return self._s[845]! } + public var Passport_Identity_AddPassport: String { return self._s[846]! } + public var Call_Message: String { return self._s[847]! } + public var PhotoEditor_ExposureTool: String { return self._s[848]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[850]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[852]! } + public var Appearance_Preview: String { return self._s[853]! } + public var Compose_ChannelMembers: String { return self._s[854]! } + public var Conversation_DeleteManyMessages: String { return self._s[855]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[856]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[857]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[858]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[861]! } + public var Conversation_UpdateTelegram: String { return self._s[862]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[860]!, self._r[860]!, [_0]) + return formatWithArgumentRanges(self._s[863]!, self._r[863]!, [_0]) } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[861]!, self._r[861]!, [_1]) + return formatWithArgumentRanges(self._s[864]!, self._r[864]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[862]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[863]! } + public var GroupInfo_Administrators_Title: String { return self._s[865]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[866]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[864]!, self._r[864]!, [_0]) + return formatWithArgumentRanges(self._s[867]!, self._r[867]!, [_0]) } - public var Tour_Title3: String { return self._s[865]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[866]! } - public var Clipboard_SendPhoto: String { return self._s[870]! } - public var MediaPicker_Videos: String { return self._s[871]! } - public var Passport_Email_Title: String { return self._s[872]! } + public var Tour_Title3: String { return self._s[868]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[869]! } + public var Clipboard_SendPhoto: String { return self._s[873]! } + public var MediaPicker_Videos: String { return self._s[874]! } + public var Passport_Email_Title: String { return self._s[875]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[873]!, self._r[873]!, [_0]) + return formatWithArgumentRanges(self._s[876]!, self._r[876]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[874]! } - public var Conversation_MessageDialogDelete: String { return self._s[875]! } - public var Privacy_Calls_CustomHelp: String { return self._s[877]! } - public var Message_Wallpaper: String { return self._s[878]! } - public var MemberSearch_BotSection: String { return self._s[879]! } - public var GroupInfo_SetSound: String { return self._s[880]! } - public var Core_ServiceUserStatus: String { return self._s[881]! } - public var LiveLocationUpdated_JustNow: String { return self._s[882]! } - public var Call_StatusFailed: String { return self._s[883]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[884]! } - public var TwoStepAuth_SetPassword: String { return self._s[885]! } + public var StickerPacksSettings_Title: String { return self._s[877]! } + public var Conversation_MessageDialogDelete: String { return self._s[878]! } + public var Privacy_Calls_CustomHelp: String { return self._s[880]! } + public var Message_Wallpaper: String { return self._s[881]! } + public var MemberSearch_BotSection: String { return self._s[882]! } + public var GroupInfo_SetSound: String { return self._s[883]! } + public var Core_ServiceUserStatus: String { return self._s[884]! } + public var LiveLocationUpdated_JustNow: String { return self._s[885]! } + public var Call_StatusFailed: String { return self._s[886]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[887]! } + public var TwoStepAuth_SetPassword: String { return self._s[888]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[889]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[887]!, self._r[887]!, [_0]) + return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[888]! } - public var Profile_Username: String { return self._s[889]! } - public var Bot_DescriptionTitle: String { return self._s[890]! } - public var MaskStickerSettings_Title: String { return self._s[891]! } - public var SharedMedia_CategoryOther: String { return self._s[892]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[893]! } - public var Common_NotNow: String { return self._s[894]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[895]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[896]! } - public var Map_Location: String { return self._s[897]! } - public var Invitation_JoinGroup: String { return self._s[898]! } - public var AutoDownloadSettings_Title: String { return self._s[900]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[901]! } - public var Channel_ErrorAddBlocked: String { return self._s[902]! } - public var Conversation_UnblockUser: String { return self._s[903]! } - public var Watch_Bot_Restart: String { return self._s[904]! } - public var TwoStepAuth_Title: String { return self._s[905]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[906]! } - public var Checkout_ShippingMethod: String { return self._s[907]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[908]! } + public var Calls_SubmitRating: String { return self._s[892]! } + public var Profile_Username: String { return self._s[893]! } + public var Bot_DescriptionTitle: String { return self._s[894]! } + public var MaskStickerSettings_Title: String { return self._s[895]! } + public var SharedMedia_CategoryOther: String { return self._s[896]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[897]! } + public var Common_NotNow: String { return self._s[898]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[899]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[900]! } + public var Map_Location: String { return self._s[901]! } + public var Invitation_JoinGroup: String { return self._s[902]! } + public var AutoDownloadSettings_Title: String { return self._s[904]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[905]! } + public var Channel_ErrorAddBlocked: String { return self._s[906]! } + public var Conversation_UnblockUser: String { return self._s[907]! } + public var Watch_Bot_Restart: String { return self._s[908]! } + public var TwoStepAuth_Title: String { return self._s[909]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[910]! } + public var Checkout_ShippingMethod: String { return self._s[911]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[912]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[909]!, self._r[909]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[913]!, self._r[913]!, [_1, _2, _3]) } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[911]!, self._r[911]!, [_0]) + return formatWithArgumentRanges(self._s[915]!, self._r[915]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[912]!, self._r[912]!, [_0]) + return formatWithArgumentRanges(self._s[916]!, self._r[916]!, [_0]) } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[913]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[914]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[915]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[916]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[917]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[918]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[919]! } - public var Checkout_PaymentMethod_Title: String { return self._s[920]! } - public var SocksProxySetup_Connection: String { return self._s[921]! } - public var Group_MessagePhotoRemoved: String { return self._s[922]! } - public var Channel_Stickers_NotFound: String { return self._s[924]! } - public var Group_About_Help: String { return self._s[925]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[926]! } - public var PeopleNearby_Title: String { return self._s[928]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[917]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[918]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[919]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[920]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[921]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[922]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[923]! } + public var Checkout_PaymentMethod_Title: String { return self._s[924]! } + public var SocksProxySetup_Connection: String { return self._s[925]! } + public var Group_MessagePhotoRemoved: String { return self._s[926]! } + public var Channel_Stickers_NotFound: String { return self._s[928]! } + public var Group_About_Help: String { return self._s[929]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[930]! } + public var PeopleNearby_Title: String { return self._s[932]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[929]!, self._r[929]!, [_1]) + return formatWithArgumentRanges(self._s[933]!, self._r[933]!, [_1]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[931]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[932]! } - public var SocksProxySetup_Password: String { return self._s[933]! } - public var Notifications_PermissionsEnable: String { return self._s[934]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[936]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[935]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[936]! } + public var SocksProxySetup_Password: String { return self._s[937]! } + public var Notifications_PermissionsEnable: String { return self._s[938]! } + public func Channel_AdminLog_MessageRemovedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[940]!, self._r[940]!, [_0]) + } + public var TwoStepAuth_ChangeEmail: String { return self._s[941]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[937]!, self._r[937]!, [_1]) + return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[939]!, self._r[939]!, [_0]) + return formatWithArgumentRanges(self._s[944]!, self._r[944]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[940]! } - public var ArchivedPacksAlert_Title: String { return self._s[941]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[945]! } + public var ArchivedPacksAlert_Title: String { return self._s[946]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[947]!, self._r[947]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[943]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[945]! } - public var Conversation_StatusTyping: String { return self._s[946]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[947]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[948]! } - public var UserInfo_CreateNewContact: String { return self._s[949]! } - public var Passport_Identity_FrontSide: String { return self._s[950]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[951]! } - public var Calls_CallTabTitle: String { return self._s[952]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[953]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[948]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[950]! } + public var Conversation_StatusTyping: String { return self._s[951]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[952]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[953]! } + public var UserInfo_CreateNewContact: String { return self._s[954]! } + public var Passport_Identity_FrontSide: String { return self._s[955]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[956]! } + public var Calls_CallTabTitle: String { return self._s[957]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[958]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[954]!, self._r[954]!, [_0]) + return formatWithArgumentRanges(self._s[959]!, self._r[959]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[955]! } - public var SharedMedia_EmptyMusicText: String { return self._s[956]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[957]! } - public var Paint_Stickers: String { return self._s[958]! } - public var Privacy_GroupsAndChannels: String { return self._s[959]! } - public var UserInfo_AddContact: String { return self._s[961]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[960]! } + public var SharedMedia_EmptyMusicText: String { return self._s[961]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[962]! } + public var Paint_Stickers: String { return self._s[963]! } + public var Privacy_GroupsAndChannels: String { return self._s[964]! } + public var UserInfo_AddContact: String { return self._s[966]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[962]!, self._r[962]!, [_0]) + return formatWithArgumentRanges(self._s[967]!, self._r[967]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[964]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[969]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[966]!, self._r[966]!, [_0]) + return formatWithArgumentRanges(self._s[971]!, self._r[971]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[967]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[968]! } - public var BlockedUsers_BlockUser: String { return self._s[969]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[970]! } - public var MediaPicker_UngroupDescription: String { return self._s[971]! } - public var Watch_NoConnection: String { return self._s[972]! } - public var Month_GenSeptember: String { return self._s[973]! } - public var Conversation_ViewGroup: String { return self._s[974]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[977]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[978]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[979]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[980]! } - public var MediaPicker_CameraRoll: String { return self._s[982]! } - public var Month_GenAugust: String { return self._s[983]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[984]! } - public var SharedMedia_EmptyText: String { return self._s[985]! } - public var Map_ShareLiveLocation: String { return self._s[986]! } - public var Calls_All: String { return self._s[987]! } - public var Appearance_ThemeNight: String { return self._s[990]! } - public var Conversation_HoldForAudio: String { return self._s[991]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[994]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[995]! } - public var SocksProxySetup_Secret: String { return self._s[996]! } - public var Channel_BanList_RestrictedTitle: String { return self._s[998]! } - public var Conversation_Location: String { return self._s[999]! } + public var DialogList_NoMessagesTitle: String { return self._s[972]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[973]! } + public var BlockedUsers_BlockUser: String { return self._s[974]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[975]! } + public var MediaPicker_UngroupDescription: String { return self._s[976]! } + public var Watch_NoConnection: String { return self._s[977]! } + public var Month_GenSeptember: String { return self._s[978]! } + public var Conversation_ViewGroup: String { return self._s[979]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[982]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[983]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[984]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[985]! } + public var MediaPicker_CameraRoll: String { return self._s[987]! } + public var Month_GenAugust: String { return self._s[988]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[989]! } + public var SharedMedia_EmptyText: String { return self._s[990]! } + public var Map_ShareLiveLocation: String { return self._s[991]! } + public var Calls_All: String { return self._s[992]! } + public var Appearance_ThemeNight: String { return self._s[995]! } + public var Conversation_HoldForAudio: String { return self._s[996]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[999]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1000]! } + public var SocksProxySetup_Secret: String { return self._s[1001]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1003]! } + public var Conversation_Location: String { return self._s[1004]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1000]!, self._r[1000]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1005]!, self._r[1005]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1002]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1003]! } - public var Notifications_PermissionsText: String { return self._s[1004]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1005]! } - public var Call_Flip: String { return self._s[1006]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1007]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1009]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1011]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1013]! } - public var Login_InvalidCodeError: String { return self._s[1014]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1015]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1007]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1008]! } + public var Notifications_PermissionsText: String { return self._s[1009]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1010]! } + public var Call_Flip: String { return self._s[1011]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1012]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1014]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1016]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1018]! } + public var Login_InvalidCodeError: String { return self._s[1019]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1020]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1016]!, self._r[1016]!, [_0]) + return formatWithArgumentRanges(self._s[1021]!, self._r[1021]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1017]!, self._r[1017]!, [_0]) + return formatWithArgumentRanges(self._s[1022]!, self._r[1022]!, [_0]) } - public var Call_CallInProgressTitle: String { return self._s[1018]! } - public var Month_ShortSeptember: String { return self._s[1019]! } - public var Watch_ChannelInfo_Title: String { return self._s[1020]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1023]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1024]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1025]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1026]! } - public var PhotoEditor_CropReset: String { return self._s[1027]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1029]! } - public var Channel_Management_LabelEditor: String { return self._s[1030]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1032]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1033]! } - public var UserInfo_Title: String { return self._s[1034]! } - public var ChatList_HideAction: String { return self._s[1035]! } - public var AccessDenied_Title: String { return self._s[1036]! } - public var DialogList_SearchLabel: String { return self._s[1037]! } - public var Group_Setup_HistoryHidden: String { return self._s[1038]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1039]! } - public var State_Updating: String { return self._s[1041]! } - public var Contacts_TabTitle: String { return self._s[1042]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1044]! } - public var GroupInfo_GroupHistory: String { return self._s[1045]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1046]! } - public var Wallpaper_SetColor: String { return self._s[1047]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1048]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1049]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1050]! } - public var Contacts_NotRegisteredSection: String { return self._s[1051]! } + public var Call_CallInProgressTitle: String { return self._s[1023]! } + public var Month_ShortSeptember: String { return self._s[1024]! } + public var Watch_ChannelInfo_Title: String { return self._s[1025]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1028]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1029]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1030]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1031]! } + public var PhotoEditor_CropReset: String { return self._s[1032]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1034]! } + public var Channel_Management_LabelEditor: String { return self._s[1035]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1037]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1038]! } + public var UserInfo_Title: String { return self._s[1039]! } + public var ChatList_HideAction: String { return self._s[1040]! } + public var AccessDenied_Title: String { return self._s[1041]! } + public var DialogList_SearchLabel: String { return self._s[1042]! } + public var Group_Setup_HistoryHidden: String { return self._s[1043]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1044]! } + public var State_Updating: String { return self._s[1046]! } + public var Contacts_TabTitle: String { return self._s[1047]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1049]! } + public var GroupInfo_GroupHistory: String { return self._s[1050]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1051]! } + public var Wallpaper_SetColor: String { return self._s[1052]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1053]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1054]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1055]! } + public var Contacts_NotRegisteredSection: String { return self._s[1056]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1052]!, self._r[1052]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1057]!, self._r[1057]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1053]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1054]! } - public var SocksProxySetup_Connecting: String { return self._s[1055]! } - public var ExplicitContent_AlertChannel: String { return self._s[1056]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1057]! } - public var Conversation_Contact: String { return self._s[1058]! } - public var Login_CodeExpired: String { return self._s[1059]! } - public var Passport_DiscardMessageAction: String { return self._s[1060]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1061]! } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1062]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1063]! } - public var Month_ShortApril: String { return self._s[1064]! } - public var AuthSessions_CurrentSession: String { return self._s[1065]! } - public var WallpaperPreview_CropTopText: String { return self._s[1069]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1070]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1071]! } - public var Channel_Setup_TypePrivate: String { return self._s[1073]! } - public var Forward_ChannelReadOnly: String { return self._s[1076]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1077]! } - public var UserInfo_BotPrivacy: String { return self._s[1078]! } - public var Notification_PassportValueEmail: String { return self._s[1079]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1080]! } - public var GroupPermission_NewTitle: String { return self._s[1081]! } - public var CallFeedback_ReasonDropped: String { return self._s[1082]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1083]! } - public var Channel_SignMessages_Help: String { return self._s[1085]! } - public var Undo_ChatDeleted: String { return self._s[1087]! } - public var Conversation_ChatBackground: String { return self._s[1088]! } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1089]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1090]! } - public var Passport_Language_pt: String { return self._s[1091]! } - public var NotificationsSound_Popcorn: String { return self._s[1094]! } - public var AutoNightTheme_Disabled: String { return self._s[1095]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1096]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1097]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1098]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1099]! } + public var Paint_Clear: String { return self._s[1058]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1059]! } + public var SocksProxySetup_Connecting: String { return self._s[1060]! } + public var ExplicitContent_AlertChannel: String { return self._s[1061]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1062]! } + public var Conversation_Contact: String { return self._s[1063]! } + public var Login_CodeExpired: String { return self._s[1064]! } + public var Passport_DiscardMessageAction: String { return self._s[1065]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1066]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1067]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1068]! } + public var Month_ShortApril: String { return self._s[1069]! } + public var AuthSessions_CurrentSession: String { return self._s[1070]! } + public var WallpaperPreview_CropTopText: String { return self._s[1074]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1075]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1076]! } + public var Channel_Setup_TypePrivate: String { return self._s[1078]! } + public var Forward_ChannelReadOnly: String { return self._s[1081]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1082]! } + public var AddContact_SharedContactException: String { return self._s[1083]! } + public var UserInfo_BotPrivacy: String { return self._s[1084]! } + public var Notification_PassportValueEmail: String { return self._s[1085]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1086]! } + public var GroupPermission_NewTitle: String { return self._s[1087]! } + public var CallFeedback_ReasonDropped: String { return self._s[1088]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1089]! } + public var Channel_SignMessages_Help: String { return self._s[1091]! } + public var Undo_ChatDeleted: String { return self._s[1093]! } + public var Conversation_ChatBackground: String { return self._s[1094]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1095]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1096]! } + public var Passport_Language_pt: String { return self._s[1097]! } + public var NotificationsSound_Popcorn: String { return self._s[1100]! } + public var AutoNightTheme_Disabled: String { return self._s[1101]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1102]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1103]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1104]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1105]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1100]!, self._r[1100]!, [_0]) + return formatWithArgumentRanges(self._s[1106]!, self._r[1106]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1101]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1102]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1104]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1107]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1108]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1110]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1105]!, self._r[1105]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1111]!, self._r[1111]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1108]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1109]! } - public var Compose_NewEncryptedChat: String { return self._s[1110]! } - public var Login_CodeFloodError: String { return self._s[1111]! } - public var Calls_TabTitle: String { return self._s[1112]! } - public var Privacy_ProfilePhoto: String { return self._s[1113]! } - public var Passport_Language_he: String { return self._s[1114]! } - public var GroupPermission_Title: String { return self._s[1115]! } + public var SocksProxySetup_Hostname: String { return self._s[1114]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1115]! } + public var Compose_NewEncryptedChat: String { return self._s[1116]! } + public var Login_CodeFloodError: String { return self._s[1117]! } + public var Calls_TabTitle: String { return self._s[1118]! } + public var Privacy_ProfilePhoto: String { return self._s[1119]! } + public var Passport_Language_he: String { return self._s[1120]! } + public var GroupPermission_Title: String { return self._s[1121]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1116]!, self._r[1116]!, [_0]) + return formatWithArgumentRanges(self._s[1122]!, self._r[1122]!, [_0]) } - public var GroupPermission_NoChangeInfo: String { return self._s[1117]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1118]! } - public var Tour_Text1: String { return self._s[1119]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1120]! } - public var Month_ShortFebruary: String { return self._s[1121]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1122]! } - public var NotificationsSound_Glass: String { return self._s[1123]! } - public var Appearance_ThemeNightBlue: String { return self._s[1124]! } - public var CheckoutInfo_Pay: String { return self._s[1125]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1127]! } - public var Call_CallAgain: String { return self._s[1129]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1130]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1131]! } - public var Passport_InvalidPasswordError: String { return self._s[1132]! } - public var Watch_Message_Game: String { return self._s[1133]! } - public var Stickers_Install: String { return self._s[1134]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1135]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1137]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1138]! } - public var AuthSessions_OtherSessions: String { return self._s[1139]! } - public var Channel_Username_Help: String { return self._s[1140]! } - public var Camera_Title: String { return self._s[1141]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1143]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1144]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1145]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1146]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1147]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1148]! } - public var Conversation_RestrictedStickers: String { return self._s[1149]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1151]! } - public var UserInfo_TelegramCall: String { return self._s[1153]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1154]! } - public var CreatePoll_OptionsHeader: String { return self._s[1155]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1156]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1157]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1158]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1159]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1123]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1124]! } + public var Tour_Text1: String { return self._s[1125]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1126]! } + public var Month_ShortFebruary: String { return self._s[1127]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1128]! } + public var NotificationsSound_Glass: String { return self._s[1129]! } + public var Appearance_ThemeNightBlue: String { return self._s[1130]! } + public var CheckoutInfo_Pay: String { return self._s[1131]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1133]! } + public var Call_CallAgain: String { return self._s[1135]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1136]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1137]! } + public var Passport_InvalidPasswordError: String { return self._s[1138]! } + public var Watch_Message_Game: String { return self._s[1139]! } + public var Stickers_Install: String { return self._s[1140]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1141]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1143]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1144]! } + public var AuthSessions_OtherSessions: String { return self._s[1145]! } + public var Channel_Username_Help: String { return self._s[1146]! } + public var Camera_Title: String { return self._s[1147]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1149]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1150]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1151]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1152]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1153]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1154]! } + public var Conversation_RestrictedStickers: String { return self._s[1155]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1157]! } + public var UserInfo_TelegramCall: String { return self._s[1159]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1160]! } + public var CreatePoll_OptionsHeader: String { return self._s[1161]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1162]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1163]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1164]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1165]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1160]!, self._r[1160]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1166]!, self._r[1166]!, [_1, _2, _3]) } - public var Settings_SaveEditedPhotos: String { return self._s[1161]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1162]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1163]! } - public var Conversation_MessageDialogRetry: String { return self._s[1164]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1165]! } - public var Group_Setup_TypeHeader: String { return self._s[1166]! } - public var Paint_RecentStickers: String { return self._s[1167]! } - public var PhotoEditor_GrainTool: String { return self._s[1168]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1169]! } - public var EmptyGroupInfo_Line4: String { return self._s[1170]! } - public var Watch_AuthRequired: String { return self._s[1172]! } + public var Settings_SaveEditedPhotos: String { return self._s[1167]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1168]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1169]! } + public var Conversation_MessageDialogRetry: String { return self._s[1170]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1171]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1172]! } + public var Group_Setup_TypeHeader: String { return self._s[1173]! } + public var Paint_RecentStickers: String { return self._s[1174]! } + public var PhotoEditor_GrainTool: String { return self._s[1175]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1176]! } + public var EmptyGroupInfo_Line4: String { return self._s[1177]! } + public var Watch_AuthRequired: String { return self._s[1179]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1173]!, self._r[1173]!, [_0]) + return formatWithArgumentRanges(self._s[1180]!, self._r[1180]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1174]! } - public var ChannelIntro_Text: String { return self._s[1175]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1176]! } - public var GroupPermission_NoSendMedia: String { return self._s[1177]! } - public var Calls_AddTab: String { return self._s[1178]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1179]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1180]! } - public var Notification_MessageLifetime1d: String { return self._s[1181]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1182]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1183]! } - public var Passport_Identity_GenderFemale: String { return self._s[1184]! } - public var BlockedUsers_BlockTitle: String { return self._s[1185]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1181]! } + public var ChannelIntro_Text: String { return self._s[1182]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1183]! } + public var GroupPermission_NoSendMedia: String { return self._s[1184]! } + public var Calls_AddTab: String { return self._s[1185]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1186]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1187]! } + public var Notification_MessageLifetime1d: String { return self._s[1188]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1189]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1190]! } + public var Passport_Identity_GenderFemale: String { return self._s[1191]! } + public var BlockedUsers_BlockTitle: String { return self._s[1192]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1186]!, self._r[1186]!, [_1]) + return formatWithArgumentRanges(self._s[1193]!, self._r[1193]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1187]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1188]! } - public var ChatList_ArchiveAction: String { return self._s[1189]! } - public var AutoNightTheme_Scheduled: String { return self._s[1190]! } + public var Weekday_Yesterday: String { return self._s[1194]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1195]! } + public var ChatList_ArchiveAction: String { return self._s[1196]! } + public var AutoNightTheme_Scheduled: String { return self._s[1197]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1191]!, self._r[1191]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1198]!, self._r[1198]!, [_1, _2, _3, _4, _5, _6]) } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1192]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1199]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1193]!, self._r[1193]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1200]!, self._r[1200]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1194]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1195]! } + public var CreatePoll_Create: String { return self._s[1201]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1202]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1196]!, self._r[1196]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1203]!, self._r[1203]!, [_1, _2]) } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1197]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1199]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1204]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1206]! } public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1200]!, self._r[1200]!, [_1]) + return formatWithArgumentRanges(self._s[1207]!, self._r[1207]!, [_1]) } - public var Preview_OpenInInstagram: String { return self._s[1201]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1202]! } + public var Preview_OpenInInstagram: String { return self._s[1208]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1209]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1203]!, self._r[1203]!, [_1, _2, _3]) - } - public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1204]!, self._r[1204]!, [_1, _2]) - } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1205]! } - public var ArchivedChats_IntroText3: String { return self._s[1206]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1207]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1208]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1209]! } - public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1210]!, self._r[1210]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1212]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1213]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1214]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1215]! } - public var Gif_NoGifsFound: String { return self._s[1216]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1217]! } - public var GroupInfo_ActionPromote: String { return self._s[1218]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1219]! } - public var GroupInfo_Permissions_Title: String { return self._s[1220]! } - public var Permissions_ContactsText_v0: String { return self._s[1221]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1222]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1225]! } - public var Passport_FieldEmailHelp: String { return self._s[1226]! } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1227]! } - public var Weekday_ShortSaturday: String { return self._s[1228]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1229]! } - public var Watch_Conversation_UserInfo: String { return self._s[1230]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1231]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1232]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1233]! } - public var PhotoEditor_VignetteTool: String { return self._s[1234]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1235]! } - public var Passport_Language_et: String { return self._s[1236]! } - public var AppUpgrade_Running: String { return self._s[1237]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1239]! } - public var Passport_Language_bg: String { return self._s[1240]! } - public var Stickers_NoStickersFound: String { return self._s[1242]! } + public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1211]!, self._r[1211]!, [_1, _2]) + } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1212]! } + public var ArchivedChats_IntroText3: String { return self._s[1213]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1214]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1215]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1216]! } + public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1217]!, self._r[1217]!, [_1, _2, _3]) + } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1219]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1220]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1221]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1222]! } + public var Gif_NoGifsFound: String { return self._s[1223]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1224]! } + public var GroupInfo_ActionPromote: String { return self._s[1225]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1226]! } + public var GroupInfo_Permissions_Title: String { return self._s[1227]! } + public var Permissions_ContactsText_v0: String { return self._s[1228]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1229]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1232]! } + public var Passport_FieldEmailHelp: String { return self._s[1233]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1234]! } + public var Weekday_ShortSaturday: String { return self._s[1235]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1236]! } + public var Watch_Conversation_UserInfo: String { return self._s[1237]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1238]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1239]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1240]! } + public var PhotoEditor_VignetteTool: String { return self._s[1241]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1242]! } + public var Passport_Language_et: String { return self._s[1243]! } + public var AppUpgrade_Running: String { return self._s[1244]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1246]! } + public var Passport_Language_bg: String { return self._s[1247]! } + public var Stickers_NoStickersFound: String { return self._s[1249]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1244]!, self._r[1244]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1251]!, self._r[1251]!, [_1, _2]) } - public var Settings_About: String { return self._s[1245]! } + public var Settings_About: String { return self._s[1252]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1246]!, self._r[1246]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1253]!, self._r[1253]!, [_0, _1, _2]) } - public var KeyCommand_NewMessage: String { return self._s[1248]! } - public var Group_ErrorAddBlocked: String { return self._s[1249]! } + public var KeyCommand_NewMessage: String { return self._s[1255]! } + public var Group_ErrorAddBlocked: String { return self._s[1256]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1250]!, self._r[1250]!, [_0]) + return formatWithArgumentRanges(self._s[1257]!, self._r[1257]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1251]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1252]! } - public var Cache_ClearProgress: String { return self._s[1253]! } + public var Map_LocationTitle: String { return self._s[1258]! } + public var ReportGroupLocation_Title: String { return self._s[1259]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1260]! } + public var Cache_ClearProgress: String { return self._s[1261]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1254]!, self._r[1254]!, [_0]) + return formatWithArgumentRanges(self._s[1262]!, self._r[1262]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1255]! } - public var Passport_UpdateRequiredError: String { return self._s[1256]! } + public var GroupRemoved_AddToGroup: String { return self._s[1263]! } + public var Passport_UpdateRequiredError: String { return self._s[1264]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1257]!, self._r[1257]!, [_1]) + return formatWithArgumentRanges(self._s[1265]!, self._r[1265]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1259]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1260]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1261]! } - public var Passport_Language_ka: String { return self._s[1262]! } - public var Call_Decline: String { return self._s[1263]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1264]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1267]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1268]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1269]! } + public var Passport_Language_ka: String { return self._s[1270]! } + public var Call_Decline: String { return self._s[1271]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1272]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1267]!, self._r[1267]!, [_0]) + return formatWithArgumentRanges(self._s[1275]!, self._r[1275]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1268]! } + public var CallFeedback_Send: String { return self._s[1276]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1269]!, self._r[1269]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1277]!, self._r[1277]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1270]! } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1272]! } - public var Passport_DeletePassport: String { return self._s[1273]! } - public var Appearance_AppIconFilled: String { return self._s[1274]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1275]! } - public var Month_ShortDecember: String { return self._s[1276]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1278]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1278]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1280]! } + public var Passport_DeletePassport: String { return self._s[1281]! } + public var Appearance_AppIconFilled: String { return self._s[1282]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1283]! } + public var Month_ShortDecember: String { return self._s[1284]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1286]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1279]!, self._r[1279]!, [_0]) + return formatWithArgumentRanges(self._s[1287]!, self._r[1287]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1280]! } - public var Conversation_EncryptedDescription1: String { return self._s[1281]! } - public var Conversation_EncryptedDescription2: String { return self._s[1282]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1283]! } - public var Conversation_EncryptedDescription3: String { return self._s[1284]! } - public var PhotoEditor_SharpenTool: String { return self._s[1285]! } + public var Channel_Stickers_Searching: String { return self._s[1288]! } + public var Conversation_EncryptedDescription1: String { return self._s[1289]! } + public var Conversation_EncryptedDescription2: String { return self._s[1290]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1291]! } + public var Group_Location_SetLocation: String { return self._s[1292]! } + public var Conversation_EncryptedDescription3: String { return self._s[1293]! } + public var PhotoEditor_SharpenTool: String { return self._s[1294]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1286]!, self._r[1286]!, [_0]) - } - public var Conversation_EncryptedDescription4: String { return self._s[1288]! } - public var Channel_Members_AddMembers: String { return self._s[1289]! } - public var Wallpaper_Search: String { return self._s[1290]! } - public var Weekday_Friday: String { return self._s[1291]! } - public var Privacy_ContactsSync: String { return self._s[1292]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1293]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1294]! } - public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1295]!, self._r[1295]!, [_0]) } - public var GroupInfo_Permissions_Removed: String { return self._s[1296]! } - public var Passport_Identity_GenderMale: String { return self._s[1297]! } + public var Conversation_EncryptedDescription4: String { return self._s[1297]! } + public var Channel_Members_AddMembers: String { return self._s[1298]! } + public var Wallpaper_Search: String { return self._s[1299]! } + public var Weekday_Friday: String { return self._s[1300]! } + public var Privacy_ContactsSync: String { return self._s[1301]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1302]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1303]! } + public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1304]!, self._r[1304]!, [_0]) + } + public var GroupInfo_Permissions_Removed: String { return self._s[1305]! } + public var Passport_Identity_GenderMale: String { return self._s[1306]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1298]!, self._r[1298]!, [_0]) + return formatWithArgumentRanges(self._s[1307]!, self._r[1307]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1299]! } - public var Conversation_JumpToDate: String { return self._s[1300]! } - public var Contacts_GlobalSearch: String { return self._s[1301]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1302]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1303]! } - public var Profile_MessageLifetime1d: String { return self._s[1304]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1308]! } + public var Conversation_JumpToDate: String { return self._s[1309]! } + public var Contacts_GlobalSearch: String { return self._s[1310]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1311]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1312]! } + public var Profile_MessageLifetime1d: String { return self._s[1313]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1305]!, self._r[1305]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1314]!, self._r[1314]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1308]! } + public var StickerPack_BuiltinPackName: String { return self._s[1317]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1309]!, self._r[1309]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1318]!, self._r[1318]!, [_1, _2]) } - public var Passport_InfoTitle: String { return self._s[1311]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1312]! } + public var Passport_InfoTitle: String { return self._s[1320]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1321]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1316]!, self._r[1316]!, [_0]) + return formatWithArgumentRanges(self._s[1325]!, self._r[1325]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1317]!, self._r[1317]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1326]!, self._r[1326]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1318]! } - public var Profile_BotInfo: String { return self._s[1319]! } - public var Watch_Compose_CreateMessage: String { return self._s[1320]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1321]! } - public var Month_ShortNovember: String { return self._s[1322]! } - public var Conversation_ScamWarning: String { return self._s[1323]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1324]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1325]! } - public var NotificationsSound_Chime: String { return self._s[1326]! } - public var Passport_Language_ko: String { return self._s[1328]! } - public var InviteText_URL: String { return self._s[1329]! } - public var TextFormat_Monospace: String { return self._s[1330]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1327]! } + public var Profile_BotInfo: String { return self._s[1328]! } + public var Watch_Compose_CreateMessage: String { return self._s[1329]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1330]! } + public var Month_ShortNovember: String { return self._s[1331]! } + public var Conversation_ScamWarning: String { return self._s[1332]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1333]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1334]! } + public var NotificationsSound_Chime: String { return self._s[1335]! } + public var Passport_Language_ko: String { return self._s[1337]! } + public var InviteText_URL: String { return self._s[1338]! } + public var TextFormat_Monospace: String { return self._s[1339]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1331]!, self._r[1331]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1340]!, self._r[1340]!, [_1, _2, _3]) } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1332]!, self._r[1332]!, [_0]) + return formatWithArgumentRanges(self._s[1341]!, self._r[1341]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1333]!, self._r[1333]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1342]!, self._r[1342]!, [_1, _2]) } - public var Passport_InfoLearnMore: String { return self._s[1335]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1336]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1337]! } - public var Your_card_has_expired: String { return self._s[1338]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1339]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1340]! } - public var Conversation_Report: String { return self._s[1344]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1345]! } - public var Notification_MessageLifetime1m: String { return self._s[1346]! } - public var Privacy_ContactsTitle: String { return self._s[1347]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1348]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1349]! } - public var Channel_Members_Title: String { return self._s[1350]! } - public var Map_OpenInWaze: String { return self._s[1351]! } - public var Login_PhoneBannedError: String { return self._s[1352]! } + public var Passport_InfoLearnMore: String { return self._s[1344]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1345]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1346]! } + public var Your_card_has_expired: String { return self._s[1347]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1348]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1349]! } + public var Conversation_Report: String { return self._s[1353]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1354]! } + public var Notification_MessageLifetime1m: String { return self._s[1355]! } + public var Privacy_ContactsTitle: String { return self._s[1356]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1357]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1358]! } + public var Channel_Members_Title: String { return self._s[1359]! } + public var Map_OpenInWaze: String { return self._s[1360]! } + public var Login_PhoneBannedError: String { return self._s[1361]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1353]!, self._r[1353]!, [_0]) + return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_0]) } - public var Group_Management_AddModeratorHelp: String { return self._s[1354]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1355]! } - public var Common_OK: String { return self._s[1356]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1357]! } - public var Cache_Music: String { return self._s[1358]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1359]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1360]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1361]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1363]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1364]! } + public var Common_OK: String { return self._s[1365]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1366]! } + public var Cache_Music: String { return self._s[1367]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1368]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1369]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1370]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_1]) + return formatWithArgumentRanges(self._s[1371]!, self._r[1371]!, [_1]) } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1363]!, self._r[1363]!, [_0]) + return formatWithArgumentRanges(self._s[1372]!, self._r[1372]!, [_0]) } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1365]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1366]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1368]! } - public var State_ConnectingToProxyInfo: String { return self._s[1369]! } - public var Message_VideoMessage: String { return self._s[1371]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1372]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1373]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1374]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1375]! } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1376]! } - public var Activity_RecordingAudio: String { return self._s[1377]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1378]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1379]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1374]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1375]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1377]! } + public var State_ConnectingToProxyInfo: String { return self._s[1378]! } + public var Message_VideoMessage: String { return self._s[1380]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1381]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1382]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1383]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1384]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1385]! } + public var Activity_RecordingAudio: String { return self._s[1386]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1387]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1388]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1381]!, self._r[1381]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1390]!, self._r[1390]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1385]!, self._r[1385]!, [_0]) + return formatWithArgumentRanges(self._s[1394]!, self._r[1394]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1386]! } - public var UserInfo_AddPhone: String { return self._s[1387]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1388]! } + public var Conversation_ApplyLocalization: String { return self._s[1395]! } + public var UserInfo_AddPhone: String { return self._s[1396]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1397]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1389]!, self._r[1389]!, [_0]) + return formatWithArgumentRanges(self._s[1398]!, self._r[1398]!, [_0]) } - public var Passport_Scans: String { return self._s[1391]! } - public var BlockedUsers_Unblock: String { return self._s[1392]! } + public var Passport_Scans: String { return self._s[1400]! } + public var BlockedUsers_Unblock: String { return self._s[1401]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1393]!, self._r[1393]!, [_1]) + return formatWithArgumentRanges(self._s[1402]!, self._r[1402]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1394]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1395]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1396]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1397]! } + public var Channel_Management_LabelCreator: String { return self._s[1403]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1404]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1405]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1406]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1398]!, self._r[1398]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1407]!, self._r[1407]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1399]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1400]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1401]! } - public var ChannelIntro_CreateChannel: String { return self._s[1402]! } - public var Conversation_UnreadMessages: String { return self._s[1403]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1404]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1405]! } - public var Notification_GroupActivated: String { return self._s[1406]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1407]! } + public var Login_PhoneNumberHelp: String { return self._s[1408]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1409]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1410]! } + public var ChannelIntro_CreateChannel: String { return self._s[1411]! } + public var Conversation_UnreadMessages: String { return self._s[1412]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1413]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1414]! } + public var Notification_GroupActivated: String { return self._s[1415]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1416]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1408]!, self._r[1408]!, [_0]) - } - public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1409]!, self._r[1409]!, [_0, _1]) - } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1411]! } - public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1412]!, self._r[1412]!, [_0]) - } - public var Undo_DeletedChannel: String { return self._s[1413]! } - public var CallFeedback_AddComment: String { return self._s[1414]! } - public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1415]!, self._r[1415]!, [_0]) - } - public var Document_TargetConfirmationFormat: String { return self._s[1416]! } - public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1417]!, self._r[1417]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1418]! } + public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1418]!, self._r[1418]!, [_0, _1]) + } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1420]! } + public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1421]!, self._r[1421]!, [_0]) + } + public var Undo_DeletedChannel: String { return self._s[1422]! } + public var CallFeedback_AddComment: String { return self._s[1423]! } + public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1424]!, self._r[1424]!, [_0]) + } + public var Document_TargetConfirmationFormat: String { return self._s[1425]! } + public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1426]!, self._r[1426]!, [_0]) + } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1427]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1419]!, self._r[1419]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1428]!, self._r[1428]!, [_1, _2, _3, _4]) } - public var Contacts_SortByName: String { return self._s[1420]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1421]! } + public var Contacts_SortByName: String { return self._s[1429]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1430]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1432]!, self._r[1432]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1424]! } - public var Conversation_ClearSelfHistory: String { return self._s[1425]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1426]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1427]! } - public var Stickers_SuggestNone: String { return self._s[1428]! } - public var ChatSettings_Cache: String { return self._s[1429]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1430]! } - public var Media_ShareThisPhoto: String { return self._s[1431]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1432]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1433]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1434]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1435]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1436]! } - public var Permissions_CellularDataTitle_v0: String { return self._s[1437]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1439]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1440]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1441]! } - public var Map_OpenIn: String { return self._s[1442]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1433]! } + public var Conversation_ClearSelfHistory: String { return self._s[1434]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1435]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1436]! } + public var Stickers_SuggestNone: String { return self._s[1437]! } + public var ChatSettings_Cache: String { return self._s[1438]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1439]! } + public var Media_ShareThisPhoto: String { return self._s[1440]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1441]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1442]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1443]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1444]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1445]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1446]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1448]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1449]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1450]! } + public var Map_OpenIn: String { return self._s[1451]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_1]) + return formatWithArgumentRanges(self._s[1454]!, self._r[1454]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1446]!, self._r[1446]!, [_0]) + return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_0]) } - public var MessagePoll_LabelClosed: String { return self._s[1447]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1449]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1450]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1451]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1452]! } - public var Login_SelectCountry_Title: String { return self._s[1453]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1454]! } + public var MessagePoll_LabelClosed: String { return self._s[1456]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1458]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1459]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1460]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1461]! } + public var Login_SelectCountry_Title: String { return self._s[1462]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1463]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1464]!, self._r[1464]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1456]! } - public var Watch_Suggestion_BRB: String { return self._s[1457]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1458]! } - public var Contacts_PermissionsTitle: String { return self._s[1459]! } - public var Conversation_RestrictedInline: String { return self._s[1460]! } - public var StickerPack_ViewPack: String { return self._s[1462]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1465]! } + public var Watch_Suggestion_BRB: String { return self._s[1466]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1467]! } + public var Contacts_PermissionsTitle: String { return self._s[1468]! } + public var Conversation_RestrictedInline: String { return self._s[1469]! } + public var StickerPack_ViewPack: String { return self._s[1471]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1463]!, self._r[1463]!, [_0]) + return formatWithArgumentRanges(self._s[1472]!, self._r[1472]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1465]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1468]! } - public var Channel_Info_Stickers: String { return self._s[1470]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1471]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1472]! } - public var Passport_DeletePersonalDetails: String { return self._s[1473]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1474]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1475]! } - public var Conversation_SearchNoResults: String { return self._s[1477]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1478]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1479]! } - public var Login_Code: String { return self._s[1480]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1481]! } - public var Weekday_ShortThursday: String { return self._s[1482]! } - public var Resolve_ErrorNotFound: String { return self._s[1484]! } - public var LastSeen_Offline: String { return self._s[1485]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1486]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1487]! } - public var GroupInfo_Title: String { return self._s[1488]! } - public var NotificationsSound_Note: String { return self._s[1489]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1490]! } - public var Watch_Message_Poll: String { return self._s[1491]! } - public var Privacy_Calls: String { return self._s[1492]! } - public var Month_ShortAugust: String { return self._s[1493]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1494]! } - public var Notifications_Reset: String { return self._s[1495]! } - public var Conversation_Pin: String { return self._s[1496]! } - public var Passport_Language_lv: String { return self._s[1497]! } - public var BlockedUsers_Info: String { return self._s[1498]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1500]! } - public var Watch_Conversation_Unblock: String { return self._s[1502]! } + public var Compose_NewChannel: String { return self._s[1474]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1477]! } + public var Channel_Info_Stickers: String { return self._s[1479]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1480]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1481]! } + public var Passport_DeletePersonalDetails: String { return self._s[1482]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1483]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1484]! } + public var Conversation_SearchNoResults: String { return self._s[1486]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1487]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1488]! } + public var Login_Code: String { return self._s[1489]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1490]! } + public var Weekday_ShortThursday: String { return self._s[1491]! } + public var Resolve_ErrorNotFound: String { return self._s[1493]! } + public var LastSeen_Offline: String { return self._s[1494]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1495]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1496]! } + public var GroupInfo_Title: String { return self._s[1497]! } + public var NotificationsSound_Note: String { return self._s[1498]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1499]! } + public var Watch_Message_Poll: String { return self._s[1500]! } + public var Privacy_Calls: String { return self._s[1501]! } + public var Month_ShortAugust: String { return self._s[1502]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1503]! } + public var Notifications_Reset: String { return self._s[1504]! } + public var Conversation_Pin: String { return self._s[1505]! } + public var Passport_Language_lv: String { return self._s[1506]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1507]! } + public var BlockedUsers_Info: String { return self._s[1508]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1510]! } + public var Watch_Conversation_Unblock: String { return self._s[1512]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_0]) + return formatWithArgumentRanges(self._s[1513]!, self._r[1513]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1504]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1505]! } + public var CloudStorage_Title: String { return self._s[1514]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1515]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1506]!, self._r[1506]!, [_0]) + return formatWithArgumentRanges(self._s[1516]!, self._r[1516]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1507]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1508]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1509]! } - public var Passport_Address_EditBankStatement: String { return self._s[1510]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1517]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1518]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1519]! } + public var Passport_Address_EditBankStatement: String { return self._s[1520]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1521]!, self._r[1521]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1512]! } - public var ShareMenu_Comment: String { return self._s[1513]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1514]! } - public var Notifications_PermissionsTitle: String { return self._s[1515]! } - public var GroupPermission_NoSendLinks: String { return self._s[1516]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1517]! } - public var Settings_Support: String { return self._s[1518]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1519]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1520]! } - public var Privacy_Forwards_Preview: String { return self._s[1521]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1522]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1523]! } - public var Common_Select: String { return self._s[1525]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1526]! } - public var WallpaperSearch_ColorGray: String { return self._s[1528]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1529]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1530]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1531]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1532]! } - public var Widget_AuthRequired: String { return self._s[1533]! } - public var Camera_FlashOn: String { return self._s[1534]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1535]! } - public var Watch_Suggestion_OK: String { return self._s[1536]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1522]! } + public var ShareMenu_Comment: String { return self._s[1523]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1524]! } + public var Notifications_PermissionsTitle: String { return self._s[1525]! } + public var GroupPermission_NoSendLinks: String { return self._s[1526]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1527]! } + public var Settings_Support: String { return self._s[1528]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1529]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1530]! } + public var Privacy_Forwards_Preview: String { return self._s[1531]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1532]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1533]! } + public var Common_Select: String { return self._s[1535]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1536]! } + public var WallpaperSearch_ColorGray: String { return self._s[1538]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1539]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1540]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1541]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1542]! } + public var Widget_AuthRequired: String { return self._s[1543]! } + public var Camera_FlashOn: String { return self._s[1544]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1545]! } + public var Watch_Suggestion_OK: String { return self._s[1546]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_0]) + return formatWithArgumentRanges(self._s[1548]!, self._r[1548]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1540]!, self._r[1540]!, [_0]) + return formatWithArgumentRanges(self._s[1550]!, self._r[1550]!, [_0]) } - public var DialogList_AdLabel: String { return self._s[1541]! } - public var WatchRemote_NotificationText: String { return self._s[1542]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1543]! } - public var Conversation_ReportSpam: String { return self._s[1544]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1545]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1547]! } - public var PhoneLabel_Title: String { return self._s[1548]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1549]! } - public var Settings_ChangePhoneNumber: String { return self._s[1550]! } - public func AddContact_ContactWillBeSharedNow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1551]!, self._r[1551]!, [_0]) - } - public var Notifications_ExceptionsTitle: String { return self._s[1552]! } - public var Notifications_AlertTones: String { return self._s[1553]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1554]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1555]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1556]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1558]! } - public var ReportPeer_ReasonOther: String { return self._s[1559]! } - public var KeyCommand_ScrollDown: String { return self._s[1561]! } + public var DialogList_AdLabel: String { return self._s[1551]! } + public var WatchRemote_NotificationText: String { return self._s[1552]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1553]! } + public var Conversation_ReportSpam: String { return self._s[1554]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1555]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1557]! } + public var PhoneLabel_Title: String { return self._s[1558]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1559]! } + public var Settings_ChangePhoneNumber: String { return self._s[1560]! } + public var Notifications_ExceptionsTitle: String { return self._s[1561]! } + public var Notifications_AlertTones: String { return self._s[1562]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1563]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1564]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1565]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1567]! } + public var ReportPeer_ReasonOther: String { return self._s[1568]! } + public var KeyCommand_ScrollDown: String { return self._s[1570]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1562]!, self._r[1562]!, [_0]) + return formatWithArgumentRanges(self._s[1571]!, self._r[1571]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1563]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1564]! } - public var AuthSessions_LogOut: String { return self._s[1565]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1566]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1567]! } - public var Passport_Phone_Title: String { return self._s[1568]! } - public var Settings_PhoneNumber: String { return self._s[1569]! } - public var NotificationsSound_Alert: String { return self._s[1570]! } - public var WebSearch_SearchNoResults: String { return self._s[1571]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1573]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1574]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1575]! } - public var PhotoEditor_CurvesTool: String { return self._s[1576]! } - public var Checkout_PaymentMethod: String { return self._s[1578]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1572]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1573]! } + public var AuthSessions_LogOut: String { return self._s[1574]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1575]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1576]! } + public var Passport_Phone_Title: String { return self._s[1577]! } + public var Settings_PhoneNumber: String { return self._s[1578]! } + public var NotificationsSound_Alert: String { return self._s[1579]! } + public var WebSearch_SearchNoResults: String { return self._s[1580]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1582]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1583]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1584]! } + public var PhotoEditor_CurvesTool: String { return self._s[1585]! } + public var Checkout_PaymentMethod: String { return self._s[1587]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1579]!, self._r[1579]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1588]!, self._r[1588]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1580]! } - public var Camera_PhotoMode: String { return self._s[1583]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1584]! } - public var CallSettings_OnMobile: String { return self._s[1585]! } - public var Tour_Text2: String { return self._s[1586]! } + public var Contacts_AccessDeniedError: String { return self._s[1589]! } + public var Camera_PhotoMode: String { return self._s[1592]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1593]! } + public var CallSettings_OnMobile: String { return self._s[1594]! } + public var Tour_Text2: String { return self._s[1595]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1587]!, self._r[1587]!, [_1, _2]) - } - public var DialogList_EncryptionProcessing: String { return self._s[1589]! } - public var Permissions_Skip: String { return self._s[1590]! } - public var SecretImage_Title: String { return self._s[1591]! } - public var Watch_MessageView_Title: String { return self._s[1592]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1593]! } - public var AttachmentMenu_Poll: String { return self._s[1594]! } - public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1595]!, self._r[1595]!, [_0]) - } - public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1596]!, self._r[1596]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1597]! } - public var WallpaperPreview_Title: String { return self._s[1598]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1599]! } - public var Settings_ProxyConnecting: String { return self._s[1600]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1602]! } - public var Profile_MessageLifetime5s: String { return self._s[1603]! } - public var Username_InvalidCharacters: String { return self._s[1604]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1605]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1606]! } - public var Settings_AddAccount: String { return self._s[1607]! } - public var Notification_CreatedChannel: String { return self._s[1610]! } + public var DialogList_EncryptionProcessing: String { return self._s[1598]! } + public var Permissions_Skip: String { return self._s[1599]! } + public var SecretImage_Title: String { return self._s[1600]! } + public var Watch_MessageView_Title: String { return self._s[1601]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1602]! } + public var AttachmentMenu_Poll: String { return self._s[1603]! } + public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1604]!, self._r[1604]!, [_0]) + } + public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1605]!, self._r[1605]!, [_1, _2]) + } + public var Notification_CallCanceled: String { return self._s[1606]! } + public var WallpaperPreview_Title: String { return self._s[1607]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1608]! } + public var Settings_ProxyConnecting: String { return self._s[1609]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1611]! } + public var Profile_MessageLifetime5s: String { return self._s[1612]! } + public var Username_InvalidCharacters: String { return self._s[1613]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1614]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1615]! } + public var Settings_AddAccount: String { return self._s[1616]! } + public var Notification_CreatedChannel: String { return self._s[1619]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1611]!, self._r[1611]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1613]! } - public var Contacts_TopSection: String { return self._s[1614]! } + public var Passcode_AppLockedAlert: String { return self._s[1622]! } + public var Contacts_TopSection: String { return self._s[1623]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1615]!, self._r[1615]!, [_0]) + return formatWithArgumentRanges(self._s[1624]!, self._r[1624]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1616]! } - public var UserInfo_TapToCall: String { return self._s[1617]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1619]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1620]! } - public var Common_Search: String { return self._s[1621]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1622]! } - public var Message_InvoiceLabel: String { return self._s[1623]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1624]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1625]! } + public var ReportPeer_ReasonSpam: String { return self._s[1625]! } + public var UserInfo_TapToCall: String { return self._s[1626]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1628]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1629]! } + public var Common_Search: String { return self._s[1630]! } + public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1631]!, self._r[1631]!, [_0]) + } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1632]! } + public var Message_InvoiceLabel: String { return self._s[1633]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1634]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1635]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1626]!, self._r[1626]!, [_0]) + return formatWithArgumentRanges(self._s[1636]!, self._r[1636]!, [_0]) } - public var Conversation_Info: String { return self._s[1627]! } - public var Login_InfoDeletePhoto: String { return self._s[1628]! } - public var Passport_Language_vi: String { return self._s[1630]! } - public var UserInfo_ScamUserWarning: String { return self._s[1631]! } - public var Conversation_Search: String { return self._s[1632]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1633]! } - public var ReportPeer_ReasonPornography: String { return self._s[1634]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1635]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1636]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1637]! } - public var Channel_Setup_TypeHeader: String { return self._s[1638]! } - public var AuthSessions_LoggedIn: String { return self._s[1639]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1640]! } - public var Login_SmsRequestState3: String { return self._s[1641]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1642]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1643]! } - public var Channel_Edit_LinkItem: String { return self._s[1644]! } - public var Privacy_Calls_P2PNever: String { return self._s[1645]! } - public var Conversation_AddToReadingList: String { return self._s[1647]! } - public var Message_Animation: String { return self._s[1648]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[1649]! } - public var Map_Unknown: String { return self._s[1650]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[1651]! } + public var Conversation_Info: String { return self._s[1637]! } + public var Login_InfoDeletePhoto: String { return self._s[1638]! } + public var Passport_Language_vi: String { return self._s[1640]! } + public var UserInfo_ScamUserWarning: String { return self._s[1641]! } + public var Conversation_Search: String { return self._s[1642]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1643]! } + public var ReportPeer_ReasonPornography: String { return self._s[1644]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1645]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1646]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1647]! } + public var Channel_Setup_TypeHeader: String { return self._s[1648]! } + public var AuthSessions_LoggedIn: String { return self._s[1649]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1650]! } + public var Login_SmsRequestState3: String { return self._s[1651]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1652]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1653]! } + public var Channel_Edit_LinkItem: String { return self._s[1654]! } + public var Privacy_Calls_P2PNever: String { return self._s[1655]! } + public var Conversation_AddToReadingList: String { return self._s[1657]! } + public var Message_Animation: String { return self._s[1658]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1659]! } + public var Map_Unknown: String { return self._s[1660]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[1661]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1652]!, self._r[1652]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1662]!, self._r[1662]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1653]!, self._r[1653]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1663]!, self._r[1663]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[1654]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[1655]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1656]! } + public var Call_StatusRequesting: String { return self._s[1664]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1665]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1666]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1657]!, self._r[1657]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1667]!, self._r[1667]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1658]!, self._r[1658]!, [_0]) + return formatWithArgumentRanges(self._s[1668]!, self._r[1668]!, [_0]) } - public var Update_Skip: String { return self._s[1659]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1660]! } - public var Message_PinnedPollMessage: String { return self._s[1661]! } - public var BlockedUsers_Title: String { return self._s[1662]! } + public var Update_Skip: String { return self._s[1669]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1670]! } + public var Message_PinnedPollMessage: String { return self._s[1671]! } + public var BlockedUsers_Title: String { return self._s[1672]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1663]!, self._r[1663]!, [_1]) + return formatWithArgumentRanges(self._s[1673]!, self._r[1673]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[1664]! } - public var NotificationsSound_Bell: String { return self._s[1665]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[1666]! } - public var Weekday_Monday: String { return self._s[1667]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1668]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1669]! } - public var ChatSettings_Groups: String { return self._s[1670]! } - public var Your_card_was_declined: String { return self._s[1671]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1673]! } - public var ChatList_Unmute: String { return self._s[1674]! } - public var PhotoEditor_CurvesAll: String { return self._s[1675]! } - public var Weekday_ShortTuesday: String { return self._s[1676]! } - public var DialogList_Read: String { return self._s[1677]! } - public var Appearance_AppIconClassic: String { return self._s[1678]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1679]! } - public var Passport_Identity_Gender: String { return self._s[1680]! } + public var Username_CheckingUsername: String { return self._s[1674]! } + public var NotificationsSound_Bell: String { return self._s[1675]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1676]! } + public var Weekday_Monday: String { return self._s[1677]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1678]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1679]! } + public var ChatSettings_Groups: String { return self._s[1680]! } + public var Your_card_was_declined: String { return self._s[1681]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1683]! } + public var ChatList_Unmute: String { return self._s[1684]! } + public var PhotoEditor_CurvesAll: String { return self._s[1685]! } + public var Weekday_ShortTuesday: String { return self._s[1686]! } + public var DialogList_Read: String { return self._s[1687]! } + public var Appearance_AppIconClassic: String { return self._s[1688]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1689]! } + public var Passport_Identity_Gender: String { return self._s[1690]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_0]) + return formatWithArgumentRanges(self._s[1691]!, self._r[1691]!, [_0]) } - public var Target_SelectGroup: String { return self._s[1682]! } + public var Target_SelectGroup: String { return self._s[1692]! } public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1684]!, self._r[1684]!, [_0]) + return formatWithArgumentRanges(self._s[1694]!, self._r[1694]!, [_0]) } - public var Passport_Language_en: String { return self._s[1685]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1686]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1687]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[1688]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[1690]! } - public var Login_InfoHelp: String { return self._s[1691]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1692]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1693]! } + public var Passport_Language_en: String { return self._s[1695]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1696]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1697]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[1698]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[1700]! } + public var Login_InfoHelp: String { return self._s[1701]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1702]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1703]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1694]!, self._r[1694]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1704]!, self._r[1704]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[1697]! } - public var CreatePoll_Title: String { return self._s[1698]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1699]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1700]! } - public var UserInfo_GroupsInCommon: String { return self._s[1701]! } - public var Call_AudioRouteHide: String { return self._s[1702]! } - public var ContactInfo_PhoneLabelMobile: String { return self._s[1704]! } + public var SocksProxySetup_AddProxy: String { return self._s[1707]! } + public var CreatePoll_Title: String { return self._s[1708]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1709]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1710]! } + public var UserInfo_GroupsInCommon: String { return self._s[1711]! } + public var Call_AudioRouteHide: String { return self._s[1712]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[1714]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1705]!, self._r[1705]!, [_0]) + return formatWithArgumentRanges(self._s[1715]!, self._r[1715]!, [_0]) } - public var TextFormat_Bold: String { return self._s[1706]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[1707]! } - public var Notifications_Title: String { return self._s[1708]! } - public var Group_Username_InvalidTooShort: String { return self._s[1709]! } - public var Channel_ErrorAddTooMuch: String { return self._s[1710]! } + public var TextFormat_Bold: String { return self._s[1716]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[1717]! } + public var Notifications_Title: String { return self._s[1718]! } + public var Group_Username_InvalidTooShort: String { return self._s[1719]! } + public var Channel_ErrorAddTooMuch: String { return self._s[1720]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1721]!, self._r[1721]!, ["\(_0)"]) } - public var Stickers_SuggestAdded: String { return self._s[1713]! } - public var Login_CountryCode: String { return self._s[1714]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[1715]! } - public var Map_GetDirections: String { return self._s[1716]! } - public var Login_PhoneFloodError: String { return self._s[1717]! } + public var Stickers_SuggestAdded: String { return self._s[1723]! } + public var Login_CountryCode: String { return self._s[1724]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[1725]! } + public var Map_GetDirections: String { return self._s[1726]! } + public var Login_PhoneFloodError: String { return self._s[1727]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1718]!, self._r[1718]!, [_0]) - } - public var Settings_SetUsername: String { return self._s[1720]! } - public var Notification_GroupInviterSelf: String { return self._s[1721]! } - public var InstantPage_TapToOpenLink: String { return self._s[1722]! } - public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1723]!, self._r[1723]!, [_0]) - } - public var Watch_Suggestion_TalkLater: String { return self._s[1724]! } - public var SecretChat_Title: String { return self._s[1725]! } - public var Group_UpgradeNoticeText1: String { return self._s[1726]! } - public var AuthSessions_Title: String { return self._s[1727]! } - public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1728]!, self._r[1728]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[1729]! } - public var Channel_About_Title: String { return self._s[1730]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[1731]! } - public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1733]!, self._r[1733]!, ["\(_0)"]) + public var Settings_SetUsername: String { return self._s[1730]! } + public var Group_Location_ChangeLocation: String { return self._s[1731]! } + public var Notification_GroupInviterSelf: String { return self._s[1732]! } + public var InstantPage_TapToOpenLink: String { return self._s[1733]! } + public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1734]!, self._r[1734]!, [_0]) } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1735]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[1736]! } - public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1737]!, self._r[1737]!, [_1]) - } - public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Watch_Suggestion_TalkLater: String { return self._s[1735]! } + public var SecretChat_Title: String { return self._s[1736]! } + public var Group_UpgradeNoticeText1: String { return self._s[1737]! } + public var AuthSessions_Title: String { return self._s[1738]! } + public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1739]!, self._r[1739]!, [_0]) } - public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1740]!, self._r[1740]!, [_0]) + public var PhotoEditor_CropAuto: String { return self._s[1740]! } + public var Channel_About_Title: String { return self._s[1741]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[1742]! } + public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1744]!, self._r[1744]!, ["\(_0)"]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[1741]! } - public var Presence_online: String { return self._s[1743]! } - public var PasscodeSettings_Title: String { return self._s[1744]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1745]! } - public var Web_OpenExternal: String { return self._s[1746]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[1748]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[1749]! } - public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1746]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[1747]! } + public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1748]!, self._r[1748]!, [_1]) + } + public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1750]!, self._r[1750]!, [_0]) } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1751]! } - public var Map_YouAreHere: String { return self._s[1752]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1753]!, self._r[1753]!, [_0]) + public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1751]!, self._r[1751]!, [_0]) } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1754]!, self._r[1754]!, [_0]) - } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1755]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1756]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1757]!, self._r[1757]!, [_0]) - } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1758]!, self._r[1758]!, [_0]) - } - public var SocksProxySetup_Username: String { return self._s[1759]! } - public var Bot_Start: String { return self._s[1760]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Privacy_PaymentsClearInfoHelp: String { return self._s[1752]! } + public var Presence_online: String { return self._s[1754]! } + public var PasscodeSettings_Title: String { return self._s[1755]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1756]! } + public var Web_OpenExternal: String { return self._s[1757]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[1759]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[1760]! } + public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1761]!, self._r[1761]!, [_0]) } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1762]!, self._r[1762]!, [_0]) + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1762]! } + public var Map_YouAreHere: String { return self._s[1763]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[1763]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1765]! } + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1765]!, self._r[1765]!, [_0]) + } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1766]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1767]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1768]!, self._r[1768]!, [_0]) + } + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1769]!, self._r[1769]!, [_0]) + } + public var SocksProxySetup_Username: String { return self._s[1770]! } + public var Bot_Start: String { return self._s[1771]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1772]!, self._r[1772]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1773]!, self._r[1773]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[1774]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1776]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1766]!, self._r[1766]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1777]!, self._r[1777]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1767]!, self._r[1767]!, [_0]) + return formatWithArgumentRanges(self._s[1778]!, self._r[1778]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1768]!, self._r[1768]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1779]!, self._r[1779]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[1769]! } - public var Login_InfoAvatarPhoto: String { return self._s[1770]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1771]! } - public var Tour_Title4: String { return self._s[1772]! } - public var Passport_Identity_Translation: String { return self._s[1773]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1774]! } - public var Login_TermsOfServiceLabel: String { return self._s[1776]! } - public var Passport_Language_it: String { return self._s[1777]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1778]! } - public var Passport_Identity_SelfieHelp: String { return self._s[1779]! } - public var Conversation_ClearAll: String { return self._s[1781]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[1783]! } - public var TwoStepAuth_FloodError: String { return self._s[1784]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[1780]! } + public var Login_InfoAvatarPhoto: String { return self._s[1781]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1782]! } + public var Tour_Title4: String { return self._s[1783]! } + public var Passport_Identity_Translation: String { return self._s[1784]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1785]! } + public var Login_TermsOfServiceLabel: String { return self._s[1787]! } + public var Passport_Language_it: String { return self._s[1788]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1789]! } + public var Passport_Identity_SelfieHelp: String { return self._s[1790]! } + public var Conversation_ClearAll: String { return self._s[1792]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[1794]! } + public var TwoStepAuth_FloodError: String { return self._s[1795]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1785]!, self._r[1785]!, [_1]) + return formatWithArgumentRanges(self._s[1796]!, self._r[1796]!, [_1]) } - public var Paint_Delete: String { return self._s[1786]! } - public var Privacy_AddNewPeer: String { return self._s[1787]! } - public var LogoutOptions_SetPasscodeText: String { return self._s[1788]! } + public var Paint_Delete: String { return self._s[1797]! } + public var Privacy_AddNewPeer: String { return self._s[1798]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[1799]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1789]!, self._r[1789]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1800]!, self._r[1800]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[1790]! } + public var Message_PinnedAudioMessage: String { return self._s[1801]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1791]!, self._r[1791]!, [_0]) + return formatWithArgumentRanges(self._s[1802]!, self._r[1802]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[1792]! } - public var Notifications_GroupNotificationsSound: String { return self._s[1793]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[1794]! } - public var Conversation_MessageEditedLabel: String { return self._s[1795]! } - public var Notification_Exceptions_AlwaysOff: String { return self._s[1796]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[1797]! } + public var Notification_Mute1hMin: String { return self._s[1803]! } + public var Notifications_GroupNotificationsSound: String { return self._s[1804]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[1805]! } + public var Conversation_MessageEditedLabel: String { return self._s[1806]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[1807]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[1808]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1798]!, self._r[1798]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1809]!, self._r[1809]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[1799]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[1810]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1800]!, self._r[1800]!, [_1]) + return formatWithArgumentRanges(self._s[1811]!, self._r[1811]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[1801]! } - public var Month_GenOctober: String { return self._s[1802]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1803]! } - public var EnterPasscode_EnterPasscode: String { return self._s[1804]! } - public var MediaPicker_TimerTooltip: String { return self._s[1806]! } - public var SharedMedia_TitleAll: String { return self._s[1807]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[1810]! } - public var Conversation_RestrictedMedia: String { return self._s[1811]! } - public var AccessDenied_PhotosRestricted: String { return self._s[1812]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[1814]! } - public var ChangePhoneNumberCode_Called: String { return self._s[1815]! } + public var AccessDenied_LocationTracking: String { return self._s[1812]! } + public var Month_GenOctober: String { return self._s[1813]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1814]! } + public var EnterPasscode_EnterPasscode: String { return self._s[1815]! } + public var MediaPicker_TimerTooltip: String { return self._s[1817]! } + public var SharedMedia_TitleAll: String { return self._s[1818]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[1821]! } + public var Conversation_RestrictedMedia: String { return self._s[1822]! } + public var AccessDenied_PhotosRestricted: String { return self._s[1823]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[1825]! } + public var ChangePhoneNumberCode_Called: String { return self._s[1826]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1816]!, self._r[1816]!, [_0]) + return formatWithArgumentRanges(self._s[1827]!, self._r[1827]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[1819]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[1821]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1822]! } + public var Conversation_SavedMessages: String { return self._s[1830]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[1832]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1833]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1824]!, self._r[1824]!, [_0]) + return formatWithArgumentRanges(self._s[1835]!, self._r[1835]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[1825]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1826]! } + public var ReportPeer_AlertSuccess: String { return self._s[1836]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1837]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1827]!, self._r[1827]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1838]!, self._r[1838]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[1828]! } - public var PhotoEditor_FadeTool: String { return self._s[1829]! } - public var Privacy_ContactsReset: String { return self._s[1830]! } + public var Checkout_PasswordEntry_Title: String { return self._s[1839]! } + public var PhotoEditor_FadeTool: String { return self._s[1840]! } + public var Privacy_ContactsReset: String { return self._s[1841]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1832]!, self._r[1832]!, [_0]) + return formatWithArgumentRanges(self._s[1843]!, self._r[1843]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[1833]! } - public var ChatList_Mute: String { return self._s[1834]! } - public var Permissions_CellularDataText_v0: String { return self._s[1835]! } - public var ShareMenu_SelectChats: String { return self._s[1837]! } - public var MusicPlayer_VoiceNote: String { return self._s[1838]! } - public var Conversation_RestrictedText: String { return self._s[1839]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[1840]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[1841]! } - public var Cache_Videos: String { return self._s[1842]! } - public var PrivacySettings_PhoneNumber: String { return self._s[1843]! } - public var FeatureDisabled_Oops: String { return self._s[1845]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[1846]! } + public var Message_PinnedVideoMessage: String { return self._s[1844]! } + public var ChatList_Mute: String { return self._s[1845]! } + public var Permissions_CellularDataText_v0: String { return self._s[1846]! } + public var ShareMenu_SelectChats: String { return self._s[1848]! } + public var MusicPlayer_VoiceNote: String { return self._s[1849]! } + public var Conversation_RestrictedText: String { return self._s[1850]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[1851]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[1852]! } + public var Cache_Videos: String { return self._s[1853]! } + public var PrivacySettings_PhoneNumber: String { return self._s[1854]! } + public var FeatureDisabled_Oops: String { return self._s[1856]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[1857]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1847]!, self._r[1847]!, [_0]) + return formatWithArgumentRanges(self._s[1858]!, self._r[1858]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[1848]! } - public var GroupPermission_NoSendPolls: String { return self._s[1849]! } - public var Message_VideoExpired: String { return self._s[1851]! } - public var Notifications_Badge: String { return self._s[1852]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[1853]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[1854]! } - public var Username_InvalidTooShort: String { return self._s[1855]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[1856]! } - public var Channel_AdminLog_PinMessages: String { return self._s[1857]! } - public var ArchivedChats_IntroTitle3: String { return self._s[1858]! } + public var Stickers_GroupStickersHelp: String { return self._s[1859]! } + public var GroupPermission_NoSendPolls: String { return self._s[1860]! } + public var Message_VideoExpired: String { return self._s[1862]! } + public var Notifications_Badge: String { return self._s[1863]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[1864]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[1865]! } + public var Username_InvalidTooShort: String { return self._s[1866]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[1867]! } + public var Channel_AdminLog_PinMessages: String { return self._s[1868]! } + public var ArchivedChats_IntroTitle3: String { return self._s[1869]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1859]!, self._r[1859]!, [_1]) + return formatWithArgumentRanges(self._s[1870]!, self._r[1870]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[1860]! } - public var Conversation_DefaultRestrictedText: String { return self._s[1861]! } - public var SharedMedia_CategoryDocs: String { return self._s[1864]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[1871]! } + public var Conversation_DefaultRestrictedText: String { return self._s[1872]! } + public var SharedMedia_CategoryDocs: String { return self._s[1875]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1865]!, self._r[1865]!, [_1]) + return formatWithArgumentRanges(self._s[1876]!, self._r[1876]!, [_1]) } - public var Privacy_Forwards_NeverLink: String { return self._s[1867]! } + public var Privacy_Forwards_NeverLink: String { return self._s[1878]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1868]!, self._r[1868]!, [_1]) + return formatWithArgumentRanges(self._s[1879]!, self._r[1879]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[1869]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[1880]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1870]!, self._r[1870]!, [_0]) + return formatWithArgumentRanges(self._s[1881]!, self._r[1881]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[1871]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[1872]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[1873]! } - public var Channel_UpdatePhotoItem: String { return self._s[1874]! } - public var GroupInfo_LeftStatus: String { return self._s[1875]! } - public var Watch_MessageView_Forward: String { return self._s[1877]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[1878]! } - public var Cache_ClearEmpty: String { return self._s[1880]! } - public var Localization_LanguageName: String { return self._s[1881]! } - public var WebSearch_GIFs: String { return self._s[1882]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1883]! } - public var Username_InvalidStartsWithNumber: String { return self._s[1884]! } - public var Common_Back: String { return self._s[1885]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[1886]! } + public var ChatSettings_PrivateChats: String { return self._s[1882]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[1883]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[1884]! } + public var Channel_UpdatePhotoItem: String { return self._s[1885]! } + public var GroupInfo_LeftStatus: String { return self._s[1886]! } + public var Watch_MessageView_Forward: String { return self._s[1888]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[1889]! } + public var Cache_ClearEmpty: String { return self._s[1891]! } + public var Localization_LanguageName: String { return self._s[1892]! } + public var WebSearch_GIFs: String { return self._s[1893]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1894]! } + public var Username_InvalidStartsWithNumber: String { return self._s[1895]! } + public var Common_Back: String { return self._s[1896]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[1897]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1887]!, self._r[1887]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1898]!, self._r[1898]!, [_1, _2]) } - public var Passport_Email_Help: String { return self._s[1888]! } - public var Watch_Conversation_Reply: String { return self._s[1890]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[1892]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[1893]! } - public var Channel_BanUser_Unban: String { return self._s[1895]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[1896]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[1897]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[1899]! } - public var Passport_Identity_Name: String { return self._s[1900]! } + public var Passport_Email_Help: String { return self._s[1899]! } + public var Watch_Conversation_Reply: String { return self._s[1901]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[1903]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[1904]! } + public var Channel_BanUser_Unban: String { return self._s[1906]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[1907]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[1908]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[1910]! } + public var Passport_Identity_Name: String { return self._s[1911]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0]) + return formatWithArgumentRanges(self._s[1912]!, self._r[1912]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[1902]! } - public var Conversation_BlockUser: String { return self._s[1903]! } - public var Month_GenJanuary: String { return self._s[1904]! } - public var ChatSettings_TextSize: String { return self._s[1905]! } - public var Notification_PassportValuePhone: String { return self._s[1906]! } - public var Passport_Language_ne: String { return self._s[1907]! } - public var Notification_CallBack: String { return self._s[1908]! } - public var TwoStepAuth_EmailHelp: String { return self._s[1909]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[1913]! } + public var Conversation_BlockUser: String { return self._s[1914]! } + public var Month_GenJanuary: String { return self._s[1915]! } + public var ChatSettings_TextSize: String { return self._s[1916]! } + public var Notification_PassportValuePhone: String { return self._s[1917]! } + public var Passport_Language_ne: String { return self._s[1918]! } + public var Notification_CallBack: String { return self._s[1919]! } + public var TwoStepAuth_EmailHelp: String { return self._s[1920]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1910]!, self._r[1910]!, [_0]) - } - public var Channel_Info_Management: String { return self._s[1911]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[1912]! } - public var Stickers_FrequentlyUsed: String { return self._s[1913]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[1914]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1916]! } - public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1917]!, self._r[1917]!, [_1, "\(_2)"]) - } - public var Passport_Address_EditResidentialAddress: String { return self._s[1918]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[1919]! } - public var CreatePoll_TextHeader: String { return self._s[1920]! } - public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1921]!, self._r[1921]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[1922]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[1923]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[1925]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[1926]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[1927]! } + public var Channel_Info_Management: String { return self._s[1922]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[1923]! } + public var Stickers_FrequentlyUsed: String { return self._s[1924]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[1925]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1927]! } + public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1928]!, self._r[1928]!, [_1, "\(_2)"]) + } + public var Passport_Address_EditResidentialAddress: String { return self._s[1929]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[1930]! } + public var CreatePoll_TextHeader: String { return self._s[1931]! } + public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1932]!, self._r[1932]!, [_0]) + } + public var PhotoEditor_QualityMedium: String { return self._s[1933]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[1934]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[1936]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[1937]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[1938]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1928]!, self._r[1928]!, [_0]) + return formatWithArgumentRanges(self._s[1939]!, self._r[1939]!, [_0]) } - public var Conversation_LinkDialogOpen: String { return self._s[1930]! } - public var Settings_Username: String { return self._s[1931]! } - public var Conversation_Block: String { return self._s[1933]! } - public var Wallpaper_Wallpaper: String { return self._s[1934]! } - public var SocksProxySetup_UseProxy: String { return self._s[1936]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[1937]! } - public var MessageTimer_Forever: String { return self._s[1938]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[1939]! } - public var PhotoEditor_DiscardChanges: String { return self._s[1940]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1941]! } - public var Passport_Language_da: String { return self._s[1942]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[1943]! } + public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1940]!, self._r[1940]!, [_1]) + } + public var Conversation_LinkDialogOpen: String { return self._s[1942]! } + public var Settings_Username: String { return self._s[1943]! } + public var Conversation_Block: String { return self._s[1945]! } + public var Wallpaper_Wallpaper: String { return self._s[1946]! } + public var SocksProxySetup_UseProxy: String { return self._s[1948]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[1949]! } + public var MessageTimer_Forever: String { return self._s[1950]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[1951]! } + public var PhotoEditor_DiscardChanges: String { return self._s[1952]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1953]! } + public var Passport_Language_da: String { return self._s[1954]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[1955]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1944]!, self._r[1944]!, [_0]) - } - public var Passport_Address_EditPassportRegistration: String { return self._s[1945]! } - public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1947]!, self._r[1947]!, [_0]) - } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[1949]! } - public var Conversation_SearchByName_Prefix: String { return self._s[1950]! } - public var Conversation_PinnedPoll: String { return self._s[1951]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[1952]! } - public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1953]!, self._r[1953]!, [_1]) - } - public var WallpaperSearch_ColorPurple: String { return self._s[1954]! } - public var Cache_ByPeerHeader: String { return self._s[1955]! } - public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1956]!, self._r[1956]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[1957]! } - public var Notification_PinnedMessage: String { return self._s[1960]! } - public var Contacts_SortBy: String { return self._s[1962]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[1957]! } + public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1959]!, self._r[1959]!, [_0]) + } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[1961]! } + public var Conversation_SearchByName_Prefix: String { return self._s[1962]! } + public var Conversation_PinnedPoll: String { return self._s[1963]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[1964]! } + public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1965]!, self._r[1965]!, [_1]) + } + public var WallpaperSearch_ColorPurple: String { return self._s[1966]! } + public var Cache_ByPeerHeader: String { return self._s[1967]! } + public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1968]!, self._r[1968]!, [_0]) + } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[1969]! } + public var Notification_PinnedMessage: String { return self._s[1972]! } + public var Contacts_SortBy: String { return self._s[1974]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1963]!, self._r[1963]!, [_1]) + return formatWithArgumentRanges(self._s[1975]!, self._r[1975]!, [_1]) } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1965]!, self._r[1965]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[1966]! } - public var Watch_UserInfo_Service: String { return self._s[1967]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[1969]! } - public var Conversation_Unpin: String { return self._s[1971]! } - public var CancelResetAccount_Title: String { return self._s[1972]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[1973]! } + public var Call_EncryptionKey_Title: String { return self._s[1978]! } + public var Watch_UserInfo_Service: String { return self._s[1979]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[1981]! } + public var Conversation_Unpin: String { return self._s[1983]! } + public var CancelResetAccount_Title: String { return self._s[1984]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[1985]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1975]!, self._r[1975]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1987]!, self._r[1987]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[1976]! } - public var CallSettings_Title: String { return self._s[1977]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[1978]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[1980]! } - public var AutoDownloadSettings_Contacts: String { return self._s[1981]! } - public var Passport_Identity_DocumentDetails: String { return self._s[1982]! } - public var LoginPassword_PasswordHelp: String { return self._s[1983]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[1984]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[1985]! } - public var Checkout_TotalPaidAmount: String { return self._s[1986]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[1988]! } + public var CallSettings_Title: String { return self._s[1989]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[1990]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[1992]! } + public var AutoDownloadSettings_Contacts: String { return self._s[1993]! } + public var Passport_Identity_DocumentDetails: String { return self._s[1994]! } + public var LoginPassword_PasswordHelp: String { return self._s[1995]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[1996]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[1997]! } + public var Checkout_TotalPaidAmount: String { return self._s[1998]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1987]!, self._r[1987]!, [_0]) + return formatWithArgumentRanges(self._s[1999]!, self._r[1999]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[1988]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[1990]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[1991]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2000]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2002]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2003]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1992]!, self._r[1992]!, [_1]) + return formatWithArgumentRanges(self._s[2004]!, self._r[2004]!, [_1]) } - public var Contacts_InviteFriends: String { return self._s[1994]! } - public var Map_ChooseLocationTitle: String { return self._s[1995]! } - public var Conversation_StopPoll: String { return self._s[1997]! } + public var Contacts_InviteFriends: String { return self._s[2006]! } + public var Map_ChooseLocationTitle: String { return self._s[2007]! } + public var Conversation_StopPoll: String { return self._s[2009]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1998]!, self._r[1998]!, [_0]) + return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_0]) } - public var Call_Camera: String { return self._s[1999]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2000]! } - public var Calls_RatingFeedback: String { return self._s[2001]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2002]! } - public var NotificationsSound_Pulse: String { return self._s[2003]! } - public var Watch_LastSeen_Lately: String { return self._s[2004]! } - public var Widget_NoUsers: String { return self._s[2007]! } - public var Conversation_UnvotePoll: String { return self._s[2008]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2010]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2011]! } - public var NotificationsSound_Circles: String { return self._s[2012]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2014]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2015]! } - public var Proxy_TooltipUnavailable: String { return self._s[2016]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2018]! } - public var Conversation_FileDropbox: String { return self._s[2020]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2021]! } - public var Tour_Text3: String { return self._s[2023]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2025]! } - public var GroupPermission_NoSendMessages: String { return self._s[2026]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2027]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2028]! } + public var Call_Camera: String { return self._s[2011]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2012]! } + public var Calls_RatingFeedback: String { return self._s[2013]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2014]! } + public var NotificationsSound_Pulse: String { return self._s[2015]! } + public var Watch_LastSeen_Lately: String { return self._s[2016]! } + public var ReportGroupLocation_Report: String { return self._s[2019]! } + public var Widget_NoUsers: String { return self._s[2020]! } + public var Conversation_UnvotePoll: String { return self._s[2021]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2023]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2024]! } + public var NotificationsSound_Circles: String { return self._s[2025]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2027]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2028]! } + public var Proxy_TooltipUnavailable: String { return self._s[2029]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2031]! } + public var Conversation_FileDropbox: String { return self._s[2033]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2034]! } + public var Tour_Text3: String { return self._s[2036]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2038]! } + public var GroupPermission_NoSendMessages: String { return self._s[2039]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2040]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2041]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2030]!, self._r[2030]!, [_0]) + return formatWithArgumentRanges(self._s[2043]!, self._r[2043]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2031]! } - public var Checkout_ShippingOption_Title: String { return self._s[2032]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2033]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2044]! } + public var Checkout_ShippingOption_Title: String { return self._s[2045]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2046]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2034]!, self._r[2034]!, [_0]) + return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2035]!, self._r[2035]!, [_0]) + return formatWithArgumentRanges(self._s[2048]!, self._r[2048]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2036]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2037]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2038]! } - public var AutoDownloadSettings_Photos: String { return self._s[2040]! } - public var Appearance_PreviewIncomingText: String { return self._s[2041]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2042]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2043]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2044]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2045]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2046]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2047]! } - public var Notification_SecretChatScreenshot: String { return self._s[2048]! } - public var AccessDenied_Wallpapers: String { return self._s[2049]! } - public var Passport_Address_City: String { return self._s[2051]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2052]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2053]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2054]! } - public var AccessDenied_LocationDisabled: String { return self._s[2055]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2057]! } - public var GroupInfo_Sound: String { return self._s[2058]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2059]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2060]! } - public var Contacts_Title: String { return self._s[2061]! } - public var Passport_Language_fr: String { return self._s[2062]! } - public var Notifications_ResetAllNotifications: String { return self._s[2063]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2066]! } - public var Checkout_NewCard_Title: String { return self._s[2067]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2068]! } - public var Conversation_ForwardChats: String { return self._s[2069]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2071]! } - public var Settings_FAQ: String { return self._s[2073]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2074]! } - public var Conversation_ContextMenuForward: String { return self._s[2075]! } - public var PrivacyPolicy_Title: String { return self._s[2080]! } - public var Notifications_TextTone: String { return self._s[2081]! } - public var Profile_CreateNewContact: String { return self._s[2082]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2083]! } - public var Call_Speaker: String { return self._s[2085]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2086]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2088]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2089]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2049]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2050]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2051]! } + public var AutoDownloadSettings_Photos: String { return self._s[2053]! } + public var Appearance_PreviewIncomingText: String { return self._s[2054]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2055]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2056]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2057]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2058]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2059]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2060]! } + public var Notification_SecretChatScreenshot: String { return self._s[2061]! } + public var AccessDenied_Wallpapers: String { return self._s[2062]! } + public var Passport_Address_City: String { return self._s[2064]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2065]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2066]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2067]! } + public var AccessDenied_LocationDisabled: String { return self._s[2068]! } + public var Group_Location_Title: String { return self._s[2069]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2071]! } + public var GroupInfo_Sound: String { return self._s[2072]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2073]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2074]! } + public var Contacts_Title: String { return self._s[2075]! } + public var Passport_Language_fr: String { return self._s[2076]! } + public var Notifications_ResetAllNotifications: String { return self._s[2077]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2080]! } + public var Checkout_NewCard_Title: String { return self._s[2081]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2082]! } + public var Conversation_ForwardChats: String { return self._s[2083]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2085]! } + public var Settings_FAQ: String { return self._s[2087]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2088]! } + public var Conversation_ContextMenuForward: String { return self._s[2089]! } + public var PrivacyPolicy_Title: String { return self._s[2094]! } + public var Notifications_TextTone: String { return self._s[2095]! } + public var Profile_CreateNewContact: String { return self._s[2096]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2097]! } + public var Call_Speaker: String { return self._s[2099]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2100]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2102]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2103]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2090]!, self._r[2090]!, [_0]) + return formatWithArgumentRanges(self._s[2104]!, self._r[2104]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2091]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2092]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2093]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2094]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2095]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2096]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2097]! } - public var Bot_Unblock: String { return self._s[2098]! } - public var TextFormat_Italic: String { return self._s[2099]! } - public var WallpaperSearch_ColorPink: String { return self._s[2100]! } - public var Settings_About_Help: String { return self._s[2101]! } - public var SearchImages_Title: String { return self._s[2102]! } - public var Weekday_Wednesday: String { return self._s[2103]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2104]! } - public var ExplicitContent_AlertTitle: String { return self._s[2105]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2105]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2106]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2107]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2108]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2109]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2110]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2111]! } + public var Bot_Unblock: String { return self._s[2112]! } + public var TextFormat_Italic: String { return self._s[2113]! } + public var WallpaperSearch_ColorPink: String { return self._s[2114]! } + public var Settings_About_Help: String { return self._s[2115]! } + public var SearchImages_Title: String { return self._s[2116]! } + public var Weekday_Wednesday: String { return self._s[2117]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2118]! } + public var ExplicitContent_AlertTitle: String { return self._s[2119]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2106]!, self._r[2106]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2107]! } - public var Weekday_Thursday: String { return self._s[2108]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2109]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2110]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2121]! } + public var Weekday_Thursday: String { return self._s[2122]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2123]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2124]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, [_0]) + return formatWithArgumentRanges(self._s[2125]!, self._r[2125]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2112]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2113]! } - public var Passport_RequestedInformation: String { return self._s[2114]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2115]! } - public var Conversation_EncryptionProcessing: String { return self._s[2117]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2118]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2120]! } - public var Channel_Setup_Title: String { return self._s[2121]! } - public var Conversation_SearchPlaceholder: String { return self._s[2122]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2123]! } - public var Checkout_ErrorGeneric: String { return self._s[2124]! } - public var Passport_Language_hu: String { return self._s[2125]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2126]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2127]! } + public var Passport_RequestedInformation: String { return self._s[2128]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2129]! } + public var Conversation_EncryptionProcessing: String { return self._s[2131]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2132]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2134]! } + public var Channel_Setup_Title: String { return self._s[2135]! } + public var Conversation_SearchPlaceholder: String { return self._s[2136]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2137]! } + public var Checkout_ErrorGeneric: String { return self._s[2138]! } + public var Passport_Language_hu: String { return self._s[2139]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2127]!, self._r[2127]!, [_0]) + return formatWithArgumentRanges(self._s[2141]!, self._r[2141]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_1]) + return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_1]) } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2131]!, self._r[2131]!, [_0]) + return formatWithArgumentRanges(self._s[2145]!, self._r[2145]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2132]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2133]! } + public var Group_Location_Info: String { return self._s[2146]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2147]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2148]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2149]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2134]!, self._r[2134]!, [_0]) + return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2135]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2136]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2137]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2151]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2152]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2153]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2138]!, self._r[2138]!, [_0]) + return formatWithArgumentRanges(self._s[2154]!, self._r[2154]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2139]! } - public var Message_PinnedAnimationMessage: String { return self._s[2141]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2143]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2144]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2146]! } - public var Embed_PlayingInPIP: String { return self._s[2147]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2148]! } + public var Passport_Language_cs: String { return self._s[2155]! } + public var Message_PinnedAnimationMessage: String { return self._s[2157]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2159]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2160]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2162]! } + public var Embed_PlayingInPIP: String { return self._s[2163]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2164]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_0]) + return formatWithArgumentRanges(self._s[2165]!, self._r[2165]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2150]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2166]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_1]) + return formatWithArgumentRanges(self._s[2167]!, self._r[2167]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2152]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2153]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2154]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2155]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2156]! } + public var Notification_PaymentSent: String { return self._s[2168]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2169]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2170]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2171]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2172]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2159]!, self._r[2159]!, [_1]) + return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2160]!, self._r[2160]!, [_1]) + return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2161]!, self._r[2161]!, [_1]) + return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2163]! } - public var PasscodeSettings_HelpTop: String { return self._s[2164]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2165]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2166]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2167]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2168]! } - public var Call_Accept: String { return self._s[2170]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2171]! } - public var Month_GenMarch: String { return self._s[2173]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2174]! } - public var LoginPassword_Title: String { return self._s[2175]! } - public var Call_End: String { return self._s[2176]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2177]! } - public var CallSettings_Always: String { return self._s[2178]! } - public var CallFeedback_Success: String { return self._s[2179]! } - public var TwoStepAuth_SetupHint: String { return self._s[2180]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2179]! } + public var PasscodeSettings_HelpTop: String { return self._s[2180]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2181]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2182]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2183]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2184]! } + public var Call_Accept: String { return self._s[2186]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2187]! } + public var Month_GenMarch: String { return self._s[2189]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2190]! } + public var LoginPassword_Title: String { return self._s[2191]! } + public var Call_End: String { return self._s[2192]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2193]! } + public var CallSettings_Always: String { return self._s[2194]! } + public var CallFeedback_Success: String { return self._s[2195]! } + public var TwoStepAuth_SetupHint: String { return self._s[2196]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2181]!, self._r[2181]!, [_1, _1]) + return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2182]! } - public var Login_PhoneTitle: String { return self._s[2183]! } - public var Passport_FieldPhoneHelp: String { return self._s[2184]! } - public var Weekday_ShortSunday: String { return self._s[2185]! } - public var Passport_InfoFAQ_URL: String { return self._s[2186]! } - public var ContactInfo_Job: String { return self._s[2188]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2189]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2190]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2191]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2192]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2193]! } - public var CallFeedback_ReasonNoise: String { return self._s[2194]! } - public var Appearance_AppIconDefault: String { return self._s[2196]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2197]! } - public var MediaPicker_AddCaption: String { return self._s[2198]! } - public var CallSettings_TabIconDescription: String { return self._s[2199]! } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2200]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2201]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2202]! } - public var DialogList_SearchSectionRecent: String { return self._s[2203]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2204]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2207]! } - public var LastSeen_WithinAWeek: String { return self._s[2208]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2209]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2211]! } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2212]! } - public var Conversation_StatusLeftGroup: String { return self._s[2213]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2214]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2216]! } - public var GroupPermission_AddSuccess: String { return self._s[2217]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2219]! } - public var Conversation_ContextMenuCopy: String { return self._s[2220]! } - public var AccessDenied_CallMicrophone: String { return self._s[2221]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2198]! } + public var Login_PhoneTitle: String { return self._s[2199]! } + public var Passport_FieldPhoneHelp: String { return self._s[2200]! } + public var Weekday_ShortSunday: String { return self._s[2201]! } + public var Passport_InfoFAQ_URL: String { return self._s[2202]! } + public var ContactInfo_Job: String { return self._s[2204]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2205]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2206]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2207]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2208]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2209]! } + public var CallFeedback_ReasonNoise: String { return self._s[2210]! } + public var Appearance_AppIconDefault: String { return self._s[2212]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2213]! } + public var MediaPicker_AddCaption: String { return self._s[2214]! } + public var CallSettings_TabIconDescription: String { return self._s[2215]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2216]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2217]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2218]! } + public var DialogList_SearchSectionRecent: String { return self._s[2219]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2220]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2223]! } + public var LastSeen_WithinAWeek: String { return self._s[2224]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2225]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2227]! } + public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_0]) + } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2229]! } + public var Conversation_StatusLeftGroup: String { return self._s[2230]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2231]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2233]! } + public var GroupPermission_AddSuccess: String { return self._s[2234]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2236]! } + public var Conversation_ContextMenuCopy: String { return self._s[2237]! } + public var AccessDenied_CallMicrophone: String { return self._s[2238]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2222]!, self._r[2222]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2239]!, self._r[2239]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2223]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2224]! } - public var Checkout_PaymentMethod_New: String { return self._s[2225]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2226]! } - public var PhotoEditor_QualityTool: String { return self._s[2227]! } - public var Login_SendCodeViaSms: String { return self._s[2228]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2229]! } - public var Login_EmailNotConfiguredError: String { return self._s[2230]! } - public var SocksProxySetup_Status: String { return self._s[2231]! } - public var PrivacyPolicy_Accept: String { return self._s[2232]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2233]! } - public var Appearance_AppIconClassicX: String { return self._s[2234]! } + public var Login_InvalidFirstNameError: String { return self._s[2240]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2241]! } + public var Checkout_PaymentMethod_New: String { return self._s[2242]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2243]! } + public var PhotoEditor_QualityTool: String { return self._s[2244]! } + public var Login_SendCodeViaSms: String { return self._s[2245]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2246]! } + public var Login_EmailNotConfiguredError: String { return self._s[2247]! } + public var SocksProxySetup_Status: String { return self._s[2248]! } + public var PrivacyPolicy_Accept: String { return self._s[2249]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2250]! } + public var Appearance_AppIconClassicX: String { return self._s[2251]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2235]!, self._r[2235]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2252]!, self._r[2252]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2236]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2237]! } - public var AutoNightTheme_Automatic: String { return self._s[2238]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2239]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2240]! } - public var Cache_Help: String { return self._s[2241]! } - public var Group_ErrorAccessDenied: String { return self._s[2242]! } - public var Passport_Language_fa: String { return self._s[2243]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2244]! } - public var PrivacySettings_LastSeen: String { return self._s[2245]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2253]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2254]! } + public var AutoNightTheme_Automatic: String { return self._s[2255]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2256]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2257]! } + public var Cache_Help: String { return self._s[2258]! } + public var Group_ErrorAccessDenied: String { return self._s[2259]! } + public var Passport_Language_fa: String { return self._s[2260]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2261]! } + public var PrivacySettings_LastSeen: String { return self._s[2262]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2246]!, self._r[2246]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2263]!, self._r[2263]!, [_0, _1]) } - public var Preview_SaveGif: String { return self._s[2250]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2251]! } - public var Profile_About: String { return self._s[2252]! } - public var Channel_About_Placeholder: String { return self._s[2253]! } - public var Login_InfoTitle: String { return self._s[2254]! } + public var Preview_SaveGif: String { return self._s[2267]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2268]! } + public var Profile_About: String { return self._s[2269]! } + public var Channel_About_Placeholder: String { return self._s[2270]! } + public var Login_InfoTitle: String { return self._s[2271]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2255]!, self._r[2255]!, [_0]) + return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_0]) } - public var Watch_Suggestion_CantTalk: String { return self._s[2257]! } - public var ContactInfo_Title: String { return self._s[2258]! } - public var Media_ShareThisVideo: String { return self._s[2259]! } - public var Weekday_ShortFriday: String { return self._s[2260]! } - public var AccessDenied_Contacts: String { return self._s[2261]! } - public var Notification_CallIncomingShort: String { return self._s[2262]! } - public var Group_Setup_TypePublic: String { return self._s[2263]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2264]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2265]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2268]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2269]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2270]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2271]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2272]! } - public var DialogList_Typing: String { return self._s[2273]! } - public var CallFeedback_IncludeLogs: String { return self._s[2275]! } - public var Checkout_Phone: String { return self._s[2277]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2280]! } - public var Privacy_Calls_Integration: String { return self._s[2281]! } - public var Notifications_PermissionsAllow: String { return self._s[2282]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2286]! } - public var Settings_ChatSettings: String { return self._s[2287]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2274]! } + public var ContactInfo_Title: String { return self._s[2275]! } + public var Media_ShareThisVideo: String { return self._s[2276]! } + public var Weekday_ShortFriday: String { return self._s[2277]! } + public var AccessDenied_Contacts: String { return self._s[2278]! } + public var Notification_CallIncomingShort: String { return self._s[2279]! } + public var Group_Setup_TypePublic: String { return self._s[2280]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2281]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2282]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2285]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2286]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2287]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2288]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2289]! } + public var DialogList_Typing: String { return self._s[2290]! } + public var CallFeedback_IncludeLogs: String { return self._s[2292]! } + public var Checkout_Phone: String { return self._s[2294]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2297]! } + public var Privacy_Calls_Integration: String { return self._s[2298]! } + public var Notifications_PermissionsAllow: String { return self._s[2299]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2303]! } + public var Settings_ChatSettings: String { return self._s[2304]! } public func PUSH_MESSAGE_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2288]!, self._r[2288]!, [_1]) + return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_1]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2289]!, self._r[2289]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2306]!, self._r[2306]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2291]! } + public var GroupRemoved_DeleteUser: String { return self._s[2308]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2292]!, self._r[2292]!, [_0]) + return formatWithArgumentRanges(self._s[2309]!, self._r[2309]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2293]!, self._r[2293]!, [_1]) + return formatWithArgumentRanges(self._s[2310]!, self._r[2310]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2294]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2295]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2297]! } - public var Conversation_Unblock: String { return self._s[2298]! } - public var PrivacySettings_DataSettings: String { return self._s[2299]! } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2300]! } + public var Login_ContinueWithLocalization: String { return self._s[2311]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2312]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2314]! } + public var Conversation_Unblock: String { return self._s[2315]! } + public var PrivacySettings_DataSettings: String { return self._s[2316]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2317]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2301]!, self._r[2301]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2318]!, self._r[2318]!, [_0, _1]) } - public var PrivacySettings_Passcode: String { return self._s[2304]! } - public var Call_Mute: String { return self._s[2305]! } - public var Passport_Language_dz: String { return self._s[2306]! } - public var Passport_Language_tk: String { return self._s[2307]! } + public var PrivacySettings_Passcode: String { return self._s[2321]! } + public var Call_Mute: String { return self._s[2322]! } + public var Passport_Language_dz: String { return self._s[2323]! } + public var Passport_Language_tk: String { return self._s[2324]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2308]!, self._r[2308]!, [_0]) - } - public var Settings_Search: String { return self._s[2309]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2310]! } - public var Conversation_ContextMenuReply: String { return self._s[2311]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2312]! } - public var Tour_Title1: String { return self._s[2313]! } - public var Conversation_ClearGroupHistory: String { return self._s[2315]! } - public var WallpaperPreview_Motion: String { return self._s[2316]! } - public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2317]!, self._r[2317]!, [_0]) - } - public var Call_RateCall: String { return self._s[2318]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2319]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2320]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2321]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2323]! } - public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2325]!, self._r[2325]!, [_0]) } - public var Compose_Create: String { return self._s[2326]! } - public var Contacts_InviteToTelegram: String { return self._s[2327]! } - public var GroupInfo_Notifications: String { return self._s[2328]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2330]! } - public var Month_GenApril: String { return self._s[2331]! } - public var Appearance_AutoNightTheme: String { return self._s[2332]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2334]! } - public var Login_CodeSentSms: String { return self._s[2336]! } - public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2337]!, self._r[2337]!, [_0]) + public var Settings_Search: String { return self._s[2326]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2327]! } + public var Conversation_ContextMenuReply: String { return self._s[2328]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2329]! } + public var Tour_Title1: String { return self._s[2330]! } + public var Conversation_ClearGroupHistory: String { return self._s[2332]! } + public var WallpaperPreview_Motion: String { return self._s[2333]! } + public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2338]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2339]! } - public var Passport_Language_hr: String { return self._s[2340]! } - public var Common_ActionNotAllowedError: String { return self._s[2341]! } - public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Call_RateCall: String { return self._s[2335]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2336]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2337]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2338]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2340]! } + public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2343]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2344]! } - public var Privacy_SecretChatsTitle: String { return self._s[2345]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2347]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2348]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2349]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2350]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2351]! } - public var Preview_DeleteGif: String { return self._s[2352]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2353]! } - public var Group_ErrorNotMutualContact: String { return self._s[2354]! } - public var Notification_MessageLifetime5s: String { return self._s[2355]! } + public var Compose_Create: String { return self._s[2343]! } + public var Contacts_InviteToTelegram: String { return self._s[2344]! } + public var GroupInfo_Notifications: String { return self._s[2345]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2347]! } + public var Month_GenApril: String { return self._s[2348]! } + public var Appearance_AutoNightTheme: String { return self._s[2349]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2351]! } + public var Login_CodeSentSms: String { return self._s[2353]! } + public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_0]) + } + public var EmptyGroupInfo_Line3: String { return self._s[2355]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2356]! } + public var Passport_Language_hr: String { return self._s[2357]! } + public var Common_ActionNotAllowedError: String { return self._s[2358]! } + public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2359]!, self._r[2359]!, [_0]) + } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2360]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2361]! } + public var Privacy_SecretChatsTitle: String { return self._s[2362]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2364]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2365]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2366]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2367]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2368]! } + public var Preview_DeleteGif: String { return self._s[2369]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2370]! } + public var Group_ErrorNotMutualContact: String { return self._s[2371]! } + public var Notification_MessageLifetime5s: String { return self._s[2372]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2356]!, self._r[2356]!, [_0]) + return formatWithArgumentRanges(self._s[2373]!, self._r[2373]!, [_0]) } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2358]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2359]! } - public var Passport_Address_AddBankStatement: String { return self._s[2360]! } - public var Notification_CallIncoming: String { return self._s[2361]! } - public var Compose_NewGroupTitle: String { return self._s[2362]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2364]! } - public var Passport_Address_Postcode: String { return self._s[2366]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2375]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2376]! } + public var Passport_Address_AddBankStatement: String { return self._s[2377]! } + public var Notification_CallIncoming: String { return self._s[2378]! } + public var Compose_NewGroupTitle: String { return self._s[2379]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2381]! } + public var Passport_Address_Postcode: String { return self._s[2383]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2367]!, self._r[2367]!, [_0]) + return formatWithArgumentRanges(self._s[2384]!, self._r[2384]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2368]! } - public var WallpaperColors_Title: String { return self._s[2369]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2370]! } - public var GroupPermission_Duration: String { return self._s[2371]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2385]! } + public var WallpaperColors_Title: String { return self._s[2386]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2387]! } + public var GroupPermission_Duration: String { return self._s[2388]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2372]!, self._r[2372]!, [_0]) + return formatWithArgumentRanges(self._s[2389]!, self._r[2389]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2373]! } - public var Username_Placeholder: String { return self._s[2374]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2375]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2376]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2377]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2390]! } + public var Username_Placeholder: String { return self._s[2391]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2392]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2393]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2394]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2379]!, self._r[2379]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2396]!, self._r[2396]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2380]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2381]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2382]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2383]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2384]! } - public var Conversation_ContextMenuMore: String { return self._s[2385]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2386]! } - public var CallSettings_TabIcon: String { return self._s[2387]! } - public var KeyCommand_Find: String { return self._s[2388]! } - public var Message_PinnedGame: String { return self._s[2389]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2391]! } - public var Login_CallRequestState2: String { return self._s[2393]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2395]! } + public var Passport_PasswordDescription: String { return self._s[2397]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2398]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2399]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2400]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2401]! } + public var Conversation_ContextMenuMore: String { return self._s[2402]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2403]! } + public var CallSettings_TabIcon: String { return self._s[2404]! } + public var KeyCommand_Find: String { return self._s[2405]! } + public var Message_PinnedGame: String { return self._s[2406]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2408]! } + public var Login_CallRequestState2: String { return self._s[2410]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2412]! } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2397]!, self._r[2397]!, [_0]) + return formatWithArgumentRanges(self._s[2414]!, self._r[2414]!, [_0]) } - public var WallpaperPreview_Blurred: String { return self._s[2398]! } - public var Conversation_InstantPagePreview: String { return self._s[2399]! } + public var WallpaperPreview_Blurred: String { return self._s[2415]! } + public var Conversation_InstantPagePreview: String { return self._s[2416]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2400]!, self._r[2400]!, [_0]) + return formatWithArgumentRanges(self._s[2417]!, self._r[2417]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2403]! } - public var WallpaperSearch_ColorRed: String { return self._s[2404]! } - public var GroupPermission_NoPinMessages: String { return self._s[2405]! } - public var Passport_Language_es: String { return self._s[2406]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2408]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2409]! } + public var SecretTimer_VideoDescription: String { return self._s[2420]! } + public var WallpaperSearch_ColorRed: String { return self._s[2421]! } + public var GroupPermission_NoPinMessages: String { return self._s[2422]! } + public var Passport_Language_es: String { return self._s[2423]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2425]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2426]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2410]!, self._r[2410]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2427]!, self._r[2427]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2411]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2412]! } - public var Watch_UserInfo_Unmute: String { return self._s[2413]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2414]! } - public var AccessDenied_CameraRestricted: String { return self._s[2416]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2428]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2429]! } + public var Watch_UserInfo_Unmute: String { return self._s[2430]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2431]! } + public var AccessDenied_CameraRestricted: String { return self._s[2433]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2417]!, self._r[2417]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2434]!, self._r[2434]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2419]! } - public var Settings_CopyUsername: String { return self._s[2420]! } - public var Contacts_SearchLabel: String { return self._s[2421]! } - public var Map_OpenInYandexNavigator: String { return self._s[2423]! } - public var PasscodeSettings_EncryptData: String { return self._s[2424]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2425]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2426]! } - public var DialogList_AdNoticeAlert: String { return self._s[2427]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2429]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2430]! } - public var Localization_LanguageCustom: String { return self._s[2431]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2432]! } - public var CallFeedback_Title: String { return self._s[2433]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2436]! } - public var Conversation_InfoGroup: String { return self._s[2437]! } - public var Compose_NewMessage: String { return self._s[2438]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2439]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2440]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2441]! } + public var ChatList_ReadAll: String { return self._s[2436]! } + public var Settings_CopyUsername: String { return self._s[2437]! } + public var Contacts_SearchLabel: String { return self._s[2438]! } + public var Map_OpenInYandexNavigator: String { return self._s[2440]! } + public var PasscodeSettings_EncryptData: String { return self._s[2441]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2442]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2443]! } + public var DialogList_AdNoticeAlert: String { return self._s[2444]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2446]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2447]! } + public var Localization_LanguageCustom: String { return self._s[2448]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2449]! } + public var CallFeedback_Title: String { return self._s[2450]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2453]! } + public var Conversation_InfoGroup: String { return self._s[2454]! } + public var Compose_NewMessage: String { return self._s[2455]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2456]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2457]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2458]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2442]!, self._r[2442]!, [_0]) + return formatWithArgumentRanges(self._s[2459]!, self._r[2459]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2443]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2444]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2445]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2446]! } - public var Channel_BlackList_Title: String { return self._s[2447]! } - public var UserInfo_PhoneCall: String { return self._s[2448]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2450]! } - public var State_connecting: String { return self._s[2451]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2460]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2461]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2462]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2463]! } + public var Channel_BlackList_Title: String { return self._s[2464]! } + public var UserInfo_PhoneCall: String { return self._s[2465]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2467]! } + public var State_connecting: String { return self._s[2468]! } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2452]!, self._r[2452]!, [_0]) + return formatWithArgumentRanges(self._s[2469]!, self._r[2469]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2453]! } - public var Passport_Identity_EditPassport: String { return self._s[2454]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2456]! } - public var Localization_EnglishLanguageName: String { return self._s[2457]! } - public var Share_AuthDescription: String { return self._s[2458]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2459]! } - public var Passport_Identity_Surname: String { return self._s[2460]! } - public var Compose_TokenListPlaceholder: String { return self._s[2461]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2462]! } - public var Settings_AboutEmpty: String { return self._s[2463]! } - public var Conversation_Unmute: String { return self._s[2464]! } + public var Notifications_GroupNotifications: String { return self._s[2470]! } + public var Passport_Identity_EditPassport: String { return self._s[2471]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2473]! } + public var Localization_EnglishLanguageName: String { return self._s[2474]! } + public var Share_AuthDescription: String { return self._s[2475]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2476]! } + public var Passport_Identity_Surname: String { return self._s[2477]! } + public var Compose_TokenListPlaceholder: String { return self._s[2478]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2479]! } + public var Settings_AboutEmpty: String { return self._s[2480]! } + public var Conversation_Unmute: String { return self._s[2481]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2466]!, self._r[2466]!, [_1]) + return formatWithArgumentRanges(self._s[2483]!, self._r[2483]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2467]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2469]! } - public var ChatSettings_Appearance: String { return self._s[2470]! } - public var Appearance_PickAccentColor: String { return self._s[2471]! } + public var Login_CodeSentCall: String { return self._s[2484]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2486]! } + public var ChatSettings_Appearance: String { return self._s[2487]! } + public var Appearance_PickAccentColor: String { return self._s[2488]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2472]!, self._r[2472]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2489]!, self._r[2489]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2473]!, self._r[2473]!, [_1]) + return formatWithArgumentRanges(self._s[2490]!, self._r[2490]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2474]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2475]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2476]! } - public var ChatAdmins_AdminLabel: String { return self._s[2478]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2479]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2481]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2482]! } - public var Month_GenJune: String { return self._s[2483]! } - public var Watch_Location_Current: String { return self._s[2484]! } - public var Conversation_TitleMute: String { return self._s[2485]! } + public var Notification_CallMissed: String { return self._s[2491]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2492]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2493]! } + public var ChatAdmins_AdminLabel: String { return self._s[2495]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2496]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2498]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2499]! } + public var Month_GenJune: String { return self._s[2500]! } + public var Watch_Location_Current: String { return self._s[2501]! } + public var Conversation_TitleMute: String { return self._s[2502]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2486]!, self._r[2486]!, [_1]) + return formatWithArgumentRanges(self._s[2503]!, self._r[2503]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2487]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2504]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2488]!, self._r[2488]!, [_0]) + return formatWithArgumentRanges(self._s[2505]!, self._r[2505]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2489]! } - public var MaskStickerSettings_Info: String { return self._s[2490]! } + public var Call_ReportPlaceholder: String { return self._s[2506]! } + public var MaskStickerSettings_Info: String { return self._s[2507]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2491]!, self._r[2491]!, [_0]) + return formatWithArgumentRanges(self._s[2508]!, self._r[2508]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2492]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2494]! } - public var Contacts_ShareTelegram: String { return self._s[2495]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2496]! } - public var Channel_ErrorAccessDenied: String { return self._s[2497]! } - public var UserInfo_ScamBotWarning: String { return self._s[2499]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2500]! } - public var Call_ConnectionErrorTitle: String { return self._s[2501]! } - public var UserInfo_NotificationsEnable: String { return self._s[2502]! } - public var ArchivedChats_IntroText1: String { return self._s[2503]! } - public var Tour_Text4: String { return self._s[2506]! } - public var WallpaperSearch_Recent: String { return self._s[2507]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[2508]! } - public var Profile_MessageLifetime2s: String { return self._s[2510]! } - public var Notification_MessageLifetime2s: String { return self._s[2511]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2509]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2511]! } + public var Contacts_ShareTelegram: String { return self._s[2512]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2513]! } + public var Channel_ErrorAccessDenied: String { return self._s[2514]! } + public var UserInfo_ScamBotWarning: String { return self._s[2516]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2517]! } + public var Call_ConnectionErrorTitle: String { return self._s[2518]! } + public var UserInfo_NotificationsEnable: String { return self._s[2519]! } + public var ArchivedChats_IntroText1: String { return self._s[2520]! } + public var Tour_Text4: String { return self._s[2523]! } + public var WallpaperSearch_Recent: String { return self._s[2524]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[2525]! } + public var Profile_MessageLifetime2s: String { return self._s[2527]! } + public var Notification_MessageLifetime2s: String { return self._s[2528]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2512]!, self._r[2512]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2529]!, self._r[2529]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[2513]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[2514]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2515]! } + public var Cache_ClearCache: String { return self._s[2530]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2531]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2532]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2519]!, self._r[2519]!, [_0]) + return formatWithArgumentRanges(self._s[2536]!, self._r[2536]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_0]) + return formatWithArgumentRanges(self._s[2538]!, self._r[2538]!, [_0]) } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2522]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2523]! } - public var ChatList_UnarchiveAction: String { return self._s[2524]! } - public var AutoNightTheme_Title: String { return self._s[2525]! } - public var InstantPage_FeedbackButton: String { return self._s[2526]! } - public var Passport_FieldAddress: String { return self._s[2527]! } - public var Month_ShortMarch: String { return self._s[2528]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2539]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2540]! } + public var ChatList_UnarchiveAction: String { return self._s[2541]! } + public var AutoNightTheme_Title: String { return self._s[2542]! } + public var InstantPage_FeedbackButton: String { return self._s[2543]! } + public var Passport_FieldAddress: String { return self._s[2544]! } + public var Month_ShortMarch: String { return self._s[2545]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2529]!, self._r[2529]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2546]!, self._r[2546]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2530]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2531]! } - public var Passport_FloodError: String { return self._s[2532]! } - public var SecretGif_Title: String { return self._s[2533]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2534]! } - public var Passport_Language_th: String { return self._s[2536]! } - public var Passport_Address_Address: String { return self._s[2537]! } - public var Login_InvalidLastNameError: String { return self._s[2538]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[2539]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[2540]! } - public var SettingsSearch_FAQ: String { return self._s[2541]! } - public var ShareMenu_Send: String { return self._s[2542]! } - public var WallpaperSearch_ColorYellow: String { return self._s[2544]! } - public var Month_GenNovember: String { return self._s[2546]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2548]! } - public var Checkout_Email: String { return self._s[2549]! } - public var NotificationsSound_Tritone: String { return self._s[2550]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[2552]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2547]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2548]! } + public var Passport_FloodError: String { return self._s[2549]! } + public var SecretGif_Title: String { return self._s[2550]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2551]! } + public var Passport_Language_th: String { return self._s[2553]! } + public var Passport_Address_Address: String { return self._s[2554]! } + public var Login_InvalidLastNameError: String { return self._s[2555]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[2556]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[2557]! } + public var SettingsSearch_FAQ: String { return self._s[2558]! } + public var ShareMenu_Send: String { return self._s[2559]! } + public var WallpaperSearch_ColorYellow: String { return self._s[2561]! } + public var Month_GenNovember: String { return self._s[2563]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2565]! } + public var Checkout_Email: String { return self._s[2566]! } + public var NotificationsSound_Tritone: String { return self._s[2567]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[2569]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2555]!, self._r[2555]!, [_1]) + return formatWithArgumentRanges(self._s[2572]!, self._r[2572]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[2556]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[2573]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2557]!, self._r[2557]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[2574]!, self._r[2574]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[2558]! } - public var Notification_Exceptions_Add: String { return self._s[2559]! } - public var DialogList_You: String { return self._s[2560]! } - public var MediaPicker_Send: String { return self._s[2563]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2564]! } - public var Call_AudioRouteSpeaker: String { return self._s[2565]! } - public var Watch_UserInfo_Title: String { return self._s[2566]! } - public var Appearance_AccentColor: String { return self._s[2567]! } + public var ChatList_UndoArchiveTitle: String { return self._s[2575]! } + public var Notification_Exceptions_Add: String { return self._s[2576]! } + public var DialogList_You: String { return self._s[2577]! } + public var MediaPicker_Send: String { return self._s[2580]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2581]! } + public var Call_AudioRouteSpeaker: String { return self._s[2582]! } + public var Watch_UserInfo_Title: String { return self._s[2583]! } + public var Appearance_AccentColor: String { return self._s[2584]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2568]!, self._r[2568]!, [_0]) - } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2569]! } - public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2570]!, self._r[2570]!, [_1, _2]) - } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[2571]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[2572]! } - public var Notification_CallOutgoing: String { return self._s[2573]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2574]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2575]! } - public var Call_RecordingDisabledMessage: String { return self._s[2576]! } - public var Message_Game: String { return self._s[2577]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[2578]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2579]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2580]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2581]! } - public var Date_DialogDateFormat: String { return self._s[2582]! } - public var WallpaperColors_SetCustomColor: String { return self._s[2583]! } - public var Notifications_InAppNotifications: String { return self._s[2584]! } - public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2585]!, self._r[2585]!, [_0]) } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2586]! } + public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2587]!, self._r[2587]!, [_1, _2]) + } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[2588]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[2589]! } + public var Notification_CallOutgoing: String { return self._s[2590]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2591]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2592]! } + public var Call_RecordingDisabledMessage: String { return self._s[2593]! } + public var Message_Game: String { return self._s[2594]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[2595]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2596]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2597]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2598]! } + public var Date_DialogDateFormat: String { return self._s[2599]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2600]! } + public var Notifications_InAppNotifications: String { return self._s[2601]! } + public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2602]!, self._r[2602]!, [_0]) + } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2586]!, self._r[2586]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2603]!, self._r[2603]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[2587]! } + public var NewContact_Title: String { return self._s[2604]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2588]!, self._r[2588]!, [_0]) + return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[2589]! } + public var Conversation_ViewContactDetails: String { return self._s[2606]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2591]!, self._r[2591]!, [_1]) + return formatWithArgumentRanges(self._s[2608]!, self._r[2608]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2592]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[2593]! } - public var PrivacySettings_Title: String { return self._s[2594]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2597]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[2598]! } - public var Contacts_PhoneNumber: String { return self._s[2599]! } - public var Map_ShowPlaces: String { return self._s[2601]! } - public var ChatAdmins_Title: String { return self._s[2602]! } - public var InstantPage_Reference: String { return self._s[2604]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2609]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[2610]! } + public var PrivacySettings_Title: String { return self._s[2611]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2614]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2615]! } + public var Contacts_PhoneNumber: String { return self._s[2616]! } + public var Map_ShowPlaces: String { return self._s[2618]! } + public var ChatAdmins_Title: String { return self._s[2619]! } + public var InstantPage_Reference: String { return self._s[2621]! } + public var ReportGroupLocation_Text: String { return self._s[2622]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2623]!, self._r[2623]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[2606]! } - public var Watch_UserInfo_Block: String { return self._s[2607]! } - public var ChatSettings_Stickers: String { return self._s[2608]! } - public var ChatSettings_DownloadInBackground: String { return self._s[2609]! } + public var Camera_FlashOff: String { return self._s[2624]! } + public var Watch_UserInfo_Block: String { return self._s[2625]! } + public var ChatSettings_Stickers: String { return self._s[2626]! } + public var ChatSettings_DownloadInBackground: String { return self._s[2627]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2610]!, self._r[2610]!, [_0]) + return formatWithArgumentRanges(self._s[2628]!, self._r[2628]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[2611]! } - public var Login_CheckOtherSessionMessages: String { return self._s[2612]! } - public var AutoDownloadSettings_Cellular: String { return self._s[2613]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2614]! } + public var Settings_ViewPhoto: String { return self._s[2629]! } + public var Login_CheckOtherSessionMessages: String { return self._s[2630]! } + public var AutoDownloadSettings_Cellular: String { return self._s[2631]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2632]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_0]) + return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[2617]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2618]! } + public var Privacy_DeleteDrafts: String { return self._s[2635]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2636]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2619]!, self._r[2619]!, [_0]) + return formatWithArgumentRanges(self._s[2637]!, self._r[2637]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[2620]! } - public var DialogList_SavedMessages: String { return self._s[2621]! } - public var GroupInfo_UpgradeButton: String { return self._s[2622]! } - public var DialogList_Pin: String { return self._s[2624]! } + public var DialogList_SavedMessagesHelp: String { return self._s[2638]! } + public var DialogList_SavedMessages: String { return self._s[2639]! } + public var GroupInfo_UpgradeButton: String { return self._s[2640]! } + public var DialogList_Pin: String { return self._s[2642]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2625]!, self._r[2625]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2643]!, self._r[2643]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2626]!, self._r[2626]!, [_0]) + return formatWithArgumentRanges(self._s[2644]!, self._r[2644]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[2627]! } - public var UserInfo_NotificationsDisable: String { return self._s[2628]! } - public var Paint_Outlined: String { return self._s[2629]! } - public var Activity_PlayingGame: String { return self._s[2630]! } - public var SearchImages_NoImagesFound: String { return self._s[2631]! } - public var SocksProxySetup_ProxyType: String { return self._s[2632]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[2634]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[2635]! } - public var Settings_AppLanguage: String { return self._s[2636]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[2637]! } - public var Common_ChoosePhoto: String { return self._s[2638]! } - public var CallFeedback_ReasonEcho: String { return self._s[2639]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[2645]! } + public var UserInfo_NotificationsDisable: String { return self._s[2646]! } + public var Paint_Outlined: String { return self._s[2647]! } + public var Activity_PlayingGame: String { return self._s[2648]! } + public var SearchImages_NoImagesFound: String { return self._s[2649]! } + public var SocksProxySetup_ProxyType: String { return self._s[2650]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[2652]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[2653]! } + public var Settings_AppLanguage: String { return self._s[2654]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[2655]! } + public var Common_ChoosePhoto: String { return self._s[2656]! } + public var CallFeedback_ReasonEcho: String { return self._s[2657]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2640]!, self._r[2640]!, [_1]) + return formatWithArgumentRanges(self._s[2658]!, self._r[2658]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[2641]! } - public var Activity_UploadingVideo: String { return self._s[2642]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2643]! } - public var NetworkUsageSettings_Wifi: String { return self._s[2644]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[2645]! } - public var Checkout_PayWithTouchId: String { return self._s[2646]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2647]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[2659]! } + public var Activity_UploadingVideo: String { return self._s[2660]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2661]! } + public var NetworkUsageSettings_Wifi: String { return self._s[2662]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[2663]! } + public var Checkout_PayWithTouchId: String { return self._s[2664]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2665]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2649]!, self._r[2649]!, [_1]) + return formatWithArgumentRanges(self._s[2667]!, self._r[2667]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[2650]! } + public var Notifications_ExceptionsNone: String { return self._s[2668]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2651]!, self._r[2651]!, [_0]) + return formatWithArgumentRanges(self._s[2669]!, self._r[2669]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2652]!, self._r[2652]!, [_1]) + return formatWithArgumentRanges(self._s[2670]!, self._r[2670]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[2654]! } - public var Passport_Address_Region: String { return self._s[2657]! } - public var ChatList_DeleteChat: String { return self._s[2658]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[2659]! } - public var PhotoEditor_TiltShift: String { return self._s[2660]! } - public var Settings_FAQ_URL: String { return self._s[2661]! } - public var Passport_Language_sl: String { return self._s[2662]! } - public var Settings_PrivacySettings: String { return self._s[2664]! } - public var SharedMedia_TitleLink: String { return self._s[2665]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[2666]! } - public var Settings_SetProfilePhoto: String { return self._s[2667]! } - public var Channel_About_Help: String { return self._s[2668]! } - public var Contacts_PermissionsEnable: String { return self._s[2669]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[2670]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[2671]! } - public var CallFeedback_ReasonInterruption: String { return self._s[2673]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[2674]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[2675]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[2676]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[2677]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[2679]! } - public var Map_OpenInYandexMaps: String { return self._s[2681]! } - public var PhotoEditor_SaturationTool: String { return self._s[2682]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[2672]! } + public var Passport_Address_Region: String { return self._s[2675]! } + public var ChatList_DeleteChat: String { return self._s[2676]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[2677]! } + public var PhotoEditor_TiltShift: String { return self._s[2678]! } + public var Settings_FAQ_URL: String { return self._s[2679]! } + public var Passport_Language_sl: String { return self._s[2680]! } + public var Settings_PrivacySettings: String { return self._s[2682]! } + public var SharedMedia_TitleLink: String { return self._s[2683]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[2684]! } + public var Settings_SetProfilePhoto: String { return self._s[2685]! } + public var Channel_About_Help: String { return self._s[2686]! } + public var Contacts_PermissionsEnable: String { return self._s[2687]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[2688]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[2689]! } + public var CallFeedback_ReasonInterruption: String { return self._s[2691]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[2692]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[2693]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[2694]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[2695]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[2697]! } + public var Map_OpenInYandexMaps: String { return self._s[2699]! } + public var PhotoEditor_SaturationTool: String { return self._s[2700]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2683]!, self._r[2683]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2701]!, self._r[2701]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[2684]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2685]! } - public var Appearance_TextSize: String { return self._s[2686]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[2702]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2703]! } + public var Appearance_TextSize: String { return self._s[2704]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2687]!, self._r[2687]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2705]!, self._r[2705]!, [_1, "\(_2)"]) } - public var Channel_Username_InvalidTooShort: String { return self._s[2689]! } + public var Channel_Username_InvalidTooShort: String { return self._s[2707]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2690]!, self._r[2690]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2708]!, self._r[2708]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2691]!, self._r[2691]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2709]!, self._r[2709]!, [_1, _2, _3]) } - public var Passport_PassportInformation: String { return self._s[2694]! } - public var WatchRemote_AlertTitle: String { return self._s[2695]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2696]! } - public var ConvertToSupergroup_HelpText: String { return self._s[2698]! } + public var Passport_PassportInformation: String { return self._s[2712]! } + public var WatchRemote_AlertTitle: String { return self._s[2713]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2714]! } + public var ConvertToSupergroup_HelpText: String { return self._s[2716]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2699]!, self._r[2699]!, [_0]) + return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2700]!, self._r[2700]!, [_1]) + return formatWithArgumentRanges(self._s[2718]!, self._r[2718]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2701]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2703]! } - public var AccessDenied_CameraDisabled: String { return self._s[2704]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2719]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2721]! } + public var AccessDenied_CameraDisabled: String { return self._s[2722]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2705]!, self._r[2705]!, [_0]) - } - public var PhotoEditor_ContrastTool: String { return self._s[2708]! } - public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2709]!, self._r[2709]!, [_1]) - } - public var DialogList_Draft: String { return self._s[2710]! } - public var Privacy_TopPeersDelete: String { return self._s[2712]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[2713]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2714]! } - public var WebSearch_RecentSectionClear: String { return self._s[2715]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[2717]! } - public var Common_Done: String { return self._s[2719]! } - public var AuthSessions_EmptyText: String { return self._s[2720]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[2721]! } - public var Tour_Title5: String { return self._s[2722]! } - public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2723]!, self._r[2723]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2724]! } - public var Conversation_LinkDialogSave: String { return self._s[2725]! } - public var GroupInfo_ActionRestrict: String { return self._s[2726]! } - public var Checkout_Title: String { return self._s[2727]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[2729]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[2731]! } - public var Notification_RenamedGroup: String { return self._s[2732]! } - public var PeopleNearby_Groups: String { return self._s[2733]! } - public var Checkout_PayWithFaceId: String { return self._s[2734]! } - public var Channel_BanList_BlockedTitle: String { return self._s[2735]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2737]! } - public var Checkout_WebConfirmation_Title: String { return self._s[2738]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[2739]! } - public var Profile_AddToExisting: String { return self._s[2741]! } + public var PhotoEditor_ContrastTool: String { return self._s[2726]! } + public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2727]!, self._r[2727]!, [_1]) + } + public var DialogList_Draft: String { return self._s[2728]! } + public var Privacy_TopPeersDelete: String { return self._s[2730]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[2731]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2732]! } + public var WebSearch_RecentSectionClear: String { return self._s[2733]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[2735]! } + public var Common_Done: String { return self._s[2737]! } + public var AuthSessions_EmptyText: String { return self._s[2738]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[2739]! } + public var Tour_Title5: String { return self._s[2740]! } + public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2741]!, self._r[2741]!, [_0]) + } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2742]! } + public var Conversation_LinkDialogSave: String { return self._s[2743]! } + public var GroupInfo_ActionRestrict: String { return self._s[2744]! } + public var Checkout_Title: String { return self._s[2745]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[2747]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[2749]! } + public var Notification_RenamedGroup: String { return self._s[2750]! } + public var PeopleNearby_Groups: String { return self._s[2751]! } + public var Checkout_PayWithFaceId: String { return self._s[2752]! } + public var Channel_BanList_BlockedTitle: String { return self._s[2753]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2755]! } + public var Checkout_WebConfirmation_Title: String { return self._s[2756]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[2757]! } + public var Profile_AddToExisting: String { return self._s[2759]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2742]!, self._r[2742]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2760]!, self._r[2760]!, [_0, _1]) } - public var Cache_Files: String { return self._s[2744]! } - public var Permissions_PrivacyPolicy: String { return self._s[2745]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[2746]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2747]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[2749]! } - public var Calls_NoCallsPlaceholder: String { return self._s[2751]! } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2752]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2754]! } + public var Cache_Files: String { return self._s[2762]! } + public var Permissions_PrivacyPolicy: String { return self._s[2763]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[2764]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2765]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[2767]! } + public var Calls_NoCallsPlaceholder: String { return self._s[2769]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2770]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2772]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2755]!, self._r[2755]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2773]!, self._r[2773]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2756]! } - public var Passport_FieldAddressHelp: String { return self._s[2757]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2758]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2774]! } + public var Passport_FieldAddressHelp: String { return self._s[2775]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2776]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2759]!, self._r[2759]!, [_0]) + return formatWithArgumentRanges(self._s[2777]!, self._r[2777]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[2760]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[2762]! } - public var Login_UnknownError: String { return self._s[2763]! } - public var Group_UpgradeNoticeText2: String { return self._s[2765]! } - public var Watch_Compose_AddContact: String { return self._s[2766]! } - public var Web_Error: String { return self._s[2767]! } - public var Gif_Search: String { return self._s[2768]! } - public var Profile_MessageLifetime1h: String { return self._s[2769]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2770]! } - public var Channel_Username_CheckingUsername: String { return self._s[2771]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[2772]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[2773]! } - public var Channel_AboutItem: String { return self._s[2774]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2776]! } - public var GroupInfo_SharedMedia: String { return self._s[2777]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[2778]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[2780]! } + public var Login_UnknownError: String { return self._s[2781]! } + public var Group_UpgradeNoticeText2: String { return self._s[2783]! } + public var Watch_Compose_AddContact: String { return self._s[2784]! } + public var Web_Error: String { return self._s[2785]! } + public var Gif_Search: String { return self._s[2786]! } + public var Profile_MessageLifetime1h: String { return self._s[2787]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2788]! } + public var Channel_Username_CheckingUsername: String { return self._s[2789]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[2790]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[2791]! } + public var Channel_AboutItem: String { return self._s[2792]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2794]! } + public var GroupInfo_SharedMedia: String { return self._s[2795]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2778]!, self._r[2778]!, [_1]) + return formatWithArgumentRanges(self._s[2796]!, self._r[2796]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[2779]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[2797]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2780]!, self._r[2780]!, [_1]) + return formatWithArgumentRanges(self._s[2798]!, self._r[2798]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[2781]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2782]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[2783]! } - public var CreatePoll_AddOption: String { return self._s[2784]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2785]! } - public var Group_UpgradeNoticeHeader: String { return self._s[2786]! } - public var Channel_Management_AddModerator: String { return self._s[2787]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[2788]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[2789]! } - public var NotificationsSound_Hello: String { return self._s[2790]! } - public var SocksProxySetup_SavedProxies: String { return self._s[2791]! } - public var Channel_Stickers_Placeholder: String { return self._s[2793]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[2799]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2800]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[2801]! } + public var CreatePoll_AddOption: String { return self._s[2802]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2803]! } + public var Group_UpgradeNoticeHeader: String { return self._s[2804]! } + public var Channel_Management_AddModerator: String { return self._s[2805]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[2806]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[2807]! } + public var NotificationsSound_Hello: String { return self._s[2808]! } + public var SocksProxySetup_SavedProxies: String { return self._s[2809]! } + public var Channel_Stickers_Placeholder: String { return self._s[2811]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2794]!, self._r[2794]!, [_0]) + return formatWithArgumentRanges(self._s[2812]!, self._r[2812]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2795]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[2796]! } - public var ContactInfo_BirthdayLabel: String { return self._s[2797]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2798]! } - public var AutoDownloadSettings_Channels: String { return self._s[2799]! } - public var Passport_Language_mn: String { return self._s[2800]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[2803]! } - public var Passport_Language_ja: String { return self._s[2805]! } - public var Settings_About_Title: String { return self._s[2806]! } - public var Settings_NotificationsAndSounds: String { return self._s[2807]! } - public var ChannelInfo_DeleteGroup: String { return self._s[2808]! } - public var Settings_BlockedUsers: String { return self._s[2809]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2813]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[2814]! } + public var ContactInfo_BirthdayLabel: String { return self._s[2815]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2816]! } + public var AutoDownloadSettings_Channels: String { return self._s[2817]! } + public var Passport_Language_mn: String { return self._s[2818]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[2821]! } + public var Passport_Language_ja: String { return self._s[2823]! } + public var Settings_About_Title: String { return self._s[2824]! } + public var Settings_NotificationsAndSounds: String { return self._s[2825]! } + public var ChannelInfo_DeleteGroup: String { return self._s[2826]! } + public var Settings_BlockedUsers: String { return self._s[2827]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2810]!, self._r[2810]!, [_0]) + return formatWithArgumentRanges(self._s[2828]!, self._r[2828]!, [_0]) } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[2811]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[2812]! } - public var Channel_Username_Title: String { return self._s[2813]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[2829]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[2830]! } + public var Channel_Username_Title: String { return self._s[2831]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2814]!, self._r[2814]!, [_0]) + return formatWithArgumentRanges(self._s[2832]!, self._r[2832]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[2816]! } - public var AppleWatch_Title: String { return self._s[2817]! } - public var Activity_RecordingVideoMessage: String { return self._s[2818]! } + public var AttachmentMenu_File: String { return self._s[2834]! } + public var AppleWatch_Title: String { return self._s[2835]! } + public var Activity_RecordingVideoMessage: String { return self._s[2836]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2819]!, self._r[2819]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2837]!, self._r[2837]!, [_1, _2]) } - public var Weekday_Saturday: String { return self._s[2820]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[2821]! } - public var Profile_CreateEncryptedChatError: String { return self._s[2822]! } - public var Common_Next: String { return self._s[2824]! } - public var Channel_Stickers_YourStickers: String { return self._s[2826]! } - public var Call_AudioRouteHeadphones: String { return self._s[2827]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2829]! } - public var Watch_Contacts_NoResults: String { return self._s[2831]! } - public var PhotoEditor_TintTool: String { return self._s[2834]! } - public var LoginPassword_ResetAccount: String { return self._s[2836]! } - public var Settings_SavedMessages: String { return self._s[2837]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[2838]! } - public var Bot_GenericSupportStatus: String { return self._s[2839]! } - public var StickerPack_Add: String { return self._s[2840]! } - public var Checkout_TotalAmount: String { return self._s[2841]! } - public var Your_cards_number_is_invalid: String { return self._s[2842]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[2843]! } + public var Weekday_Saturday: String { return self._s[2838]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[2839]! } + public var Profile_CreateEncryptedChatError: String { return self._s[2840]! } + public var Common_Next: String { return self._s[2842]! } + public var Channel_Stickers_YourStickers: String { return self._s[2844]! } + public var Call_AudioRouteHeadphones: String { return self._s[2845]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2847]! } + public var Watch_Contacts_NoResults: String { return self._s[2849]! } + public var PhotoEditor_TintTool: String { return self._s[2852]! } + public var LoginPassword_ResetAccount: String { return self._s[2854]! } + public var Settings_SavedMessages: String { return self._s[2855]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[2856]! } + public var Bot_GenericSupportStatus: String { return self._s[2857]! } + public var StickerPack_Add: String { return self._s[2858]! } + public var Checkout_TotalAmount: String { return self._s[2859]! } + public var Your_cards_number_is_invalid: String { return self._s[2860]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[2861]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2844]!, self._r[2844]!, [_0]) + return formatWithArgumentRanges(self._s[2862]!, self._r[2862]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2845]!, self._r[2845]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2863]!, self._r[2863]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2846]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2864]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2848]!, self._r[2848]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2866]!, self._r[2866]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2849]!, self._r[2849]!, [_0]) + return formatWithArgumentRanges(self._s[2867]!, self._r[2867]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[2850]! } - public var StickerPack_Share: String { return self._s[2851]! } - public var Passport_DeleteAddress: String { return self._s[2852]! } - public var Settings_Passport: String { return self._s[2853]! } - public var SharedMedia_EmptyFilesText: String { return self._s[2854]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[2855]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2856]! } - public var Contacts_PermissionsText: String { return self._s[2857]! } - public var Group_Setup_HistoryVisible: String { return self._s[2858]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[2860]! } - public var SocksProxySetup_Title: String { return self._s[2861]! } - public var Notification_Mute1h: String { return self._s[2862]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[2868]! } + public var StickerPack_Share: String { return self._s[2869]! } + public var Passport_DeleteAddress: String { return self._s[2870]! } + public var Settings_Passport: String { return self._s[2871]! } + public var SharedMedia_EmptyFilesText: String { return self._s[2872]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[2873]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2874]! } + public var Contacts_PermissionsText: String { return self._s[2875]! } + public var Group_Setup_HistoryVisible: String { return self._s[2876]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[2878]! } + public var SocksProxySetup_Title: String { return self._s[2879]! } + public var Notification_Mute1h: String { return self._s[2880]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2863]!, self._r[2863]!, [_0]) + return formatWithArgumentRanges(self._s[2881]!, self._r[2881]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[2864]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[2882]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2865]!, self._r[2865]!, [_1]) + return formatWithArgumentRanges(self._s[2883]!, self._r[2883]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[2866]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2869]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2871]! } - public var DialogList_NoMessagesText: String { return self._s[2872]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[2873]! } - public var Privacy_Calls_P2PHelp: String { return self._s[2874]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[2876]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[2877]! } - public var Common_TakePhotoOrVideo: String { return self._s[2878]! } - public var Call_StatusBusy: String { return self._s[2879]! } - public var Conversation_PinnedMessage: String { return self._s[2880]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2881]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2882]! } - public var Undo_ChatCleared: String { return self._s[2883]! } - public var AppleWatch_ReplyPresets: String { return self._s[2884]! } - public var Passport_DiscardMessageDescription: String { return self._s[2886]! } - public var Login_NetworkError: String { return self._s[2887]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[2884]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2887]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2889]! } + public var DialogList_NoMessagesText: String { return self._s[2890]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[2891]! } + public var Privacy_Calls_P2PHelp: String { return self._s[2892]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[2894]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[2895]! } + public var Common_TakePhotoOrVideo: String { return self._s[2896]! } + public var Call_StatusBusy: String { return self._s[2897]! } + public var Conversation_PinnedMessage: String { return self._s[2898]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2899]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2900]! } + public var Undo_ChatCleared: String { return self._s[2901]! } + public var AppleWatch_ReplyPresets: String { return self._s[2902]! } + public var Passport_DiscardMessageDescription: String { return self._s[2904]! } + public var Login_NetworkError: String { return self._s[2905]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2888]!, self._r[2888]!, [_0]) + return formatWithArgumentRanges(self._s[2906]!, self._r[2906]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2889]!, self._r[2889]!, [_0]) + return formatWithArgumentRanges(self._s[2907]!, self._r[2907]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2890]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2892]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2908]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2910]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2894]!, self._r[2894]!, [_0]) + return formatWithArgumentRanges(self._s[2912]!, self._r[2912]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[2895]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[2896]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[2898]! } - public var ConversationMedia_Title: String { return self._s[2899]! } - public var EncryptionKey_Title: String { return self._s[2901]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2902]! } - public var Notification_Exceptions_AddException: String { return self._s[2903]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[2904]! } - public var Profile_MessageLifetime1m: String { return self._s[2905]! } + public var Call_ConnectionErrorMessage: String { return self._s[2913]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[2914]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[2916]! } + public var ConversationMedia_Title: String { return self._s[2917]! } + public var EncryptionKey_Title: String { return self._s[2919]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2920]! } + public var Notification_Exceptions_AddException: String { return self._s[2921]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[2922]! } + public var Profile_MessageLifetime1m: String { return self._s[2923]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2906]!, self._r[2906]!, [_1]) + return formatWithArgumentRanges(self._s[2924]!, self._r[2924]!, [_1]) } - public var Month_GenMay: String { return self._s[2907]! } + public var Month_GenMay: String { return self._s[2925]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2908]!, self._r[2908]!, [_0]) + return formatWithArgumentRanges(self._s[2926]!, self._r[2926]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[2909]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2910]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[2911]! } - public var Conversation_EmptyPlaceholder: String { return self._s[2913]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[2914]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[2915]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2916]! } - public var Camera_TapAndHoldForVideo: String { return self._s[2917]! } - public var Channel_JoinChannel: String { return self._s[2919]! } - public var Appearance_Animations: String { return self._s[2922]! } + public var PeopleNearby_Users: String { return self._s[2927]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2928]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[2929]! } + public var Conversation_EmptyPlaceholder: String { return self._s[2931]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[2932]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[2933]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2934]! } + public var Camera_TapAndHoldForVideo: String { return self._s[2935]! } + public var Channel_JoinChannel: String { return self._s[2937]! } + public var Appearance_Animations: String { return self._s[2940]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2923]!, self._r[2923]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[2925]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[2927]! } - public var Passport_Address_Street: String { return self._s[2928]! } - public var Conversation_AddContact: String { return self._s[2929]! } - public var Login_PhonePlaceholder: String { return self._s[2930]! } - public var Channel_Members_InviteLink: String { return self._s[2932]! } - public var Bot_Stop: String { return self._s[2933]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[2935]! } - public var Notification_PassportValueAddress: String { return self._s[2936]! } - public var Month_ShortJuly: String { return self._s[2937]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[2938]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[2939]! } - public var Passport_Identity_ReverseSide: String { return self._s[2940]! } - public var Watch_Stickers_Recents: String { return self._s[2943]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[2945]! } - public var Map_SendThisLocation: String { return self._s[2946]! } + public var Stickers_GroupStickers: String { return self._s[2943]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[2945]! } + public var Passport_Address_Street: String { return self._s[2946]! } + public var Conversation_AddContact: String { return self._s[2947]! } + public var Login_PhonePlaceholder: String { return self._s[2948]! } + public var Channel_Members_InviteLink: String { return self._s[2950]! } + public var Bot_Stop: String { return self._s[2951]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[2953]! } + public var Notification_PassportValueAddress: String { return self._s[2954]! } + public var Month_ShortJuly: String { return self._s[2955]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[2956]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[2957]! } + public var Passport_Identity_ReverseSide: String { return self._s[2958]! } + public var Watch_Stickers_Recents: String { return self._s[2961]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[2963]! } + public var Map_SendThisLocation: String { return self._s[2964]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2947]!, self._r[2947]!, [_0]) - } - public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2948]!, self._r[2948]!, [_0]) - } - public var ConvertToSupergroup_Note: String { return self._s[2949]! } - public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2950]!, self._r[2950]!, [_0]) - } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[2951]! } - public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2952]!, self._r[2952]!, [_0, _1]) - } - public var Login_CallRequestState3: String { return self._s[2954]! } - public var Wallpaper_SearchShort: String { return self._s[2955]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[2957]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[2958]! } - public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_1, _2]) - } - public var Channel_AdminLogFilter_Title: String { return self._s[2960]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[2964]! } - public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2965]!, self._r[2965]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[2966]! } + public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2966]!, self._r[2966]!, [_0]) + } + public var ConvertToSupergroup_Note: String { return self._s[2967]! } + public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2968]!, self._r[2968]!, [_0]) + } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[2969]! } + public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2970]!, self._r[2970]!, [_0, _1]) + } + public var Login_CallRequestState3: String { return self._s[2972]! } + public var Wallpaper_SearchShort: String { return self._s[2973]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[2975]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[2976]! } + public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2977]!, self._r[2977]!, [_1, _2]) + } + public var Channel_AdminLogFilter_Title: String { return self._s[2978]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[2982]! } + public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2983]!, self._r[2983]!, [_0]) + } + public var Passport_CorrectErrors: String { return self._s[2984]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2967]!, self._r[2967]!, [_0]) + return formatWithArgumentRanges(self._s[2985]!, self._r[2985]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[2968]! } - public var Channel_DiscussionGroup: String { return self._s[2969]! } + public var Map_SendMyCurrentLocation: String { return self._s[2986]! } + public var Channel_DiscussionGroup: String { return self._s[2987]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2970]!, self._r[2970]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2988]!, self._r[2988]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[2971]! } - public var Permissions_NotificationsText_v0: String { return self._s[2972]! } - public var Appearance_AppIcon: String { return self._s[2973]! } - public var LoginPassword_FloodError: String { return self._s[2974]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[2976]! } + public var SharedMedia_SearchNoResults: String { return self._s[2989]! } + public var Permissions_NotificationsText_v0: String { return self._s[2990]! } + public var Appearance_AppIcon: String { return self._s[2991]! } + public var LoginPassword_FloodError: String { return self._s[2992]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[2994]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2977]!, self._r[2977]!, [_0]) + return formatWithArgumentRanges(self._s[2995]!, self._r[2995]!, [_0]) } - public var Passport_Language_bn: String { return self._s[2978]! } + public var Passport_Language_bn: String { return self._s[2996]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2979]!, self._r[2979]!, [_0]) + return formatWithArgumentRanges(self._s[2997]!, self._r[2997]!, [_0]) } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2980]!, self._r[2980]!, [_0]) + return formatWithArgumentRanges(self._s[2998]!, self._r[2998]!, [_0]) } public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0]) + return formatWithArgumentRanges(self._s[2999]!, self._r[2999]!, [_0]) } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[2984]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[2986]! } - public var Contacts_PermissionsAllow: String { return self._s[2987]! } - public var ReportPeer_ReasonCopyright: String { return self._s[2988]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2989]! } - public var WallpaperPreview_Pattern: String { return self._s[2990]! } - public var Paint_Duplicate: String { return self._s[2991]! } - public var Passport_Address_Country: String { return self._s[2992]! } - public var Notification_RenamedChannel: String { return self._s[2994]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[2995]! } - public var Group_MessagePhotoUpdated: String { return self._s[2996]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[2997]! } - public var Conversation_ContextMenuBan: String { return self._s[2998]! } - public var TwoStepAuth_EmailSent: String { return self._s[2999]! } - public var MessagePoll_NoVotes: String { return self._s[3000]! } - public var Passport_Language_is: String { return self._s[3001]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3003]! } - public var Tour_Text5: String { return self._s[3004]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3002]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3004]! } + public var Contacts_PermissionsAllow: String { return self._s[3005]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3006]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3007]! } + public var WallpaperPreview_Pattern: String { return self._s[3008]! } + public var Paint_Duplicate: String { return self._s[3009]! } + public var Passport_Address_Country: String { return self._s[3010]! } + public var Notification_RenamedChannel: String { return self._s[3012]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3013]! } + public var Group_MessagePhotoUpdated: String { return self._s[3014]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3015]! } + public var Conversation_ContextMenuBan: String { return self._s[3016]! } + public var TwoStepAuth_EmailSent: String { return self._s[3017]! } + public var MessagePoll_NoVotes: String { return self._s[3018]! } + public var Passport_Language_is: String { return self._s[3019]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3021]! } + public var Tour_Text5: String { return self._s[3022]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3024]!, self._r[3024]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3007]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3008]! } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3009]! } - public var Paint_Edit: String { return self._s[3011]! } - public var Undo_DeletedGroup: String { return self._s[3014]! } - public var LoginPassword_ForgotPassword: String { return self._s[3015]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3016]! } + public var Undo_SecretChatDeleted: String { return self._s[3025]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3026]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3027]! } + public var Paint_Edit: String { return self._s[3029]! } + public var Undo_DeletedGroup: String { return self._s[3032]! } + public var LoginPassword_ForgotPassword: String { return self._s[3033]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3034]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3035]!, self._r[3035]!, [_0, _1]) } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3018]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3019]! } - public var Passport_Language_uz: String { return self._s[3020]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3021]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3022]! } - public var Map_StopLiveLocation: String { return self._s[3024]! } - public var PasscodeSettings_Help: String { return self._s[3026]! } - public var NotificationsSound_Input: String { return self._s[3027]! } - public var Share_Title: String { return self._s[3030]! } - public var LogoutOptions_Title: String { return self._s[3031]! } - public var Login_TermsOfServiceAgree: String { return self._s[3032]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3033]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3034]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3035]! } - public var EnterPasscode_EnterTitle: String { return self._s[3036]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3036]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3037]! } + public var Passport_Language_uz: String { return self._s[3038]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3039]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3040]! } + public var Map_StopLiveLocation: String { return self._s[3042]! } + public var PasscodeSettings_Help: String { return self._s[3044]! } + public var NotificationsSound_Input: String { return self._s[3045]! } + public var Share_Title: String { return self._s[3048]! } + public var LogoutOptions_Title: String { return self._s[3049]! } + public var Login_TermsOfServiceAgree: String { return self._s[3050]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3051]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3052]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3053]! } + public var EnterPasscode_EnterTitle: String { return self._s[3054]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3037]!, self._r[3037]!, [_0]) + return formatWithArgumentRanges(self._s[3055]!, self._r[3055]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3038]! } - public var Conversation_AddToContacts: String { return self._s[3039]! } - public var NotificationsSound_Keys: String { return self._s[3040]! } + public var Settings_CopyPhoneNumber: String { return self._s[3056]! } + public var Conversation_AddToContacts: String { return self._s[3057]! } + public var NotificationsSound_Keys: String { return self._s[3058]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3041]!, self._r[3041]!, [_0]) + return formatWithArgumentRanges(self._s[3059]!, self._r[3059]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3042]! } - public var Message_Video: String { return self._s[3043]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3044]! } + public var Notification_MessageLifetime1w: String { return self._s[3060]! } + public var Message_Video: String { return self._s[3061]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3062]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_1]) + return formatWithArgumentRanges(self._s[3063]!, self._r[3063]!, [_1]) } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3048]!, self._r[3048]!, [_0]) + return formatWithArgumentRanges(self._s[3066]!, self._r[3066]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3049]!, self._r[3049]!, [_0]) + return formatWithArgumentRanges(self._s[3067]!, self._r[3067]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3050]! } - public var CreatePoll_CancelConfirmation: String { return self._s[3051]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3053]! } - public var PrivacyPolicy_Decline: String { return self._s[3054]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3055]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3056]! } - public var Permissions_SiriAllow_v0: String { return self._s[3058]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3059]! } + public var Passport_Language_mk: String { return self._s[3068]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3069]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3071]! } + public var PrivacyPolicy_Decline: String { return self._s[3072]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3073]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3074]! } + public var Permissions_SiriAllow_v0: String { return self._s[3076]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3077]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3060]!, self._r[3060]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3061]!, self._r[3061]!, [_0]) + return formatWithArgumentRanges(self._s[3079]!, self._r[3079]!, [_0]) } - public var Paint_Regular: String { return self._s[3062]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3063]! } - public var SocksProxySetup_ShareLink: String { return self._s[3064]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3065]! } - public var GroupInfo_InviteByLink: String { return self._s[3067]! } - public var MessageTimer_Custom: String { return self._s[3068]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3069]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3071]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3072]! } - public var Channel_Username_InvalidTaken: String { return self._s[3073]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3074]! } - public var Settings_ChatBackground: String { return self._s[3075]! } - public var Channel_Subscribers_Title: String { return self._s[3076]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3077]! } - public var Watch_ConnectionDescription: String { return self._s[3078]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3082]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3083]! } - public var EditProfile_Title: String { return self._s[3084]! } - public var NotificationsSound_Bamboo: String { return self._s[3086]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3088]! } - public var Login_SmsRequestState2: String { return self._s[3089]! } - public var Passport_Language_ar: String { return self._s[3090]! } + public var Paint_Regular: String { return self._s[3080]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3081]! } + public var SocksProxySetup_ShareLink: String { return self._s[3082]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3083]! } + public var GroupInfo_InviteByLink: String { return self._s[3085]! } + public var MessageTimer_Custom: String { return self._s[3086]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3087]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3089]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3090]! } + public var Channel_Username_InvalidTaken: String { return self._s[3091]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3092]! } + public var Settings_ChatBackground: String { return self._s[3093]! } + public var Channel_Subscribers_Title: String { return self._s[3094]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3095]! } + public var Watch_ConnectionDescription: String { return self._s[3096]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3100]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3101]! } + public var EditProfile_Title: String { return self._s[3102]! } + public var NotificationsSound_Bamboo: String { return self._s[3104]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3106]! } + public var Login_SmsRequestState2: String { return self._s[3107]! } + public var Passport_Language_ar: String { return self._s[3108]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3091]!, self._r[3091]!, [_0]) + return formatWithArgumentRanges(self._s[3109]!, self._r[3109]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3092]! } - public var Conversation_MessageDialogEdit: String { return self._s[3093]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3110]! } + public var Conversation_MessageDialogEdit: String { return self._s[3111]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_1]) + return formatWithArgumentRanges(self._s[3112]!, self._r[3112]!, [_1]) } - public var Common_Close: String { return self._s[3095]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3096]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3097]! } + public var Common_Close: String { return self._s[3113]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3114]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3115]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3101]!, self._r[3101]!, [_0]) + return formatWithArgumentRanges(self._s[3119]!, self._r[3119]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3102]! } + public var UserInfo_About_Placeholder: String { return self._s[3120]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3103]!, self._r[3103]!, [_0]) + return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3104]! } - public var Channel_Info_Banned: String { return self._s[3106]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3122]! } + public var Channel_Info_Banned: String { return self._s[3124]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3107]!, self._r[3107]!, [_0]) + return formatWithArgumentRanges(self._s[3125]!, self._r[3125]!, [_0]) } - public var Appearance_Other: String { return self._s[3108]! } - public var Passport_Language_my: String { return self._s[3109]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3110]! } + public var Appearance_Other: String { return self._s[3126]! } + public var Passport_Language_my: String { return self._s[3127]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3128]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3111]!, self._r[3111]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3129]!, self._r[3129]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3112]! } - public var Preview_CopyAddress: String { return self._s[3113]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3130]! } + public var Preview_CopyAddress: String { return self._s[3131]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3114]!, self._r[3114]!, [_0]) + return formatWithArgumentRanges(self._s[3132]!, self._r[3132]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3115]! } - public var UserInfo_BotSettings: String { return self._s[3116]! } - public var LiveLocation_MenuStopAll: String { return self._s[3118]! } - public var Passport_PasswordCreate: String { return self._s[3119]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3120]! } - public var Message_PinnedLocationMessage: String { return self._s[3121]! } - public var Map_Satellite: String { return self._s[3122]! } - public var Watch_Message_Unsupported: String { return self._s[3123]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3124]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3125]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3133]! } + public var UserInfo_BotSettings: String { return self._s[3134]! } + public var LiveLocation_MenuStopAll: String { return self._s[3136]! } + public var Passport_PasswordCreate: String { return self._s[3137]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3138]! } + public var Message_PinnedLocationMessage: String { return self._s[3139]! } + public var Map_Satellite: String { return self._s[3140]! } + public var Watch_Message_Unsupported: String { return self._s[3141]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3142]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3143]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3126]!, self._r[3126]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3144]!, self._r[3144]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3127]!, self._r[3127]!, [_0]) + return formatWithArgumentRanges(self._s[3145]!, self._r[3145]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3128]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3129]! } - public var NotificationsSound_None: String { return self._s[3130]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3132]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3133]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3146]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3147]! } + public var NotificationsSound_None: String { return self._s[3148]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3150]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3151]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3134]!, self._r[3134]!, [_1]) + return formatWithArgumentRanges(self._s[3152]!, self._r[3152]!, [_1]) } - public var Cache_Indexing: String { return self._s[3135]! } - public var DialogList_RecentTitlePeople: String { return self._s[3137]! } - public var DialogList_EncryptionRejected: String { return self._s[3138]! } - public var GroupInfo_Administrators: String { return self._s[3139]! } - public var Passport_ScanPassportHelp: String { return self._s[3140]! } - public var Application_Name: String { return self._s[3141]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3142]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3144]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3145]! } + public var Cache_Indexing: String { return self._s[3153]! } + public var DialogList_RecentTitlePeople: String { return self._s[3155]! } + public var DialogList_EncryptionRejected: String { return self._s[3156]! } + public var GroupInfo_Administrators: String { return self._s[3157]! } + public var Passport_ScanPassportHelp: String { return self._s[3158]! } + public var Application_Name: String { return self._s[3159]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3160]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3162]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3163]! } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3146]!, self._r[3146]!, [_0]) + return formatWithArgumentRanges(self._s[3164]!, self._r[3164]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3147]!, self._r[3147]!, [_0]) + return formatWithArgumentRanges(self._s[3165]!, self._r[3165]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3148]! } - public var Privacy_ChatsTitle: String { return self._s[3149]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3150]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3151]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3152]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3153]! } - public var Group_LinkedChannel: String { return self._s[3154]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3155]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3156]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3157]! } - public var Channel_Setup_TypePublic: String { return self._s[3160]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3166]! } + public var Privacy_ChatsTitle: String { return self._s[3167]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3168]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3169]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3170]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3171]! } + public var Group_LinkedChannel: String { return self._s[3172]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3173]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3174]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3175]! } + public var Channel_Setup_TypePublic: String { return self._s[3178]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3161]!, self._r[3161]!, [_0]) + return formatWithArgumentRanges(self._s[3179]!, self._r[3179]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3163]! } - public var Map_OpenInMaps: String { return self._s[3165]! } + public var Channel_TypeSetup_Title: String { return self._s[3181]! } + public var Map_OpenInMaps: String { return self._s[3183]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3166]!, self._r[3166]!, [_1]) + return formatWithArgumentRanges(self._s[3184]!, self._r[3184]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3168]! } + public var NotificationsSound_Tremolo: String { return self._s[3186]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3169]!, self._r[3169]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3187]!, self._r[3187]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3170]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3171]! } - public var Passport_PasswordHelp: String { return self._s[3172]! } - public var Login_CodeExpiredError: String { return self._s[3173]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3174]! } - public var Conversation_TitleUnmute: String { return self._s[3175]! } - public var Passport_Identity_ScansHelp: String { return self._s[3176]! } - public var Passport_Language_lo: String { return self._s[3177]! } - public var Camera_FlashAuto: String { return self._s[3178]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3179]! } - public var Common_Cancel: String { return self._s[3180]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3181]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3182]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3188]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3189]! } + public var Passport_PasswordHelp: String { return self._s[3190]! } + public var Login_CodeExpiredError: String { return self._s[3191]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3192]! } + public var Conversation_TitleUnmute: String { return self._s[3193]! } + public var Passport_Identity_ScansHelp: String { return self._s[3194]! } + public var Passport_Language_lo: String { return self._s[3195]! } + public var Camera_FlashAuto: String { return self._s[3196]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3197]! } + public var Common_Cancel: String { return self._s[3198]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3199]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3200]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3183]!, self._r[3183]!, [_1]) + return formatWithArgumentRanges(self._s[3201]!, self._r[3201]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3184]! } - public var ChatSettings_Title: String { return self._s[3186]! } - public var Passport_PasswordReset: String { return self._s[3187]! } - public var SocksProxySetup_TypeNone: String { return self._s[3188]! } - public var PhoneNumberHelp_Help: String { return self._s[3190]! } - public var Checkout_EnterPassword: String { return self._s[3191]! } - public var Share_AuthTitle: String { return self._s[3193]! } - public var Activity_UploadingDocument: String { return self._s[3194]! } - public var State_Connecting: String { return self._s[3195]! } - public var Profile_MessageLifetime1w: String { return self._s[3196]! } - public var Conversation_ContextMenuReport: String { return self._s[3197]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3198]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3199]! } - public var AuthSessions_Terminate: String { return self._s[3200]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3201]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3202]! } - public var PhotoEditor_Set: String { return self._s[3203]! } - public var EmptyGroupInfo_Title: String { return self._s[3204]! } - public var Login_PadPhoneHelp: String { return self._s[3205]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3207]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3209]! } - public var NotificationsSound_Complete: String { return self._s[3210]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3211]! } - public var Group_Info_AdminLog: String { return self._s[3212]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3213]! } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3214]! } - public var Conversation_Admin: String { return self._s[3216]! } - public var Conversation_GifTooltip: String { return self._s[3217]! } - public var Passport_NotLoggedInMessage: String { return self._s[3218]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3202]! } + public var ChatSettings_Title: String { return self._s[3204]! } + public var Passport_PasswordReset: String { return self._s[3205]! } + public var SocksProxySetup_TypeNone: String { return self._s[3206]! } + public var PhoneNumberHelp_Help: String { return self._s[3208]! } + public var Checkout_EnterPassword: String { return self._s[3209]! } + public var Share_AuthTitle: String { return self._s[3211]! } + public var Activity_UploadingDocument: String { return self._s[3212]! } + public var State_Connecting: String { return self._s[3213]! } + public var Profile_MessageLifetime1w: String { return self._s[3214]! } + public var Conversation_ContextMenuReport: String { return self._s[3215]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3216]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3217]! } + public var AuthSessions_Terminate: String { return self._s[3218]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3219]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3220]! } + public var PhotoEditor_Set: String { return self._s[3221]! } + public var EmptyGroupInfo_Title: String { return self._s[3222]! } + public var Login_PadPhoneHelp: String { return self._s[3223]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3225]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3227]! } + public var NotificationsSound_Complete: String { return self._s[3228]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3229]! } + public var Group_Info_AdminLog: String { return self._s[3230]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3231]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3232]! } + public var Conversation_Admin: String { return self._s[3234]! } + public var Conversation_GifTooltip: String { return self._s[3235]! } + public var Passport_NotLoggedInMessage: String { return self._s[3236]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3219]!, self._r[3219]!, [_0]) + return formatWithArgumentRanges(self._s[3237]!, self._r[3237]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3220]! } - public var SharedMedia_EmptyTitle: String { return self._s[3222]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3224]! } - public var Username_Help: String { return self._s[3225]! } - public var DialogList_LanguageTooltip: String { return self._s[3227]! } - public var Map_LoadError: String { return self._s[3228]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3229]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3230]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3231]! } - public var Notification_Exceptions_NewException: String { return self._s[3232]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3233]! } - public var WatchRemote_AlertText: String { return self._s[3234]! } - public var ChatSettings_ConnectionType_Title: String { return self._s[3237]! } + public var Profile_MessageLifetimeForever: String { return self._s[3238]! } + public var SharedMedia_EmptyTitle: String { return self._s[3240]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3242]! } + public var Username_Help: String { return self._s[3243]! } + public var DialogList_LanguageTooltip: String { return self._s[3245]! } + public var Map_LoadError: String { return self._s[3246]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3247]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3248]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3249]! } + public var Notification_Exceptions_NewException: String { return self._s[3250]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3251]! } + public var WatchRemote_AlertText: String { return self._s[3252]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3255]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3238]!, self._r[3238]!, [_0]) - } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3239]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3240]! } - public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3241]!, self._r[3241]!, [_0]) - } - public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3242]!, self._r[3242]!, [_1, _2, _3]) - } - public var Group_AdminLog_EmptyText: String { return self._s[3243]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3244]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3246]! } - public var ChatList_UndoArchiveText1: String { return self._s[3247]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3248]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3249]! } - public var Cache_ClearNone: String { return self._s[3250]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3251]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3252]! } - public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3253]!, self._r[3253]!, [_0]) - } - public var Passport_Identity_Country: String { return self._s[3254]! } - public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3255]!, self._r[3255]!, [_0]) - } - public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3256]!, self._r[3256]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3257]! } - public var AccessDenied_Settings: String { return self._s[3258]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3259]! } - public var Month_ShortMay: String { return self._s[3260]! } - public var Compose_NewGroup: String { return self._s[3261]! } - public var Group_Setup_TypePrivate: String { return self._s[3263]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3265]! } - public var Appearance_ThemeDayClassic: String { return self._s[3266]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3267]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3268]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3269]! } - public var Conversation_typing: String { return self._s[3271]! } - public var Paint_Masks: String { return self._s[3272]! } - public var Username_InvalidTaken: String { return self._s[3273]! } - public var Call_StatusNoAnswer: String { return self._s[3274]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3275]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3276]! } - public var Passport_Identity_Selfie: String { return self._s[3277]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3278]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3279]! } - public var Conversation_ClearSecretHistory: String { return self._s[3280]! } - public var PeopleNearby_Description: String { return self._s[3282]! } - public var NetworkUsageSettings_Title: String { return self._s[3283]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3285]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3257]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3258]! } + public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3259]!, self._r[3259]!, [_0]) + } + public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_1, _2, _3]) + } + public var Group_AdminLog_EmptyText: String { return self._s[3261]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3262]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3264]! } + public var ChatList_UndoArchiveText1: String { return self._s[3265]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3266]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3267]! } + public var Cache_ClearNone: String { return self._s[3268]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3269]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3270]! } + public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3271]!, self._r[3271]!, [_0]) + } + public var Passport_Identity_Country: String { return self._s[3272]! } + public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3273]!, self._r[3273]!, [_0]) + } + public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3274]!, self._r[3274]!, [_0]) + } + public var Exceptions_AddToExceptions: String { return self._s[3275]! } + public var AccessDenied_Settings: String { return self._s[3276]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3277]! } + public var Month_ShortMay: String { return self._s[3278]! } + public var Compose_NewGroup: String { return self._s[3279]! } + public var Group_Setup_TypePrivate: String { return self._s[3281]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3283]! } + public var Appearance_ThemeDayClassic: String { return self._s[3284]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3285]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3286]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3287]! } + public var Conversation_typing: String { return self._s[3289]! } + public var Paint_Masks: String { return self._s[3290]! } + public var Username_InvalidTaken: String { return self._s[3291]! } + public var Call_StatusNoAnswer: String { return self._s[3292]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3293]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3294]! } + public var Passport_Identity_Selfie: String { return self._s[3295]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3296]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3297]! } + public var Conversation_ClearSecretHistory: String { return self._s[3298]! } + public var PeopleNearby_Description: String { return self._s[3300]! } + public var NetworkUsageSettings_Title: String { return self._s[3301]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3303]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3287]!, self._r[3287]!, [_0]) + return formatWithArgumentRanges(self._s[3305]!, self._r[3305]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3288]!, self._r[3288]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3306]!, self._r[3306]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3290]! } - public var Map_LiveLocationTitle: String { return self._s[3291]! } - public var Login_InfoAvatarAdd: String { return self._s[3292]! } - public var Passport_Identity_FilesView: String { return self._s[3293]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3294]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3295]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3308]! } + public var Map_LiveLocationTitle: String { return self._s[3309]! } + public var Login_InfoAvatarAdd: String { return self._s[3310]! } + public var Passport_Identity_FilesView: String { return self._s[3311]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3312]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3313]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_0]) + return formatWithArgumentRanges(self._s[3314]!, self._r[3314]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3297]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3298]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3299]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3315]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3316]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3317]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3300]!, self._r[3300]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3301]! } - public var Tour_Title2: String { return self._s[3302]! } - public var Conversation_FileOpenIn: String { return self._s[3303]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3304]! } - public var Wallpaper_Set: String { return self._s[3305]! } - public var Passport_Identity_Translations: String { return self._s[3307]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3319]! } + public var Tour_Title2: String { return self._s[3320]! } + public var Conversation_FileOpenIn: String { return self._s[3321]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3322]! } + public var Wallpaper_Set: String { return self._s[3323]! } + public var Passport_Identity_Translations: String { return self._s[3325]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3308]!, self._r[3308]!, [_0]) + return formatWithArgumentRanges(self._s[3326]!, self._r[3326]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3309]! } + public var Channel_LeaveChannel: String { return self._s[3327]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3310]!, self._r[3310]!, [_1]) + return formatWithArgumentRanges(self._s[3328]!, self._r[3328]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3311]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3312]! } - public var Passport_Email_Delete: String { return self._s[3313]! } - public var Conversation_Mute: String { return self._s[3315]! } - public var Channel_AddBotAsAdmin: String { return self._s[3316]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3318]! } - public var Channel_Management_LabelOwner: String { return self._s[3320]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3329]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3330]! } + public var Passport_Email_Delete: String { return self._s[3331]! } + public var Conversation_Mute: String { return self._s[3333]! } + public var Channel_AddBotAsAdmin: String { return self._s[3334]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3336]! } + public var Channel_Management_LabelOwner: String { return self._s[3338]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3321]!, self._r[3321]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3339]!, self._r[3339]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3322]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3323]! } - public var Common_No: String { return self._s[3324]! } - public var Weekday_Sunday: String { return self._s[3325]! } - public var Notification_Reply: String { return self._s[3326]! } - public var Conversation_ViewMessage: String { return self._s[3327]! } + public var Calls_CallTabDescription: String { return self._s[3340]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3341]! } + public var Common_No: String { return self._s[3342]! } + public var Weekday_Sunday: String { return self._s[3343]! } + public var Notification_Reply: String { return self._s[3344]! } + public var Conversation_ViewMessage: String { return self._s[3345]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3328]!, self._r[3328]!, [_0]) + return formatWithArgumentRanges(self._s[3346]!, self._r[3346]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3329]!, self._r[3329]!, [_0]) + return formatWithArgumentRanges(self._s[3347]!, self._r[3347]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3330]! } - public var Message_PinnedDocumentMessage: String { return self._s[3331]! } - public var DialogList_TabTitle: String { return self._s[3333]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3334]! } - public var Passport_FieldEmail: String { return self._s[3335]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3336]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3337]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3338]! } - public var Privacy_Calls_P2P: String { return self._s[3339]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3348]! } + public var Message_PinnedDocumentMessage: String { return self._s[3349]! } + public var DialogList_TabTitle: String { return self._s[3351]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3352]! } + public var Passport_FieldEmail: String { return self._s[3353]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3354]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3355]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3356]! } + public var Privacy_Calls_P2P: String { return self._s[3357]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3341]!, self._r[3341]!, [_0]) - } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3342]! } - public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_1, _2]) - } - public var Stickers_ClearRecent: String { return self._s[3344]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3345]! } - public var Passport_InfoText: String { return self._s[3346]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3347]! } - public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3348]!, self._r[3348]!, [_0]) - } - public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3349]!, self._r[3349]!, [_1, _2, _3]) - } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3350]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3351]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3353]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3354]! } - public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3355]!, self._r[3355]!, [_1, _2]) - } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3357]! } - public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3359]!, self._r[3359]!, [_0]) } - public var DialogList_Unread: String { return self._s[3360]! } - public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3360]! } + public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3361]!, self._r[3361]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[3362]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3363]! } - public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3364]!, self._r[3364]!, [_0]) + public var Stickers_ClearRecent: String { return self._s[3362]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3363]! } + public var Passport_InfoText: String { return self._s[3364]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3365]! } + public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[3365]! } - public var SharedMedia_CategoryMedia: String { return self._s[3366]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3367]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3368]! } - public var Watch_ChatList_Compose: String { return self._s[3369]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3370]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[3371]! } - public var Watch_Microphone_Access: String { return self._s[3372]! } - public var Group_Setup_HistoryHeader: String { return self._s[3373]! } - public var Activity_UploadingPhoto: String { return self._s[3374]! } - public var Conversation_Edit: String { return self._s[3376]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[3377]! } - public var Login_TermsOfServiceDecline: String { return self._s[3378]! } - public var Message_PinnedContactMessage: String { return self._s[3379]! } + public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3367]!, self._r[3367]!, [_1, _2, _3]) + } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3368]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[3369]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[3371]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3372]! } + public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3373]!, self._r[3373]!, [_1, _2]) + } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3375]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3377]!, self._r[3377]!, [_0]) + } + public var DialogList_Unread: String { return self._s[3378]! } + public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3379]!, self._r[3379]!, [_1, _2]) + } + public var User_DeletedAccount: String { return self._s[3380]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3381]! } + public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3382]!, self._r[3382]!, [_0]) + } + public var UserInfo_NotificationsDefault: String { return self._s[3383]! } + public var SharedMedia_CategoryMedia: String { return self._s[3384]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3385]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3386]! } + public var Watch_ChatList_Compose: String { return self._s[3387]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3388]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[3389]! } + public var Watch_Microphone_Access: String { return self._s[3390]! } + public var Group_Setup_HistoryHeader: String { return self._s[3391]! } + public var Map_SetThisLocation: String { return self._s[3392]! } + public var Activity_UploadingPhoto: String { return self._s[3393]! } + public var Conversation_Edit: String { return self._s[3395]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[3396]! } + public var Login_TermsOfServiceDecline: String { return self._s[3397]! } + public var Message_PinnedContactMessage: String { return self._s[3398]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3380]!, self._r[3380]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3399]!, self._r[3399]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3381]!, self._r[3381]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[3382]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[3384]! } + public var Appearance_LargeEmoji: String { return self._s[3401]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[3403]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3385]!, self._r[3385]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[3386]! } - public var Message_PinnedPhotoMessage: String { return self._s[3387]! } - public var Passport_FieldPhone: String { return self._s[3388]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3389]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[3390]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[3392]! } - public var Conversation_Call: String { return self._s[3393]! } - public var Common_TakePhoto: String { return self._s[3395]! } - public var Channel_NotificationLoading: String { return self._s[3396]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[3405]! } + public var Message_PinnedPhotoMessage: String { return self._s[3406]! } + public var Passport_FieldPhone: String { return self._s[3407]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3408]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[3409]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[3411]! } + public var Conversation_Call: String { return self._s[3412]! } + public var Common_TakePhoto: String { return self._s[3414]! } + public var Channel_NotificationLoading: String { return self._s[3415]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3397]!, self._r[3397]!, [_0]) + return formatWithArgumentRanges(self._s[3416]!, self._r[3416]!, [_0]) } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3398]!, self._r[3398]!, [_1]) + return formatWithArgumentRanges(self._s[3417]!, self._r[3417]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[3399]! } + public var Permissions_SiriTitle_v0: String { return self._s[3418]! } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_0]) + return formatWithArgumentRanges(self._s[3419]!, self._r[3419]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[3401]! } - public var Common_edit: String { return self._s[3402]! } - public var PrivacySettings_AuthSessions: String { return self._s[3403]! } - public var Month_ShortJune: String { return self._s[3404]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3405]! } - public var Call_ReportSend: String { return self._s[3406]! } - public var Watch_LastSeen_JustNow: String { return self._s[3407]! } - public var Notifications_MessageNotifications: String { return self._s[3408]! } - public var WallpaperSearch_ColorGreen: String { return self._s[3409]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[3411]! } - public var Group_Status: String { return self._s[3412]! } + public var Channel_MessagePhotoRemoved: String { return self._s[3420]! } + public var Common_edit: String { return self._s[3421]! } + public var PrivacySettings_AuthSessions: String { return self._s[3422]! } + public var Month_ShortJune: String { return self._s[3423]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3424]! } + public var Call_ReportSend: String { return self._s[3425]! } + public var Watch_LastSeen_JustNow: String { return self._s[3426]! } + public var Notifications_MessageNotifications: String { return self._s[3427]! } + public var WallpaperSearch_ColorGreen: String { return self._s[3428]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[3430]! } + public var Group_Status: String { return self._s[3431]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3413]!, self._r[3413]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3432]!, self._r[3432]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[3414]! } - public var ShareMenu_ShareTo: String { return self._s[3415]! } - public var Conversation_Moderate_Ban: String { return self._s[3416]! } + public var TextFormat_AddLinkTitle: String { return self._s[3433]! } + public var ShareMenu_ShareTo: String { return self._s[3434]! } + public var Conversation_Moderate_Ban: String { return self._s[3435]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3417]!, self._r[3417]!, [_0]) + return formatWithArgumentRanges(self._s[3436]!, self._r[3436]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[3418]! } - public var Map_LiveLocationFor8Hours: String { return self._s[3419]! } + public var SharedMedia_ViewInChat: String { return self._s[3437]! } + public var Map_LiveLocationFor8Hours: String { return self._s[3438]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3420]!, self._r[3420]!, [_1]) + return formatWithArgumentRanges(self._s[3439]!, self._r[3439]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3421]!, self._r[3421]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3440]!, self._r[3440]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3423]!, self._r[3423]!, [_0]) + return formatWithArgumentRanges(self._s[3442]!, self._r[3442]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[3424]! } - public var Appearance_ReduceMotion: String { return self._s[3425]! } + public var Map_OpenInHereMaps: String { return self._s[3443]! } + public var Appearance_ReduceMotion: String { return self._s[3444]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3426]!, self._r[3426]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3445]!, self._r[3445]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[3427]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[3428]! } - public var PhotoEditor_Skip: String { return self._s[3429]! } - public func Map_ETAHours(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[3446]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[3447]! } + public var PhotoEditor_Skip: String { return self._s[3448]! } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + public func Notification_GameScoreSimple(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + public func AttachmentMenu_SendGif(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_ShortMinutes(_ value: Int32) -> String { + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) @@ -3897,323 +3924,325 @@ public final class PresentationStrings { let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Call_Seconds(_ value: Int32) -> String { + public func Conversation_StatusSubscribers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedContacts(_ value: Int32) -> String { + public func Map_ETAHours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideoMessages(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) } public func Contacts_ImportersCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + public func ForwardedPhotos(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) - } - public func UserCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_HoursAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Link(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Seconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) } public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) } - public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + public func MessageTimer_Days(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) } - public func Map_ETAMinutes(_ value: Int32) -> String { + public func MessageTimer_Weeks(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedVideos(_ value: Int32) -> String { + public func Conversation_StatusMembers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { + public func ForwardedVideoMessages(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSimple(_ value: Int32) -> String { + public func ForwardedGifs(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { + public func AttachmentMenu_SendItem(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_SelectedChats(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) } public func AttachmentMenu_SendVideo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + public func MessageTimer_ShortHours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareVideo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) } public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + public func SharedMedia_Photo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) + } + public func UserCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) } public func MuteExpires_Hours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortHours(_ value: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortDays(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Years(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusOnline(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedStickers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) @@ -4223,177 +4252,175 @@ public final class PresentationStrings { let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedAudios(_ value: Int32) -> String { + public func MuteExpires_Minutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { + public func StickerPack_StickerCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedPolls(_ value: Int32) -> String { + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Call_Minutes(_ value: Int32) -> String { + public func Passport_Scans(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedMessages(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) } public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) } public func MessagePoll_VotedCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedGifs(_ value: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func LastSeen_HoursAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_ShortSeconds(_ value: Int32) -> String { + public func Call_Seconds(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedStickers(_ value: Int32) -> String { + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, _0, _1) } - public func Passport_Scans(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _1, _2) } - public func ChatList_SelectedChats(_ value: Int32) -> String { + public func LastSeen_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + public func SharedMedia_File(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) } - public func MuteFor_Hours(_ value: Int32) -> String { + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notifications_Exceptions(_ value: Int32) -> String { + public func SharedMedia_Video(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + public func ForwardedLocations(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, _1, _2) } - public func ForwardedPhotos(_ value: Int32) -> String { + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, _1, _2) + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + public func MessageTimer_Months(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, _2, _1, _3) + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + public func Media_SharePhoto(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, _1, _2) + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) } - public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { + init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { self.primaryComponent = primaryComponent self.secondaryComponent = secondaryComponent self.groupingSeparator = groupingSeparator diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index cc034ea8c2..f931624977 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -388,6 +388,8 @@ public final class PresentationThemeChatList { public let messageDraftTextColor: UIColor public let checkmarkColor: UIColor public let pendingIndicatorColor: UIColor + public let failedFillColor: UIColor + public let failedForegroundColor: UIColor public let muteIconColor: UIColor public let unreadBadgeActiveBackgroundColor: UIColor public let unreadBadgeActiveTextColor: UIColor @@ -406,7 +408,7 @@ public final class PresentationThemeChatList { public let unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors public let onlineDotColor: UIColor - init(backgroundColor: UIColor, itemSeparatorColor: UIColor, itemBackgroundColor: UIColor, pinnedItemBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, itemSelectedBackgroundColor: UIColor, titleColor: UIColor, secretTitleColor: UIColor, dateTextColor: UIColor, authorNameColor: UIColor, messageTextColor: UIColor, messageDraftTextColor: UIColor, checkmarkColor: UIColor, pendingIndicatorColor: UIColor, muteIconColor: UIColor, unreadBadgeActiveBackgroundColor: UIColor, unreadBadgeActiveTextColor: UIColor, unreadBadgeInactiveBackgroundColor: UIColor, unreadBadgeInactiveTextColor: UIColor, pinnedBadgeColor: UIColor, pinnedSearchBarColor: UIColor, regularSearchBarColor: UIColor, sectionHeaderFillColor: UIColor, sectionHeaderTextColor: UIColor, searchBarKeyboardColor: PresentationThemeKeyboardColor, verifiedIconFillColor: UIColor, verifiedIconForegroundColor: UIColor, secretIconColor: UIColor, pinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors, unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors, onlineDotColor: UIColor) { + init(backgroundColor: UIColor, itemSeparatorColor: UIColor, itemBackgroundColor: UIColor, pinnedItemBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, itemSelectedBackgroundColor: UIColor, titleColor: UIColor, secretTitleColor: UIColor, dateTextColor: UIColor, authorNameColor: UIColor, messageTextColor: UIColor, messageDraftTextColor: UIColor, checkmarkColor: UIColor, pendingIndicatorColor: UIColor, failedFillColor: UIColor, failedForegroundColor: UIColor, muteIconColor: UIColor, unreadBadgeActiveBackgroundColor: UIColor, unreadBadgeActiveTextColor: UIColor, unreadBadgeInactiveBackgroundColor: UIColor, unreadBadgeInactiveTextColor: UIColor, pinnedBadgeColor: UIColor, pinnedSearchBarColor: UIColor, regularSearchBarColor: UIColor, sectionHeaderFillColor: UIColor, sectionHeaderTextColor: UIColor, searchBarKeyboardColor: PresentationThemeKeyboardColor, verifiedIconFillColor: UIColor, verifiedIconForegroundColor: UIColor, secretIconColor: UIColor, pinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors, unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors, onlineDotColor: UIColor) { self.backgroundColor = backgroundColor self.itemSeparatorColor = itemSeparatorColor self.itemBackgroundColor = itemBackgroundColor @@ -421,6 +423,8 @@ public final class PresentationThemeChatList { self.messageDraftTextColor = messageDraftTextColor self.checkmarkColor = checkmarkColor self.pendingIndicatorColor = pendingIndicatorColor + self.failedFillColor = failedFillColor + self.failedForegroundColor = failedForegroundColor self.muteIconColor = muteIconColor self.unreadBadgeActiveBackgroundColor = unreadBadgeActiveBackgroundColor self.unreadBadgeActiveTextColor = unreadBadgeActiveTextColor diff --git a/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift b/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift index 9f01cdbe9b..0ecd4c1518 100644 --- a/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift +++ b/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift @@ -79,6 +79,130 @@ func validateAnimationComposition(json: [AnyHashable: Any]) -> Bool { return true } +func experimentalConvertCompressedLottieToCombinedMp4(data: Data, size: CGSize) -> Signal { + return Signal({ subscriber in + let startTime = CACurrentMediaTime() + var drawingTime: Double = 0 + var appendingTime: Double = 0 + + let decompressedData = TGGUnzipData(data) + if let decompressedData = decompressedData, let json = (try? JSONSerialization.jsonObject(with: decompressedData, options: [])) as? [AnyHashable: Any] { + if validateAnimationComposition(json: json) { + let model = LOTComposition(json: json) + if let startFrame = model.startFrame?.int32Value, let endFrame = model.endFrame?.int32Value { + print("read at \(CACurrentMediaTime() - startTime)") + + var randomId: Int64 = 0 + arc4random_buf(&randomId, 8) + let path = NSTemporaryDirectory() + "\(randomId).mp4" + let url = URL(fileURLWithPath: path) + + let videoSize = CGSize(width: size.width, height: size.height * 2.0) + let scale = size.width / 512.0 + + if let assetWriter = try? AVAssetWriter(outputURL: url, fileType: AVFileType.mp4) { + let videoSettings: [String: AnyObject] = [AVVideoCodecKey : AVVideoCodecH264 as AnyObject, AVVideoWidthKey : videoSize.width as AnyObject, AVVideoHeightKey : videoSize.height as AnyObject] + + let assetWriterInput = AVAssetWriterInput(mediaType: AVMediaType.video, outputSettings: videoSettings) + let sourceBufferAttributes = [(kCVPixelBufferPixelFormatTypeKey as String): Int(kCVPixelFormatType_32ARGB), + (kCVPixelBufferWidthKey as String): Float(videoSize.width), + (kCVPixelBufferHeightKey as String): Float(videoSize.height)] as [String : Any] + let pixelBufferAdaptor = AVAssetWriterInputPixelBufferAdaptor(assetWriterInput: assetWriterInput, sourcePixelBufferAttributes: sourceBufferAttributes) + + assetWriter.add(assetWriterInput) + + if assetWriter.startWriting() { + print("startedWriting at \(CACurrentMediaTime() - startTime)") + assetWriter.startSession(atSourceTime: kCMTimeZero) + + var currentFrame: Int32 = 0 + let writeQueue = DispatchQueue(label: "assetWriterQueue") + writeQueue.async { + let container = LOTAnimationLayerContainer(model: model, size: size) + + let singleContext = DrawingContext(size: size, scale: 1.0, clear: true) + let context = DrawingContext(size: videoSize, scale: 1.0, clear: false) + + let fps: Int32 = model.framerate?.int32Value ?? 30 + let frameDuration = CMTimeMake(1, fps) + + assetWriterInput.requestMediaDataWhenReady(on: writeQueue) { + while assetWriterInput.isReadyForMoreMediaData && startFrame + currentFrame < endFrame { + let lastFrameTime = CMTimeMake(Int64(currentFrame - startFrame), fps) + let presentationTime = currentFrame == 0 ? lastFrameTime : CMTimeAdd(lastFrameTime, frameDuration) + + let drawStartTime = CACurrentMediaTime() + singleContext.withContext { context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.saveGState() + context.scaleBy(x: scale, y: scale) + container?.renderFrame(startFrame + currentFrame, in: context) + context.restoreGState() + } + + if let image = singleContext.generateImage()?.cgImage { + + let maskDecode = [ + CGFloat(1.0), CGFloat(1.0), + CGFloat(1.0), CGFloat(1.0), + CGFloat(1.0), CGFloat(1.0), + CGFloat(1.0), CGFloat(1.0)] + + let maskImage = CGImage(width: image.width, height: image.height, bitsPerComponent: image.bitsPerComponent, bitsPerPixel: image.bitsPerPixel, bytesPerRow: image.bytesPerRow, space: image.colorSpace!, bitmapInfo: image.bitmapInfo, provider: image.dataProvider!, decode: maskDecode, shouldInterpolate: image.shouldInterpolate, intent: image.renderingIntent)! + + context.withFlippedContext { context in + context.setFillColor(UIColor.white.cgColor) + context.fill(CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: videoSize)) + context.draw(image, in: CGRect(origin: CGPoint(x: 0.0, y: size.height), size: size)) + context.draw(maskImage, in: CGRect(origin: CGPoint(), size: size)) + } + drawingTime += CACurrentMediaTime() - drawStartTime + + let appendStartTime = CACurrentMediaTime() + if let image = context.generateImage() { + if let pixelBufferPool = pixelBufferAdaptor.pixelBufferPool { + let pixelBufferPointer = UnsafeMutablePointer.allocate(capacity: 1) + let status = CVPixelBufferPoolCreatePixelBuffer(kCFAllocatorDefault, pixelBufferPool, pixelBufferPointer) + if let pixelBuffer = pixelBufferPointer.pointee, status == 0 { + fillPixelBufferFromImage(image, pixelBuffer: pixelBuffer) + + pixelBufferAdaptor.append(pixelBuffer, withPresentationTime: presentationTime) + pixelBufferPointer.deinitialize(count: 1) + } else { + break + } + + pixelBufferPointer.deallocate() + } else { + break + } + } + appendingTime += CACurrentMediaTime() - appendStartTime + } + currentFrame += 1 + } + + if startFrame + currentFrame == endFrame { + assetWriterInput.markAsFinished() + assetWriter.finishWriting { + subscriber.putNext(path) + subscriber.putCompletion() + print("animation render time \(CACurrentMediaTime() - startTime)") + print("of which drawing time \(drawingTime)") + print("of which appending time \(appendingTime)") + } + } + } + } + } + } + } + } + } + return EmptyDisposable + }) +} + func convertCompressedLottieToCombinedMp4(data: Data, size: CGSize) -> Signal { return Signal({ subscriber in let startTime = CACurrentMediaTime() @@ -131,6 +255,7 @@ func convertCompressedLottieToCombinedMp4(data: Data, size: CGSize) -> Signal Signal take(1) |> deliverOnMainQueue).start(next: { sharedApplicationContext in - sharedApplicationContext.wakeupManager.allowBackgroundTimeExtension(timeout: 4.0) + var extendNow = false + if #available(iOS 9.0, *) { + if !ProcessInfo.processInfo.isLowPowerModeEnabled { + extendNow = true + } + } + sharedApplicationContext.wakeupManager.allowBackgroundTimeExtension(timeout: 4.0, extendNow: extendNow) }) self.isInForegroundValue = false diff --git a/submodules/TelegramUI/TelegramUI/AvatarGalleryController.swift b/submodules/TelegramUI/TelegramUI/AvatarGalleryController.swift index 8138928427..04e514f71e 100644 --- a/submodules/TelegramUI/TelegramUI/AvatarGalleryController.swift +++ b/submodules/TelegramUI/TelegramUI/AvatarGalleryController.swift @@ -20,13 +20,13 @@ public struct ImageRepresentationWithReference: Equatable { enum AvatarGalleryEntry: Equatable { case topImage([ImageRepresentationWithReference], GalleryItemIndexData?) - case image(TelegramMediaImageReference?, [ImageRepresentationWithReference], Peer, Int32, GalleryItemIndexData?) + case image(TelegramMediaImageReference?, [ImageRepresentationWithReference], Peer, Int32, GalleryItemIndexData?, MessageId?) var representations: [ImageRepresentationWithReference] { switch self { case let .topImage(representations, _): return representations - case let .image(_, representations, _, _, _): + case let .image(_, representations, _, _, _, _): return representations } } @@ -35,7 +35,7 @@ enum AvatarGalleryEntry: Equatable { switch self { case let .topImage(_, indexData): return indexData - case let .image(_, _, _, _, indexData): + case let .image(_, _, _, _, indexData, _): return indexData } } @@ -48,8 +48,8 @@ enum AvatarGalleryEntry: Equatable { } else { return false } - case let .image(lhsImageReference, lhsRepresentations, lhsPeer, lhsDate, lhsIndexData): - if case let .image(rhsImageReference, rhsRepresentations, rhsPeer, rhsDate, rhsIndexData) = rhs, lhsImageReference == rhsImageReference, lhsRepresentations == rhsRepresentations, arePeersEqual(lhsPeer, rhsPeer), lhsDate == rhsDate, lhsIndexData == rhsIndexData { + case let .image(lhsImageReference, lhsRepresentations, lhsPeer, lhsDate, lhsIndexData, lhsMessageId): + if case let .image(rhsImageReference, rhsRepresentations, rhsPeer, rhsDate, rhsIndexData, rhsMessageId) = rhs, lhsImageReference == rhsImageReference, lhsRepresentations == rhsRepresentations, arePeersEqual(lhsPeer, rhsPeer), lhsDate == rhsDate, lhsIndexData == rhsIndexData, lhsMessageId == rhsMessageId { return true } else { return false @@ -77,7 +77,8 @@ private func initialAvatarGalleryEntries(peer: Peer) -> [AvatarGalleryEntry]{ } func fetchedAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<[AvatarGalleryEntry], NoError> { - return requestPeerPhotos(account: account, peerId: peer.id) |> map { photos -> [AvatarGalleryEntry] in + return requestPeerPhotos(account: account, peerId: peer.id) + |> map { photos -> [AvatarGalleryEntry] in var result: [AvatarGalleryEntry] = [] let initialEntries = initialAvatarGalleryEntries(peer: peer) if photos.isEmpty { @@ -87,9 +88,9 @@ func fetchedAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<[Avatar for photo in photos { let indexData = GalleryItemIndexData(position: index, totalCount: Int32(photos.count)) if result.isEmpty, let first = initialEntries.first { - result.append(.image(photo.image.reference, first.representations, peer, photo.date, indexData)) + result.append(.image(photo.image.reference, first.representations, peer, photo.date, indexData, photo.messageId)) } else { - result.append(.image(photo.image.reference, photo.image.representations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.standalone(resource: $0.resource)) }), peer, photo.date, indexData)) + result.append(.image(photo.image.reference, photo.image.representations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.standalone(resource: $0.resource)) }), peer, photo.date, indexData, photo.messageId)) } index += 1 } @@ -173,7 +174,22 @@ class AvatarGalleryController: ViewController { strongSelf.entries = entries strongSelf.centralEntryIndex = 0 if strongSelf.isViewLoaded { - strongSelf.galleryNode.pager.replaceItems(strongSelf.entries.map({ entry in PeerAvatarImageGalleryItem(context: context, peer: peer, presentationData: presentationData, entry: entry, delete: strongSelf.peer.id == strongSelf.context.account.peerId ? { + let canDelete: Bool + if strongSelf.peer.id == strongSelf.context.account.peerId { + canDelete = true + } else if let group = strongSelf.peer as? TelegramGroup { + switch group.role { + case .creator, .admin: + canDelete = true + case .member: + canDelete = false + } + } else if let channel = strongSelf.peer as? TelegramChannel { + canDelete = channel.hasPermission(.changeInfo) + } else { + canDelete = false + } + strongSelf.galleryNode.pager.replaceItems(strongSelf.entries.map({ entry in PeerAvatarImageGalleryItem(context: context, peer: peer, presentationData: presentationData, entry: entry, delete: canDelete ? { self?.deleteEntry(entry) } : nil) }), centralItemIndex: 0, keepFirst: true) @@ -308,8 +324,24 @@ class AvatarGalleryController: ViewController { self?.presentingViewController?.dismiss(animated: false, completion: nil) } + let canDelete: Bool + if self.peer.id == self.context.account.peerId { + canDelete = true + } else if let group = self.peer as? TelegramGroup { + switch group.role { + case .creator, .admin: + canDelete = true + case .member: + canDelete = false + } + } else if let channel = self.peer as? TelegramChannel { + canDelete = channel.hasPermission(.changeInfo) + } else { + canDelete = false + } + let presentationData = self.presentationData - self.galleryNode.pager.replaceItems(self.entries.map({ entry in PeerAvatarImageGalleryItem(context: self.context, peer: peer, presentationData: presentationData, entry: entry, delete: self.peer.id == self.context.account.peerId ? { [weak self] in + self.galleryNode.pager.replaceItems(self.entries.map({ entry in PeerAvatarImageGalleryItem(context: self.context, peer: peer, presentationData: presentationData, entry: entry, delete: canDelete ? { [weak self] in self?.deleteEntry(entry) } : nil) }), centralItemIndex: self.centralEntryIndex) @@ -393,17 +425,44 @@ class AvatarGalleryController: ViewController { private func deleteEntry(_ entry: AvatarGalleryEntry) { switch entry { case .topImage: - break - case let .image(reference, _, _, _, _): - if let reference = reference { - let _ = removeAccountPhoto(network: self.context.account.network, reference: reference).start() - } - if entry == self.entries.first { - self.dismiss(forceAway: true) + if self.peer.id == self.context.account.peerId { } else { - if let index = self.entries.index(of: entry) { - self.entries.remove(at: index) - self.galleryNode.pager.transaction(GalleryPagerTransaction(deleteItems: [index], insertItems: [], updateItems: [], focusOnItem: index - 1)) + if entry == self.entries.first { + let _ = updatePeerPhoto(postbox: self.context.account.postbox, network: self.context.account.network, stateManager: self.context.account.stateManager, accountPeerId: self.context.account.peerId, peerId: self.peer.id, photo: nil, mapResourceToAvatarSizes: { _, _ in .single([:]) }).start() + self.dismiss(forceAway: true) + } else { + if let index = self.entries.index(of: entry) { + self.entries.remove(at: index) + self.galleryNode.pager.transaction(GalleryPagerTransaction(deleteItems: [index], insertItems: [], updateItems: [], focusOnItem: index - 1)) + } + } + } + case let .image(reference, _, _, _, _, messageId): + if self.peer.id == self.context.account.peerId { + if let reference = reference { + let _ = removeAccountPhoto(network: self.context.account.network, reference: reference).start() + } + if entry == self.entries.first { + self.dismiss(forceAway: true) + } else { + if let index = self.entries.index(of: entry) { + self.entries.remove(at: index) + self.galleryNode.pager.transaction(GalleryPagerTransaction(deleteItems: [index], insertItems: [], updateItems: [], focusOnItem: index - 1)) + } + } + } else { + if let messageId = messageId { + let _ = deleteMessagesInteractively(postbox: self.context.account.postbox, messageIds: [messageId], type: .forEveryone).start() + } + + if entry == self.entries.first { + let _ = updatePeerPhoto(postbox: self.context.account.postbox, network: self.context.account.network, stateManager: self.context.account.stateManager, accountPeerId: self.context.account.peerId, peerId: self.peer.id, photo: nil, mapResourceToAvatarSizes: { _, _ in .single([:]) }).start() + self.dismiss(forceAway: true) + } else { + if let index = self.entries.index(of: entry) { + self.entries.remove(at: index) + self.galleryNode.pager.transaction(GalleryPagerTransaction(deleteItems: [index], insertItems: [], updateItems: [], focusOnItem: index - 1)) + } } } } diff --git a/submodules/TelegramUI/TelegramUI/AvatarGalleryItemFooterContentNode.swift b/submodules/TelegramUI/TelegramUI/AvatarGalleryItemFooterContentNode.swift index 3d170e75f8..af06ebf138 100644 --- a/submodules/TelegramUI/TelegramUI/AvatarGalleryItemFooterContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/AvatarGalleryItemFooterContentNode.swift @@ -77,7 +77,7 @@ final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode { var nameText: String? var dateText: String? switch entry { - case let .image(_, _, peer, date, _): + case let .image(_, _, peer, date, _, _): nameText = peer.displayTitle dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: date) default: diff --git a/submodules/TelegramUI/TelegramUI/CallListCallItem.swift b/submodules/TelegramUI/TelegramUI/CallListCallItem.swift index d6a7e1836f..a533feca1e 100644 --- a/submodules/TelegramUI/TelegramUI/CallListCallItem.swift +++ b/submodules/TelegramUI/TelegramUI/CallListCallItem.swift @@ -24,7 +24,7 @@ private func callListNeighbors(item: ListViewItem, topItem: ListViewItem?, botto if let topItem = topItem { if let item = item as? ItemListItem, let topItem = topItem as? ItemListItem { if topItem.sectionId != item.sectionId { - topNeighbor = .otherSection(requestsNoInset: topItem.requestsNoInset) + topNeighbor = .otherSection(topItem.requestsNoInset ? .none : .full) } else { topNeighbor = .sameSection(alwaysPlain: topItem.isAlwaysPlain) } @@ -32,7 +32,7 @@ private func callListNeighbors(item: ListViewItem, topItem: ListViewItem?, botto if item is CallListCallItem && topItem is CallListCallItem { topNeighbor = .sameSection(alwaysPlain: false) } else { - topNeighbor = .otherSection(requestsNoInset: false) + topNeighbor = .otherSection(.full) } } } else { @@ -43,7 +43,7 @@ private func callListNeighbors(item: ListViewItem, topItem: ListViewItem?, botto if let bottomItem = bottomItem { if let item = item as? ItemListItem, let bottomItem = bottomItem as? ItemListItem { if bottomItem.sectionId != item.sectionId { - bottomNeighbor = .otherSection(requestsNoInset: bottomItem.requestsNoInset) + bottomNeighbor = .otherSection(bottomItem.requestsNoInset ? .none : .full) } else { bottomNeighbor = .sameSection(alwaysPlain: bottomItem.isAlwaysPlain) } @@ -51,7 +51,7 @@ private func callListNeighbors(item: ListViewItem, topItem: ListViewItem?, botto if item is CallListCallItem && bottomItem is CallListCallItem { bottomNeighbor = .sameSection(alwaysPlain: false) } else { - bottomNeighbor = .otherSection(requestsNoInset: false) + bottomNeighbor = .otherSection(.full) } } } else { diff --git a/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift b/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift index 202247befc..8dd5db62d1 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift @@ -257,7 +257,7 @@ private enum ChannelAdminEntry: ItemListNodeEntry { func item(_ arguments: ChannelAdminControllerArguments) -> ListViewItem { switch self { case let .info(theme, strings, dateTimeFormat, peer, presence): - return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, cachedData: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true), editingNameUpdated: { _ in + return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, cachedData: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true, withExtendedBottomInset: false), editingNameUpdated: { _ in }, avatarTapped: { }) case let .rightsTitle(theme, text): @@ -465,11 +465,11 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff)) } - if let admin = admin as? TelegramUser, admin.botInfo == nil && channel.flags.contains(.isCreator) && areAllAdminRightsEnabled(currentRightsFlags, group: isGroup) { + if let admin = admin as? TelegramUser, admin.botInfo == nil && !admin.isDeleted && channel.flags.contains(.isCreator) && areAllAdminRightsEnabled(currentRightsFlags, group: isGroup) { entries.append(.transfer(presentationData.theme, isGroup ? presentationData.strings.Group_EditAdmin_TransferOwnership : presentationData.strings.Channel_EditAdmin_TransferOwnership)) } - if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty { + if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty && admin.id != accountPeerId { var canDismiss = false if channel.flags.contains(.isCreator) { canDismiss = true @@ -535,11 +535,11 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff)) } - if let admin = admin as? TelegramUser, admin.botInfo == nil && group.role == .creator && areAllAdminRightsEnabled(currentRightsFlags, group: true) { + if let admin = admin as? TelegramUser, admin.botInfo == nil && !admin.isDeleted && group.role == .creator && areAllAdminRightsEnabled(currentRightsFlags, group: true) { entries.append(.transfer(presentationData.theme, presentationData.strings.Group_EditAdmin_TransferOwnership)) } - if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty { + if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty && admin.id != accountPeerId { entries.append(.dismiss(presentationData.theme, presentationData.strings.Channel_Moderator_AccessLevelRevoke)) } } @@ -589,47 +589,21 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi return } - var signal: Signal = .complete() - if let channel = peer as? TelegramChannel { - signal = updateChannelOwnership(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, channelId: channel.id, memberId: adminId, password: nil) - } else if let _ = peer as? TelegramGroup { - signal = convertGroupToSupergroup(account: context.account, peerId: peerId) - |> map(Optional.init) - |> mapError { _ in ChannelOwnershipTransferError.generic } - |> mapToSignal { upgradedPeerId -> Signal in - guard let upgradedPeerId = upgradedPeerId else { - return .fail(.generic) - } - upgradedToSupergroupImpl(upgradedPeerId, {}) - - return updateChannelOwnership(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, channelId: upgradedPeerId, memberId: adminId, password: nil) - } - } - - transferOwnershipDisposable.set((signal |> deliverOnMainQueue).start(error: { error in - let currentPeerId = actualPeerId.with { $0 } - let channel: Signal - if currentPeerId == peerId { - channel = .single(peer) - } else { - channel = context.account.postbox.transaction { transaction -> Peer? in - return transaction.getPeer(currentPeerId) - } - } - - let _ = (channel |> deliverOnMainQueue).start(next: { channel in - guard let channel = channel as? TelegramChannel else { - return - } - - let controller = channelOwnershipTransferController(context: context, channel: channel, member: member, initialError: error, present: { c, a in - presentControllerImpl?(c, a) - }, completion: { + transferOwnershipDisposable.set((checkOwnershipTranfserAvailability(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, memberId: adminId) |> deliverOnMainQueue).start(error: { error in + let controller = channelOwnershipTransferController(context: context, peer: peer, member: member, initialError: error, present: { c, a in + presentControllerImpl?(c, a) + }, completion: { upgradedPeerId in + if let upgradedPeerId = upgradedPeerId { + upgradedToSupergroupImpl(upgradedPeerId, { + dismissImpl?() + transferedOwnership(member.id) + }) + } else { dismissImpl?() transferedOwnership(member.id) - }) - presentControllerImpl?(controller, nil) + } }) + presentControllerImpl?(controller, nil) })) }) }, dismissAdmin: { diff --git a/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift b/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift index a390a9776c..f64bf7025f 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift @@ -505,7 +505,7 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa guard let peer = peer, let user = user else { return } - presentControllerImpl?(UndoOverlayController(context: context, content: .succeed(text: presentationData.strings.Channel_OwnershipTransfer_TransferCompleted(peer.displayTitle, user.displayTitle).0), elevatedLayout: false, action: { _ in }), nil) + presentControllerImpl?(UndoOverlayController(context: context, content: .succeed(text: presentationData.strings.Channel_OwnershipTransfer_TransferCompleted(user.displayTitle, peer.displayTitle).0), elevatedLayout: false, action: { _ in }), nil) }) } diff --git a/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift b/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift index d400c5b000..b128affe53 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift @@ -215,7 +215,7 @@ private enum ChannelBannedMemberEntry: ItemListNodeEntry { func item(_ arguments: ChannelBannedMemberControllerArguments) -> ListViewItem { switch self { case let .info(theme, strings, dateTimeFormat, peer, presence): - return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, cachedData: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true), editingNameUpdated: { _ in + return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, cachedData: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true, withExtendedBottomInset: false), editingNameUpdated: { _ in }, avatarTapped: { }) case let .rightsHeader(theme, text): diff --git a/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift b/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift index a473fc05d3..a8536d341f 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift @@ -825,6 +825,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod updateActivity(true) let foundGroupMembers: Signal<[RenderedChannelParticipant], NoError> let foundMembers: Signal<[RenderedChannelParticipant], NoError> + let foundRemotePeers: Signal<([FoundPeer], [FoundPeer]), NoError> switch mode { case .searchMembers, .banAndPromoteActions: @@ -884,8 +885,15 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod foundMembers = .single([]) } - return combineLatest(foundGroupMembers, foundMembers, themeAndStringsPromise.get(), statePromise.get()) - |> map { foundGroupMembers, foundMembers, themeAndStrings, state -> [ChannelMembersSearchEntry]? in + if mode == .banAndPromoteActions || mode == .inviteActions { + foundRemotePeers = .single(([], [])) |> then(searchPeers(account: context.account, query: query) + |> delay(0.2, queue: Queue.concurrentDefaultQueue())) + } else { + foundRemotePeers = .single(([], [])) + } + + return combineLatest(foundGroupMembers, foundMembers, foundRemotePeers, themeAndStringsPromise.get(), statePromise.get()) + |> map { foundGroupMembers, foundMembers, foundRemotePeers, themeAndStrings, state -> [ChannelMembersSearchEntry]? in var entries: [ChannelMembersSearchEntry] = [] var existingPeerIds = Set() @@ -1065,6 +1073,24 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } } + for foundPeer in foundRemotePeers.0 { + let peer = foundPeer.peer + if !existingPeerIds.contains(peer.id) && peer is TelegramUser { + existingPeerIds.insert(peer.id) + entries.append(ChannelMembersSearchEntry(index: index, content: .peer(peer), section: .global, dateTimeFormat: themeAndStrings.4)) + index += 1 + } + } + + for foundPeer in foundRemotePeers.1 { + let peer = foundPeer.peer + if !existingPeerIds.contains(peer.id) && peer is TelegramUser { + existingPeerIds.insert(peer.id) + entries.append(ChannelMembersSearchEntry(index: index, content: .peer(peer), section: .global, dateTimeFormat: themeAndStrings.4)) + index += 1 + } + } + return entries } } else { diff --git a/submodules/TelegramUI/TelegramUI/ChannelOwnershipTransferController.swift b/submodules/TelegramUI/TelegramUI/ChannelOwnershipTransferController.swift index a84896f498..695da625e1 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelOwnershipTransferController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelOwnershipTransferController.swift @@ -397,7 +397,7 @@ private final class ChannelOwnershipTransferAlertContentNode: AlertContentNode { } } -private func commitChannelOwnershipTransferController(context: AccountContext, channel: TelegramChannel, member: TelegramUser, completion: @escaping () -> Void) -> ViewController { +private func commitChannelOwnershipTransferController(context: AccountContext, peer: Peer, member: TelegramUser, completion: @escaping (PeerId?) -> Void) -> ViewController { let presentationData = context.sharedContext.currentPresentationData.with { $0 } var dismissImpl: (() -> Void)? @@ -411,6 +411,10 @@ private func commitChannelOwnershipTransferController(context: AccountContext, c proceedImpl?() })]) + contentNode.complete = { + proceedImpl?() + } + let controller = AlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), contentNode: contentNode) let presentationDataDisposable = context.sharedContext.presentationData.start(next: { [weak controller, weak contentNode] presentationData in controller?.theme = AlertControllerTheme(presentationTheme: presentationData.theme) @@ -429,29 +433,59 @@ private func commitChannelOwnershipTransferController(context: AccountContext, c return } contentNode.updateIsChecking(true) - disposable.set((updateChannelOwnership(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, channelId: channel.id, memberId: member.id, password: contentNode.password) |> deliverOnMainQueue).start(error: { [weak contentNode] error in + + let signal: Signal + if let peer = peer as? TelegramChannel { + signal = updateChannelOwnership(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, channelId: peer.id, memberId: member.id, password: contentNode.password) |> mapToSignal { _ in + return .complete() + } + |> then(.single(nil)) + } else if let peer = peer as? TelegramGroup { + signal = convertGroupToSupergroup(account: context.account, peerId: peer.id) + |> map(Optional.init) + |> mapError { _ in ChannelOwnershipTransferError.generic } + |> deliverOnMainQueue + |> mapToSignal { upgradedPeerId -> Signal in + guard let upgradedPeerId = upgradedPeerId else { + return .fail(.generic) + } + return updateChannelOwnership(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, channelId: upgradedPeerId, memberId: member.id, password: contentNode.password) |> mapToSignal { _ in + return .complete() + } + |> then(.single(upgradedPeerId)) + } + } else { + signal = .never() + } + + disposable.set((signal |> deliverOnMainQueue).start(next: { upgradedPeerId in + dismissImpl?() + completion(upgradedPeerId) + }, error: { [weak contentNode] error in contentNode?.updateIsChecking(false) contentNode?.animateError() - }, completed: { - dismissImpl?() - completion() })) } return controller } -private func confirmChannelOwnershipTransferController(context: AccountContext, channel: TelegramChannel, member: TelegramUser, present: @escaping (ViewController, Any?) -> Void, completion: @escaping () -> Void) -> ViewController { +private func confirmChannelOwnershipTransferController(context: AccountContext, peer: Peer, member: TelegramUser, present: @escaping (ViewController, Any?) -> Void, completion: @escaping (PeerId?) -> Void) -> ViewController { let presentationData = context.sharedContext.currentPresentationData.with { $0 } let theme = AlertControllerTheme(presentationTheme: presentationData.theme) + var isGroup = true + if let channel = peer as? TelegramChannel, case .broadcast = channel.info { + isGroup = false + } + var title: String var text: String - if case .group = channel.info { + if isGroup { title = presentationData.strings.Group_OwnershipTransfer_Title - text = presentationData.strings.Group_OwnershipTransfer_DescriptionInfo(channel.displayTitle, member.displayTitle).0 + text = presentationData.strings.Group_OwnershipTransfer_DescriptionInfo(peer.displayTitle, member.displayTitle).0 } else { title = presentationData.strings.Channel_OwnershipTransfer_Title - text = presentationData.strings.Channel_OwnershipTransfer_DescriptionInfo(channel.displayTitle, member.displayTitle).0 + text = presentationData.strings.Channel_OwnershipTransfer_DescriptionInfo(peer.displayTitle, member.displayTitle).0 } let attributedTitle = NSAttributedString(string: title, font: Font.medium(17.0), textColor: theme.primaryColor, paragraphAlignment: .center) @@ -463,7 +497,7 @@ private func confirmChannelOwnershipTransferController(context: AccountContext, let controller = richTextAlertController(context: context, title: attributedTitle, text: attributedText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Channel_OwnershipTransfer_ChangeOwner, action: { dismissImpl?() - present(commitChannelOwnershipTransferController(context: context, channel: channel, member: member, completion: completion), nil) + present(commitChannelOwnershipTransferController(context: context, peer: peer, member: member, completion: completion), nil) }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Cancel, action: { dismissImpl?() })], actionLayout: .vertical) @@ -473,16 +507,16 @@ private func confirmChannelOwnershipTransferController(context: AccountContext, return controller } -func channelOwnershipTransferController(context: AccountContext, channel: TelegramChannel, member: TelegramUser, initialError: ChannelOwnershipTransferError, present: @escaping (ViewController, Any?) -> Void, completion: @escaping () -> Void) -> ViewController { +func channelOwnershipTransferController(context: AccountContext, peer: Peer, member: TelegramUser, initialError: ChannelOwnershipTransferError, present: @escaping (ViewController, Any?) -> Void, completion: @escaping (PeerId?) -> Void) -> ViewController { let presentationData = context.sharedContext.currentPresentationData.with { $0 } let theme = AlertControllerTheme(presentationTheme: presentationData.theme) var title: NSAttributedString? = NSAttributedString(string: presentationData.strings.OwnershipTransfer_SecurityCheck, font: Font.medium(17.0), textColor: theme.primaryColor, paragraphAlignment: .center) var text = presentationData.strings.OwnershipTransfer_SecurityRequirements - var isGroup = false - if case .group = channel.info { - isGroup = true + var isGroup = true + if let channel = peer as? TelegramChannel, case .broadcast = channel.info { + isGroup = false } var dismissImpl: (() -> Void)? @@ -490,7 +524,7 @@ func channelOwnershipTransferController(context: AccountContext, channel: Telegr switch initialError { case .requestPassword: - return confirmChannelOwnershipTransferController(context: context, channel: channel, member: member, present: present, completion: completion) + return confirmChannelOwnershipTransferController(context: context, peer: peer, member: member, present: present, completion: completion) case .twoStepAuthTooFresh, .authSessionTooFresh: text = text + presentationData.strings.OwnershipTransfer_ComeBackLater actions = [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})] diff --git a/submodules/TelegramUI/TelegramUI/ChannelVisibilityController.swift b/submodules/TelegramUI/TelegramUI/ChannelVisibilityController.swift index b85c9fd5c9..8d79e5158d 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelVisibilityController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelVisibilityController.swift @@ -19,8 +19,10 @@ private final class ChannelVisibilityControllerArguments { let copyPrivateLink: () -> Void let revokePrivateLink: () -> Void let sharePrivateLink: () -> Void + let setLocation: () -> Void + let removeLocation: () -> Void - init(account: Account, updateCurrentType: @escaping (CurrentChannelType) -> Void, updatePublicLinkText: @escaping (String?, String) -> Void, scrollToPublicLinkText: @escaping () -> Void, displayPrivateLinkMenu: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, revokePeerId: @escaping (PeerId) -> Void, copyPrivateLink: @escaping () -> Void, revokePrivateLink: @escaping () -> Void, sharePrivateLink: @escaping () -> Void) { + init(account: Account, updateCurrentType: @escaping (CurrentChannelType) -> Void, updatePublicLinkText: @escaping (String?, String) -> Void, scrollToPublicLinkText: @escaping () -> Void, displayPrivateLinkMenu: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, revokePeerId: @escaping (PeerId) -> Void, copyPrivateLink: @escaping () -> Void, revokePrivateLink: @escaping () -> Void, sharePrivateLink: @escaping () -> Void, setLocation: @escaping () -> Void, removeLocation: @escaping () -> Void) { self.account = account self.updateCurrentType = updateCurrentType self.updatePublicLinkText = updatePublicLinkText @@ -31,6 +33,8 @@ private final class ChannelVisibilityControllerArguments { self.copyPrivateLink = copyPrivateLink self.revokePrivateLink = revokePrivateLink self.sharePrivateLink = sharePrivateLink + self.setLocation = setLocation + self.removeLocation = removeLocation } } @@ -38,6 +42,7 @@ private enum ChannelVisibilitySection: Int32 { case type case link case linkActions + case location } private enum ChannelVisibilityEntryTag: ItemListItemTag { @@ -72,6 +77,12 @@ private enum ChannelVisibilityEntry: ItemListNodeEntry { case existingLinksInfo(PresentationTheme, String) case existingLinkPeerItem(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, Peer, ItemListPeerItemEditing, Bool) + case locationHeader(PresentationTheme, String) + case location(PresentationTheme, PeerGeoLocation) + case locationSetup(PresentationTheme, String) + case locationRemove(PresentationTheme, String) + case locationInfo(PresentationTheme, String) + var section: ItemListSectionId { switch self { case .typeHeader, .typePublic, .typePrivate, .typeInfo: @@ -82,6 +93,8 @@ private enum ChannelVisibilityEntry: ItemListNodeEntry { return ChannelVisibilitySection.linkActions.rawValue case .existingLinksInfo, .existingLinkPeerItem: return ChannelVisibilitySection.link.rawValue + case .locationHeader, .location, .locationSetup, .locationRemove, .locationInfo: + return ChannelVisibilitySection.location.rawValue } } @@ -95,7 +108,6 @@ private enum ChannelVisibilityEntry: ItemListNodeEntry { return 2 case .typeInfo: return 3 - case .publicLinkAvailability: return 4 case .privateLink: @@ -118,6 +130,16 @@ private enum ChannelVisibilityEntry: ItemListNodeEntry { return 13 case let .existingLinkPeerItem(index, _, _, _, _, _, _, _): return 14 + index + case .locationHeader: + return 1000 + case .location: + return 1001 + case .locationSetup: + return 1002 + case .locationRemove: + return 1003 + case .locationInfo: + return 1004 } } @@ -237,6 +259,36 @@ private enum ChannelVisibilityEntry: ItemListNodeEntry { } else { return false } + case let .locationHeader(lhsTheme, lhsTitle): + if case let .locationHeader(rhsTheme, rhsTitle) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle { + return true + } else { + return false + } + case let .location(lhsTheme, lhsLocation): + if case let .location(rhsTheme, rhsLocation) = rhs, lhsTheme === rhsTheme, lhsLocation == rhsLocation { + return true + } else { + return false + } + case let .locationSetup(lhsTheme, lhsTitle): + if case let .locationSetup(rhsTheme, rhsTitle) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle { + return true + } else { + return false + } + case let .locationRemove(lhsTheme, lhsTitle): + if case let .locationRemove(rhsTheme, rhsTitle) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle { + return true + } else { + return false + } + case let .locationInfo(lhsTheme, lhsTitle): + if case let .locationInfo(rhsTheme, rhsTitle) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle { + return true + } else { + return false + } } } @@ -323,6 +375,21 @@ private enum ChannelVisibilityEntry: ItemListNodeEntry { }, removePeer: { peerId in arguments.revokePeerId(peerId) }) + case let .locationHeader(theme, title): + return ItemListSectionHeaderItem(theme: theme, text: title, sectionId: self.section) + case let .location(theme, location): + let imageSignal = chatMapSnapshotImage(account: arguments.account, resource: MapSnapshotMediaResource(latitude: location.latitude, longitude: location.longitude, width: 90, height: 90)) + return ItemListAddressItem(theme: theme, label: "", text: location.address, imageSignal: imageSignal, selected: nil, sectionId: self.section, style: .blocks, action: nil) + case let .locationSetup(theme, text): + return ItemListActionItem(theme: theme, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { + arguments.setLocation() + }) + case let .locationRemove(theme, text): + return ItemListActionItem(theme: theme, title: text, kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { + arguments.removeLocation() + }) + case let .locationInfo(theme, text): + return ItemListTextItem(theme: theme, text: .plain(text), sectionId: self.section) } } } @@ -332,6 +399,11 @@ private enum CurrentChannelType { case privateChannel } +private enum CurrentChannelLocation: Equatable { + case removed + case location(PeerGeoLocation) +} + private struct ChannelVisibilityControllerState: Equatable { let selectedType: CurrentChannelType? let editingPublicLinkText: String? @@ -340,6 +412,7 @@ private struct ChannelVisibilityControllerState: Equatable { let revealedRevokePeerId: PeerId? let revokingPeerId: PeerId? let revokingPrivateLink: Bool + let editingLocation: CurrentChannelLocation? init() { self.selectedType = nil @@ -349,9 +422,10 @@ private struct ChannelVisibilityControllerState: Equatable { self.revealedRevokePeerId = nil self.revokingPeerId = nil self.revokingPrivateLink = false + self.editingLocation = nil } - init(selectedType: CurrentChannelType?, editingPublicLinkText: String?, addressNameValidationStatus: AddressNameValidationStatus?, updatingAddressName: Bool, revealedRevokePeerId: PeerId?, revokingPeerId: PeerId?, revokingPrivateLink: Bool) { + init(selectedType: CurrentChannelType?, editingPublicLinkText: String?, addressNameValidationStatus: AddressNameValidationStatus?, updatingAddressName: Bool, revealedRevokePeerId: PeerId?, revokingPeerId: PeerId?, revokingPrivateLink: Bool, editingLocation: CurrentChannelLocation?) { self.selectedType = selectedType self.editingPublicLinkText = editingPublicLinkText self.addressNameValidationStatus = addressNameValidationStatus @@ -359,6 +433,7 @@ private struct ChannelVisibilityControllerState: Equatable { self.revealedRevokePeerId = revealedRevokePeerId self.revokingPeerId = revokingPeerId self.revokingPrivateLink = revokingPrivateLink + self.editingLocation = editingLocation } static func ==(lhs: ChannelVisibilityControllerState, rhs: ChannelVisibilityControllerState) -> Bool { @@ -383,36 +458,42 @@ private struct ChannelVisibilityControllerState: Equatable { if lhs.revokingPrivateLink != rhs.revokingPrivateLink { return false } - + if lhs.editingLocation != rhs.editingLocation { + return false + } return true } func withUpdatedSelectedType(_ selectedType: CurrentChannelType?) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: self.updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: self.updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: self.editingLocation) } func withUpdatedEditingPublicLinkText(_ editingPublicLinkText: String?) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: self.updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: self.updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: self.editingLocation) } func withUpdatedAddressNameValidationStatus(_ addressNameValidationStatus: AddressNameValidationStatus?) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: addressNameValidationStatus, updatingAddressName: self.updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: addressNameValidationStatus, updatingAddressName: self.updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: self.editingLocation) } func withUpdatedUpdatingAddressName(_ updatingAddressName: Bool) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: self.editingLocation) } func withUpdatedRevealedRevokePeerId(_ revealedRevokePeerId: PeerId?) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: self.editingLocation) } func withUpdatedRevokingPeerId(_ revokingPeerId: PeerId?) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: revokingPeerId, revokingPrivateLink: self.revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: self.editingLocation) } func withUpdatedRevokingPrivateLink(_ revokingPrivateLink: Bool) -> ChannelVisibilityControllerState { - return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: revokingPrivateLink) + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: revokingPrivateLink, editingLocation: self.editingLocation) + } + + func withUpdatedEditingLocation(_ editingLocation: CurrentChannelLocation?) -> ChannelVisibilityControllerState { + return ChannelVisibilityControllerState(selectedType: self.selectedType, editingPublicLinkText: self.editingPublicLinkText, addressNameValidationStatus: self.addressNameValidationStatus, updatingAddressName: updatingAddressName, revealedRevokePeerId: self.revealedRevokePeerId, revokingPeerId: self.revokingPeerId, revokingPrivateLink: self.revokingPrivateLink, editingLocation: editingLocation) } } @@ -546,6 +627,28 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa } if isGroup { entries.append(.publicLinkInfo(presentationData.theme, presentationData.strings.Group_Username_CreatePublicLinkHelp)) + + entries.append(.locationHeader(presentationData.theme, presentationData.strings.Group_Location_Title.uppercased())) + + + if let currentEditingLocation = state.editingLocation { + if case .removed = currentEditingLocation { + entries.append(.locationSetup(presentationData.theme, presentationData.strings.Group_Location_SetLocation)) + } else if case let .location(location) = currentEditingLocation { + entries.append(.location(presentationData.theme, location)) + entries.append(.locationSetup(presentationData.theme, presentationData.strings.Group_Location_ChangeLocation)) + entries.append(.locationRemove(presentationData.theme, presentationData.strings.Group_Location_RemoveLocation)) + } + } else { + if let location = (view.cachedData as? CachedChannelData)?.peerGeoLocation { + entries.append(.location(presentationData.theme, location)) + entries.append(.locationSetup(presentationData.theme, presentationData.strings.Group_Location_ChangeLocation)) + entries.append(.locationRemove(presentationData.theme, presentationData.strings.Group_Location_RemoveLocation)) + } else { + entries.append(.locationSetup(presentationData.theme, presentationData.strings.Group_Location_SetLocation)) + } + } + entries.append(.locationInfo(presentationData.theme, presentationData.strings.Group_Location_Info)) } else { entries.append(.publicLinkInfo(presentationData.theme, presentationData.strings.Channel_Username_CreatePublicLinkHelp)) } @@ -700,6 +803,7 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa return entries } + private func effectiveChannelType(state: ChannelVisibilityControllerState, peer: TelegramChannel) -> CurrentChannelType { let selectedType: CurrentChannelType if let current = state.selectedType { @@ -795,13 +899,16 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, let updateAddressNameDisposable = MetaDisposable() actionsDisposable.add(updateAddressNameDisposable) + let updateLocationDisposable = MetaDisposable() + actionsDisposable.add(updateLocationDisposable) + let revokeAddressNameDisposable = MetaDisposable() actionsDisposable.add(revokeAddressNameDisposable) let revokeLinkDisposable = MetaDisposable() actionsDisposable.add(revokeLinkDisposable) - actionsDisposable.add( (context.account.viewTracker.peerView(peerId) |> filter { $0.cachedData != nil } |> take(1) |> mapToSignal { view -> Signal in + actionsDisposable.add((context.account.viewTracker.peerView(peerId) |> filter { $0.cachedData != nil } |> take(1) |> mapToSignal { view -> Signal in return ensuredExistingPeerExportedInvitation(account: context.account, peerId: peerId) }).start()) @@ -826,11 +933,11 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, } checkAddressNameDisposable.set((validateAddressNameInteractive(account: context.account, domain: .peer(peerId), name: text) - |> deliverOnMainQueue).start(next: { result in - updateState { state in - return state.withUpdatedAddressNameValidationStatus(result) - } - })) + |> deliverOnMainQueue).start(next: { result in + updateState { state in + return state.withUpdatedAddressNameValidationStatus(result) + } + })) } }, scrollToPublicLinkText: { scrollToPublicLinkTextImpl?() @@ -926,9 +1033,41 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, presentControllerImpl?(shareController, nil) } }) + }, setLocation: { + let _ = (context.account.postbox.transaction { transaction -> Peer? in + return transaction.getPeer(peerId) + } |> deliverOnMainQueue).start(next: { peer in + guard let peer = peer else { + return + } + + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let controller = legacyLocationPickerController(context: context, selfPeer: peer, peer: peer, sendLocation: { coordinate, _ in + updateState { state in + return state.withUpdatedEditingLocation(.location(PeerGeoLocation(latitude: coordinate.latitude, longitude: coordinate.longitude, address: "Locating..."))) + } + + let _ = (reverseGeocodeLocation(latitude: coordinate.latitude, longitude: coordinate.longitude) + |> deliverOnMainQueue).start(next: { placemark in + updateState { state in + let address: String + if let placemark = placemark { + address = placemark.fullAddress.replacingOccurrences(of: ", ", with: "\n") + } else { + address = "\(coordinate.latitude), \(coordinate.longitude)" + } + return state.withUpdatedEditingLocation(.location(PeerGeoLocation(latitude: coordinate.latitude, longitude: coordinate.longitude, address: address))) + } + }) + }, sendLiveLocation: { _, _ in }, theme: presentationData.theme, customLocationPicker: true) + presentControllerImpl?(controller, nil) + }) + }, removeLocation: { + updateState { state in + return state.withUpdatedEditingLocation(.removed) + } }) - let peerView = context.account.viewTracker.peerView(peerId) |> deliverOnMainQueue @@ -962,11 +1101,37 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, rightNavigationButton = ItemListNavigationButton(content: .text(mode == .initialSetup ? presentationData.strings.Common_Next : presentationData.strings.Common_Done), style: state.updatingAddressName ? .activity : .bold, enabled: doneEnabled, action: { var updatedAddressNameValue: String? + var updatedLocation: CurrentChannelLocation? updateState { state in updatedAddressNameValue = updatedAddressName(state: state, peer: peer) + updatedLocation = state.editingLocation return state } + let updateLocation: (@escaping (Bool) -> Void) -> Void = { completion in + guard let updatedLocation = updatedLocation else { + completion(true) + return + } + + switch updatedLocation { + case let .location(location): + updateLocationDisposable.set((updateChannelGeoLocation(postbox: context.account.postbox, network: context.account.network, channelId: peerId, coordinate: (location.latitude, location.longitude), address: location.address) + |> deliverOnMainQueue).start(error: { error in + completion(false) + }, completed: { + completion(true) + })) + case .removed: + updateLocationDisposable.set((updateChannelGeoLocation(postbox: context.account.postbox, network: context.account.network, channelId: peerId, coordinate: nil, address: nil) + |> deliverOnMainQueue).start(error: { error in + completion(false) + }, completed: { + completion(true) + })) + } + } + if let updatedAddressNameValue = updatedAddressNameValue { let invokeAction: () -> Void = { updateState { state in @@ -986,12 +1151,14 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, return state.withUpdatedUpdatingAddressName(false) } - switch mode { - case .initialSetup: - nextImpl?() - case .generic, .privateLink: - dismissImpl?() - } + updateLocation({ success in + switch mode { + case .initialSetup: + nextImpl?() + case .generic, .privateLink: + dismissImpl?() + } + }) })) } @@ -1004,12 +1171,14 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, } }) } else { - switch mode { - case .initialSetup: - nextImpl?() - case .generic, .privateLink: - dismissImpl?() - } + updateLocation({ success in + switch mode { + case .initialSetup: + nextImpl?() + case .generic, .privateLink: + dismissImpl?() + } + }) } }) } else if let peer = peer as? TelegramGroup { diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 12c81d24c1..992275ccaf 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -1249,7 +1249,7 @@ public final class ChatController: TelegramController, GalleryHiddenMediaTarget, guard let strongSelf = self else { return } - let _ = deleteMessagesInteractively(postbox: strongSelf.context.account.postbox, messageIds: messages.map({ $0.id }), type: .forLocalPeer).start() + let _ = deleteMessagesInteractively(postbox: strongSelf.context.account.postbox, messageIds: [id], type: .forLocalPeer).start() })) actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, action: { [weak actionSheet] in @@ -5837,90 +5837,96 @@ public final class ChatController: TelegramController, GalleryHiddenMediaTarget, } private func reportPeer() { - if let peer = self.presentationInterfaceState.renderedPeer?.peer { - self.chatDisplayNode.dismissInput() - - if let peer = peer as? TelegramChannel, let username = peer.username, !username.isEmpty { - self.present(peerReportOptionsController(context: self.context, subject: .peer(peer.id), present: { [weak self] c, a in - self?.present(c, in: .window(.root)) - }), in: .window(.root)) - } else if let _ = peer as? TelegramUser { - let presentationData = self.presentationData - let controller = ActionSheetController(presentationTheme: presentationData.theme) - let dismissAction: () -> Void = { [weak controller] in - controller?.dismissAnimated() - } - var reportSpam = true - var deleteChat = true - controller.setItemGroups([ - ActionSheetItemGroup(items: [ - ActionSheetTextItem(title: presentationData.strings.UserInfo_BlockConfirmationTitle(peer.compactDisplayTitle).0), - ActionSheetCheckboxItem(title: presentationData.strings.Conversation_Moderate_Report, label: "", value: reportSpam, action: { [weak controller] checkValue in - reportSpam = checkValue - controller?.updateItem(groupIndex: 0, itemIndex: 1, { item in - if let item = item as? ActionSheetCheckboxItem { - return ActionSheetCheckboxItem(title: item.title, label: item.label, value: !item.value, action: item.action) - } - return item - }) - }), - ActionSheetCheckboxItem(title: presentationData.strings.ReportSpam_DeleteThisChat, label: "", value: deleteChat, action: { [weak controller] checkValue in - deleteChat = checkValue - controller?.updateItem(groupIndex: 0, itemIndex: 2, { item in - if let item = item as? ActionSheetCheckboxItem { - return ActionSheetCheckboxItem(title: item.title, label: item.label, value: !item.value, action: item.action) - } - return item - }) - }), - ActionSheetButtonItem(title: presentationData.strings.UserInfo_BlockActionTitle(peer.compactDisplayTitle).0, color: .destructive, action: { [weak self] in - dismissAction() - guard let strongSelf = self else { - return - } - let _ = requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: true).start() - if deleteChat { - let _ = removePeerChat(account: strongSelf.context.account, peerId: peer.id, reportChatSpam: reportSpam).start() - (strongSelf.navigationController as? NavigationController)?.filterController(strongSelf, animated: true) - } else if reportSpam { - let _ = TelegramCore.reportPeer(account: strongSelf.context.account, peerId: peer.id, reason: .spam).start() - } - }) - ]), - ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })]) - ]) - self.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) - } else { - let title: String - var infoString: String? - if let _ = peer as? TelegramGroup { - title = self.presentationData.strings.Conversation_ReportSpam - } else if let _ = peer as? TelegramChannel { - title = self.presentationData.strings.Conversation_ReportSpam - } else { - title = self.presentationData.strings.Conversation_ReportSpam - infoString = self.presentationData.strings.Conversation_ReportSpamConfirmation - } - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) - - var items: [ActionSheetItem] = [] - if let infoString = infoString { - items.append(ActionSheetTextItem(title: infoString)) - } - items.append(ActionSheetButtonItem(title: title, color: .destructive, action: { [weak self, weak actionSheet] in - actionSheet?.dismissAnimated() - if let strongSelf = self { - strongSelf.deleteChat(reportChatSpam: true) - } - })) - actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ - ActionSheetButtonItem(title: self.presentationData.strings.Common_Cancel, color: .accent, action: { [weak actionSheet] in - actionSheet?.dismissAnimated() - }) - ])]) - - self.present(actionSheet, in: .window(.root)) + guard let renderedPeer = self.presentationInterfaceState.renderedPeer, let peer = renderedPeer.chatMainPeer, let chatPeer = renderedPeer.peer else { + return + } + self.chatDisplayNode.dismissInput() + + if let peer = peer as? TelegramChannel, let username = peer.username, !username.isEmpty { + self.present(peerReportOptionsController(context: self.context, subject: .peer(peer.id), present: { [weak self] c, a in + self?.present(c, in: .window(.root)) + }), in: .window(.root)) + } else if let _ = peer as? TelegramUser { + let presentationData = self.presentationData + let controller = ActionSheetController(presentationTheme: presentationData.theme) + let dismissAction: () -> Void = { [weak controller] in + controller?.dismissAnimated() } + var reportSpam = true + var deleteChat = true + controller.setItemGroups([ + ActionSheetItemGroup(items: [ + ActionSheetTextItem(title: presentationData.strings.UserInfo_BlockConfirmationTitle(peer.compactDisplayTitle).0), + ActionSheetCheckboxItem(title: presentationData.strings.Conversation_Moderate_Report, label: "", value: reportSpam, action: { [weak controller] checkValue in + reportSpam = checkValue + controller?.updateItem(groupIndex: 0, itemIndex: 1, { item in + if let item = item as? ActionSheetCheckboxItem { + return ActionSheetCheckboxItem(title: item.title, label: item.label, value: !item.value, action: item.action) + } + return item + }) + }), + ActionSheetCheckboxItem(title: presentationData.strings.ReportSpam_DeleteThisChat, label: "", value: deleteChat, action: { [weak controller] checkValue in + deleteChat = checkValue + controller?.updateItem(groupIndex: 0, itemIndex: 2, { item in + if let item = item as? ActionSheetCheckboxItem { + return ActionSheetCheckboxItem(title: item.title, label: item.label, value: !item.value, action: item.action) + } + return item + }) + }), + ActionSheetButtonItem(title: presentationData.strings.UserInfo_BlockActionTitle(peer.compactDisplayTitle).0, color: .destructive, action: { [weak self] in + dismissAction() + guard let strongSelf = self else { + return + } + let _ = requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: true).start() + if let _ = chatPeer as? TelegramSecretChat { + let _ = (strongSelf.context.account.postbox.transaction { transaction in + terminateSecretChat(transaction: transaction, peerId: chatPeer.id) + }).start() + } + if deleteChat { + let _ = removePeerChat(account: strongSelf.context.account, peerId: chatPeer.id, reportChatSpam: reportSpam).start() + (strongSelf.navigationController as? NavigationController)?.filterController(strongSelf, animated: true) + } else if reportSpam { + let _ = TelegramCore.reportPeer(account: strongSelf.context.account, peerId: peer.id, reason: .spam).start() + } + }) + ]), + ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })]) + ]) + self.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + } else { + let title: String + var infoString: String? + if let _ = peer as? TelegramGroup { + title = self.presentationData.strings.Conversation_ReportSpam + } else if let _ = peer as? TelegramChannel { + title = self.presentationData.strings.Conversation_ReportSpam + } else { + title = self.presentationData.strings.Conversation_ReportSpam + infoString = self.presentationData.strings.Conversation_ReportSpamConfirmation + } + let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + + var items: [ActionSheetItem] = [] + if let infoString = infoString { + items.append(ActionSheetTextItem(title: infoString)) + } + items.append(ActionSheetButtonItem(title: title, color: .destructive, action: { [weak self, weak actionSheet] in + actionSheet?.dismissAnimated() + if let strongSelf = self { + strongSelf.deleteChat(reportChatSpam: true) + } + })) + actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [ + ActionSheetButtonItem(title: self.presentationData.strings.Common_Cancel, color: .accent, action: { [weak actionSheet] in + actionSheet?.dismissAnimated() + }) + ])]) + + self.present(actionSheet, in: .window(.root)) } } @@ -5953,8 +5959,8 @@ public final class ChatController: TelegramController, GalleryHiddenMediaTarget, } private func addPeerContact() { - if let peer = self.presentationInterfaceState.renderedPeer?.chatMainPeer as? TelegramUser, let contactData = DeviceContactExtendedData(peer: peer) { - self.present(deviceContactInfoController(context: context, subject: .create(peer: peer, contactData: contactData, isSharing: true, completion: { [weak self] peer, stableId, contactData in + if let peer = self.presentationInterfaceState.renderedPeer?.chatMainPeer as? TelegramUser, let peerStatusSettings = self.presentationInterfaceState.contactStatus?.peerStatusSettings, let contactData = DeviceContactExtendedData(peer: peer) { + self.present(deviceContactInfoController(context: context, subject: .create(peer: peer, contactData: contactData, isSharing: true, shareViaException: peerStatusSettings.contains(.addExceptionWhenAddingContact), completion: { [weak self] peer, stableId, contactData in guard let strongSelf = self else { return } diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index f27f569f17..5a4adbdff2 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -460,7 +460,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { } //self.snapToBottomInsetUntilFirstInteraction = true - let messageViewQueue = self.messageViewQueue + let messageViewQueue = Queue.mainQueue() //self.messageViewQueue let fixedCombinedReadStates = Atomic(value: nil) diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift index 1301f77187..290f7aad6c 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift @@ -264,7 +264,21 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee return signal |> then(contextBot) case let .emojiSearch(query, languageCode, range): - return searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: languageCode, query: query, completeMatch: query.count < 3) + var signal = searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: languageCode, query: query, completeMatch: query.count < 3) + if !languageCode.lowercased().hasPrefix("en") { + signal = signal + |> mapToSignal { keywords in + return .single(keywords) + |> then( + searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: "en-US", query: query, completeMatch: query.count < 3) + |> map { englishKeywords in + return keywords + englishKeywords + } + ) + } + } + + return signal |> map { keywords -> [(String, String)] in var result: [(String, String)] = [] for keyword in keywords { diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceTitlePanelNodes.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceTitlePanelNodes.swift index a1b0d1ec5d..c197259f87 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceTitlePanelNodes.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceTitlePanelNodes.swift @@ -29,7 +29,7 @@ func titlePanelForChatPresentationInterfaceState(_ chatPresentationInterfaceStat } var displayActionsPanel = false - if let contactStatus = chatPresentationInterfaceState.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings { + if !chatPresentationInterfaceState.peerIsBlocked, let contactStatus = chatPresentationInterfaceState.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings { if !peerStatusSettings.isEmpty { if contactStatus.canAddContact && peerStatusSettings.contains(.canAddContact) { displayActionsPanel = true diff --git a/submodules/TelegramUI/TelegramUI/ChatListItem.swift b/submodules/TelegramUI/TelegramUI/ChatListItem.swift index a0f83c3494..21a00300e6 100644 --- a/submodules/TelegramUI/TelegramUI/ChatListItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChatListItem.swift @@ -855,7 +855,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { statusState = .clock(PresentationResourcesChatList.clockFrameImage(item.presentationData.theme), PresentationResourcesChatList.clockMinImage(item.presentationData.theme)) } else if message.id.peerId != account.peerId { if message.flags.contains(.Failed) { - statusState = .none + statusState = .failed(item.presentationData.theme.chatList.failedFillColor, item.presentationData.theme.chatList.failedForegroundColor) } else { if let combinedReadState = combinedReadState, combinedReadState.isOutgoingMessageIndexRead(message.index) { statusState = .read(item.presentationData.theme.chatList.checkmarkColor) diff --git a/submodules/TelegramUI/TelegramUI/ChatListStatusNode.swift b/submodules/TelegramUI/TelegramUI/ChatListStatusNode.swift index 1889d55493..4c67678f4c 100644 --- a/submodules/TelegramUI/TelegramUI/ChatListStatusNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatListStatusNode.swift @@ -10,6 +10,7 @@ enum ChatListStatusNodeState: Equatable { case delivered(UIColor) case read(UIColor) case progress(UIColor, CGFloat) + case failed(UIColor, UIColor) func contentNode() -> ChatListStatusContentNode? { switch self { @@ -23,6 +24,8 @@ enum ChatListStatusNodeState: Equatable { return ChatListStatusChecksNode(color: color) case let .progress(color, progress): return ChatListStatusProgressNode(color: color, progress: progress) + case let .failed(fill, foreground): + return ChatListStatusFailedNode(fill: fill, foreground: foreground) } } } @@ -346,6 +349,84 @@ private class ChatListStatusChecksNode: ChatListStatusContentNode { } } +private final class ChatListStatusFailedNodeParameters: NSObject { + let fill: UIColor + let foreground: UIColor + + init(fill: UIColor, foreground: UIColor) { + self.fill = fill + self.foreground = foreground + + super.init() + } +} + +private class ChatListStatusFailedNode: ChatListStatusContentNode { + private var state: ChatListStatusNodeState? + + var fill: UIColor { + didSet { + self.setNeedsDisplay() + } + } + + var foreground: UIColor { + didSet { + self.setNeedsDisplay() + } + } + + init(fill: UIColor, foreground: UIColor) { + self.fill = fill + self.foreground = foreground + + super.init() + } + + override func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? { + return ChatListStatusFailedNodeParameters(fill: self.fill, foreground: self.foreground) + } + + @objc override class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) { + let context = UIGraphicsGetCurrentContext()! + + if !isRasterizing { + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) + context.fill(bounds) + } + + guard let parameters = parameters as? ChatListStatusFailedNodeParameters else { + return + } + + let diameter: CGFloat = 14.0 + let rect = CGRect(origin: CGPoint(x: floor((bounds.width - diameter) / 2.0), y: floor((bounds.height - diameter) / 2.0)), size: CGSize(width: diameter, height: diameter)).offsetBy(dx: 1.0, dy: 1.0) + + context.setFillColor(parameters.fill.cgColor) + context.fillEllipse(in: rect) + context.setStrokeColor(parameters.foreground.cgColor) + + let string = NSAttributedString(string: "!", font: Font.medium(12.0), textColor: parameters.foreground) + let stringRect = string.boundingRect(with: rect.size, options: .usesLineFragmentOrigin, context: nil) + + UIGraphicsPushContext(context) + string.draw(at: CGPoint(x: rect.minX + floor((rect.width - stringRect.width) / 2.0), y: 1.0 + rect.minY + floor((rect.height - stringRect.height) / 2.0))) + UIGraphicsPopContext() + } + + override func updateWithState(_ state: ChatListStatusNodeState, animated: Bool) { + switch state { + case let .failed(fill, foreground): + self.fill = fill + self.foreground = foreground + default: + break + } + self.state = state + } +} + private class ChatListStatusProgressNode: ChatListStatusContentNode { private let statusNode: RadialStatusNode diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index 0b0f7ee72d..4b445d22f9 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -136,6 +136,11 @@ private final class StickerAnimationNode: ASDisplayNode { self.fetchDisposable.set(fetchedMediaResource(postbox: account.postbox, reference: fileReference.resourceReference(fileReference.media.resource)).start()) } + func reset() { + self.disposable.set(nil) + self.fetchDisposable.set(nil) + } + private func setupLooping() { guard let playerItem = self.playerItem, let player = self.player else { return @@ -167,7 +172,7 @@ private final class StickerAnimationNode: ASDisplayNode { } }) playerItem.videoComposition = composition - ready = true + self.ready = true if self.visibility { self.player?.play() } @@ -189,6 +194,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { private var shareButtonNode: HighlightableButtonNode? var telegramFile: TelegramMediaFile? + private let disposable = MetaDisposable() private let dateAndStatusNode: ChatMessageDateAndStatusNode private var replyInfoNode: ChatMessageReplyInfoNode? @@ -215,6 +221,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { self.addSubnode(self.dateAndStatusNode) } + deinit { + self.disposable.dispose() + } + required init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") } @@ -246,14 +256,17 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { self.view.addGestureRecognizer(replyRecognizer) } + private var visibilityPromise = ValuePromise(false, ignoreRepeated: true) override var visibility: ListViewItemNodeVisibility { didSet { if self.visibility != oldValue { switch self.visibility { case .visible: self.animationNode.visibility = true + self.visibilityPromise.set(true) case .none: self.animationNode.visibility = false + self.visibilityPromise.set(false) } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift index 0c98ad9032..c698351387 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift @@ -491,6 +491,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode { if hasStreamingProgress { fittedLayoutSize.width += streamingProgressDiameter + 6.0 } + fittedLayoutSize.width = max(fittedLayoutSize.width, boundingWidth + 2.0) } else { streamingCacheStatusFrame = CGRect() } @@ -635,8 +636,6 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode { } private func updateStatus(animated: Bool) { - - guard let resourceStatus = self.resourceStatus else { return } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift index 3a5497ef97..e5262ec77a 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift @@ -360,7 +360,9 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible { for attribute in telegramFile.attributes { switch attribute { case .Sticker: - viewClassName = ChatMessageStickerItemNode.self + if let size = telegramFile.size, size > 0 && size <= 512 * 1024 { + viewClassName = ChatMessageStickerItemNode.self + } break loop case let .Video(_, _, flags): if flags.contains(.instantRoundVideo) { diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index 43d2cb2cbf..02450d5287 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -413,6 +413,14 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { self.eventLogContext.loadMoreEntries() let historyViewUpdate = self.eventLogContext.get() + |> map { (entries, hasEarlier, type, hasEntries) in + return (entries.filter { entry in + if case let .participantToggleAdmin(prev, new) = entry.event.action, case .creator = prev.participant, case .member = new.participant { + return false + } + return true + }, hasEarlier, type, hasEntries) + } let previousView = Atomic<[ChatRecentActionsEntry]?>(value: nil) @@ -420,14 +428,6 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { |> mapToQueue { update, chatPresentationData -> Signal in let processedView = chatRecentActionsEntries(entries: update.0, presentationData: chatPresentationData) let previous = previousView.swap(processedView) - - var prepareOnMainQueue = false - - if let previous = previous, previous == processedView { - - } else { - - } return .single(chatRecentActionsHistoryPreparedTransition(from: previous ?? [], to: processedView, type: update.2, canLoadEarlier: update.1, displayingResults: update.3, context: context, peer: peer, controllerInteraction: controllerInteraction)) } @@ -453,7 +453,6 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { } } - //if controllerInteraction.hiddenMedia != messageIdAndMedia { controllerInteraction.hiddenMedia = messageIdAndMedia strongSelf.listNode.forEachItemNode { itemNode in @@ -461,15 +460,12 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { itemNode.updateHiddenMedia() } } - //} } })) self.presentationDataDisposable = (context.sharedContext.presentationData |> deliverOnMainQueue).start(next: { [weak self] presentationData in if let strongSelf = self { - let previousTheme = strongSelf.presentationData.theme - strongSelf.presentationData = presentationData strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.fontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji))) @@ -808,7 +804,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { }, dismissInput: { self?.view.endEditing(true) }) - case let .wallpaper(slug): + case .wallpaper: break } } diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift index 4c84c08ab7..adf659a02c 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift @@ -631,54 +631,66 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { var text: String = "" var entities: [MessageTextEntity] = [] - appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessagePromotedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessagePromotedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in - var result: [MessageTextEntityType] = [] - if index == 0 { - result.append(.TextMention(peerId: new.peer.id)) - } else if index == 1 { - result.append(.Mention) - } - return result - }, to: &text, entities: &entities) - text += "\n" - - if case let .member(_, _, prevAdminRights, _) = prev.participant { - if case let .member(_, _, newAdminRights, _) = new.participant { - let prevFlags = prevAdminRights?.rights.flags ?? [] - let newFlags = newAdminRights?.rights.flags ?? [] - - let order: [(TelegramChatAdminRightsFlags, String)] - - if let peer = peer as? TelegramChannel, case .broadcast = peer.info { - order = [ - (.canChangeInfo, self.presentationData.strings.Channel_AdminLog_CanChangeInfo), - (.canPostMessages, self.presentationData.strings.Channel_AdminLog_CanSendMessages), - (.canDeleteMessages, self.presentationData.strings.Channel_AdminLog_CanDeleteMessages), - (.canEditMessages, self.presentationData.strings.Channel_AdminLog_CanEditMessages), - (.canInviteUsers, self.presentationData.strings.Channel_AdminLog_CanInviteUsers), - (.canPinMessages, self.presentationData.strings.Channel_AdminLog_CanPinMessages), - (.canAddAdmins, self.presentationData.strings.Channel_AdminLog_CanAddAdmins) - ] - } else { - order = [ - (.canChangeInfo, self.presentationData.strings.Channel_AdminLog_CanChangeInfo), - (.canDeleteMessages, self.presentationData.strings.Channel_AdminLog_CanDeleteMessages), - (.canBanUsers, self.presentationData.strings.Channel_AdminLog_CanBanUsers), - (.canInviteUsers, self.presentationData.strings.Channel_AdminLog_CanInviteUsers), - (.canPinMessages, self.presentationData.strings.Channel_AdminLog_CanPinMessages), - (.canAddAdmins, self.presentationData.strings.Channel_AdminLog_CanAddAdmins) - ] + if case .member = prev.participant, case .creator = new.participant { + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessageTransferedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessageTransferedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + var result: [MessageTextEntityType] = [] + if index == 0 { + result.append(.TextMention(peerId: new.peer.id)) + } else if index == 1 { + result.append(.Mention) } - - for (flag, string) in order { - if prevFlags.contains(flag) != newFlags.contains(flag) { - text += "\n" - if !prevFlags.contains(flag) { - text += "+" - } else { - text += "-" + return result + }, to: &text, entities: &entities) + } else { + appendAttributedText(text: new.peer.addressName == nil ? self.presentationData.strings.Channel_AdminLog_MessagePromotedName(new.peer.displayTitle) : self.presentationData.strings.Channel_AdminLog_MessagePromotedNameUsername(new.peer.displayTitle, "@" + new.peer.addressName!), generateEntities: { index in + var result: [MessageTextEntityType] = [] + if index == 0 { + result.append(.TextMention(peerId: new.peer.id)) + } else if index == 1 { + result.append(.Mention) + } + return result + }, to: &text, entities: &entities) + text += "\n" + + if case let .member(_, _, prevAdminRights, _) = prev.participant { + if case let .member(_, _, newAdminRights, _) = new.participant { + let prevFlags = prevAdminRights?.rights.flags ?? [] + let newFlags = newAdminRights?.rights.flags ?? [] + + let order: [(TelegramChatAdminRightsFlags, String)] + + if let peer = peer as? TelegramChannel, case .broadcast = peer.info { + order = [ + (.canChangeInfo, self.presentationData.strings.Channel_AdminLog_CanChangeInfo), + (.canPostMessages, self.presentationData.strings.Channel_AdminLog_CanSendMessages), + (.canDeleteMessages, self.presentationData.strings.Channel_AdminLog_CanDeleteMessages), + (.canEditMessages, self.presentationData.strings.Channel_AdminLog_CanEditMessages), + (.canInviteUsers, self.presentationData.strings.Channel_AdminLog_CanInviteUsers), + (.canPinMessages, self.presentationData.strings.Channel_AdminLog_CanPinMessages), + (.canAddAdmins, self.presentationData.strings.Channel_AdminLog_CanAddAdmins) + ] + } else { + order = [ + (.canChangeInfo, self.presentationData.strings.Channel_AdminLog_CanChangeInfo), + (.canDeleteMessages, self.presentationData.strings.Channel_AdminLog_CanDeleteMessages), + (.canBanUsers, self.presentationData.strings.Channel_AdminLog_CanBanUsers), + (.canInviteUsers, self.presentationData.strings.Channel_AdminLog_CanInviteUsers), + (.canPinMessages, self.presentationData.strings.Channel_AdminLog_CanPinMessages), + (.canAddAdmins, self.presentationData.strings.Channel_AdminLog_CanAddAdmins) + ] + } + + for (flag, string) in order { + if prevFlags.contains(flag) != newFlags.contains(flag) { + text += "\n" + if !prevFlags.contains(flag) { + text += "+" + } else { + text += "-" + } + appendAttributedText(text: string, withEntities: [.Italic], to: &text, entities: &entities) } - appendAttributedText(text: string, withEntities: [.Italic], to: &text, entities: &entities) } } } @@ -915,36 +927,41 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) - case let .togglePreHistoryHidden(value): - var peers = SimpleDictionary() - var author: Peer? - if let peer = self.entry.peers[self.entry.event.peerId] { - author = peer - peers[peer.id] = peer - } - - var text: String = "" - var entities: [MessageTextEntity] = [] - - if !value { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageGroupPreHistoryVisible(author?.displayTitle ?? ""), generateEntities: { index in - if index == 0, let author = author { - return [.TextMention(peerId: author.id)] - } - return [] - }, to: &text, entities: &entities) - } else { - appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageGroupPreHistoryHidden(author?.displayTitle ?? ""), generateEntities: { index in - if index == 0, let author = author { - return [.TextMention(peerId: author.id)] - } - return [] - }, to: &text, entities: &entities) - } - let action = TelegramMediaActionType.customText(text: text, entities: entities) - - let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + case let .changeGeoLocation(_, updated): + var peers = SimpleDictionary() + var author: Peer? + if let peer = self.entry.peers[self.entry.event.peerId] { + author = peer + peers[peer.id] = peer + } + var text: String = "" + var entities: [MessageTextEntity] = [] + + if let updated = updated { + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageChangedGroupGeoLocation(updated.address.replacingOccurrences(of: "\n", with: ", ")), generateEntities: { index in + if index == 0, let author = author { + return [.TextMention(peerId: author.id)] + } + return [] + }, to: &text, entities: &entities) + + let mediaMap = TelegramMediaMap(latitude: updated.latitude, longitude: updated.longitude, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil) + + let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: text, attributes: [], media: [mediaMap], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + } else { + appendAttributedText(text: self.presentationData.strings.Channel_AdminLog_MessageRemovedGroupGeoLocation(author?.displayTitle ?? ""), generateEntities: { index in + if index == 0, let author = author { + return [.TextMention(peerId: author.id)] + } + return [] + }, to: &text, entities: &entities) + + let action = TelegramMediaActionType.customText(text: text, entities: entities) + + let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + } } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift index d960b2d6a8..deaf148da0 100644 --- a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift @@ -10,6 +10,7 @@ private enum ChatReportPeerTitleButton: Equatable { case block case addContact(String?) case shareMyPhoneNumber + case reportSpam func title(strings: PresentationStrings) -> String { switch self { @@ -23,6 +24,8 @@ private enum ChatReportPeerTitleButton: Equatable { } case .shareMyPhoneNumber: return strings.Conversation_ShareMyPhoneNumber + case .reportSpam: + return strings.Conversation_ReportSpam } } } @@ -47,6 +50,8 @@ private func peerButtons(_ state: ChatPresentationInterfaceState) -> [ChatReport buttons.append(.shareMyPhoneNumber) } } + } else if let _ = state.renderedPeer?.chatMainPeer { + buttons.append(.reportSpam) } return buttons } @@ -142,7 +147,8 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode { nextButtonOrigin += buttonWidth } } else { - let areaWidth = width - maxInset * 2.0 + let additionalRightInset: CGFloat = 18.0 + let areaWidth = width - maxInset * 2.0 - additionalRightInset let maxButtonWidth = floor(areaWidth / CGFloat(self.buttons.count)) let buttonSizes = self.buttons.map { button -> CGFloat in return button.1.sizeThatFits(CGSize(width: maxButtonWidth, height: 100.0)).width @@ -172,7 +178,7 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode { switch button { case .shareMyPhoneNumber: self.interfaceInteraction?.shareAccountContact() - case .block: + case .block, .reportSpam: self.interfaceInteraction?.reportPeer() case .addContact: self.interfaceInteraction?.presentPeerContact() diff --git a/submodules/TelegramUI/TelegramUI/ContactListActionItem.swift b/submodules/TelegramUI/TelegramUI/ContactListActionItem.swift index 7c8c1d72ae..46496777e7 100644 --- a/submodules/TelegramUI/TelegramUI/ContactListActionItem.swift +++ b/submodules/TelegramUI/TelegramUI/ContactListActionItem.swift @@ -111,6 +111,9 @@ class ContactListActionItem: ListViewItem { func selected(listView: ListView){ self.action() + if case .alpha = self.highlight { + listView.clearHighlightAnimated(true) + } } static func mergeType(item: ContactListActionItem, previousItem: ListViewItem?, nextItem: ListViewItem?) -> (first: Bool, last: Bool, firstWithHeader: Bool) { diff --git a/submodules/TelegramUI/TelegramUI/ContactsController.swift b/submodules/TelegramUI/TelegramUI/ContactsController.swift index 131bcdf788..dd9f1dd0a7 100644 --- a/submodules/TelegramUI/TelegramUI/ContactsController.swift +++ b/submodules/TelegramUI/TelegramUI/ContactsController.swift @@ -257,14 +257,45 @@ public class ContactsController: ViewController { } self.contactsNode.openPeopleNearby = { [weak self] in - if let strongSelf = self { - let controller = peopleNearbyController(context: strongSelf.context) - (strongSelf.navigationController as? NavigationController)?.pushViewController(controller, completion: { [weak self] in - if let strongSelf = self { - strongSelf.contactsNode.contactListNode.listNode.clearHighlightAnimated(true) - } - }) + guard let strongSelf = self else { + return } + let _ = (DeviceAccess.authorizationStatus(context: strongSelf.context, subject: .location(.tracking)) + |> take(1) + |> deliverOnMainQueue).start(next: { [weak self] status in + guard let strongSelf = self else { + return + } + + let presentPeersNearby = { + let controller = peersNearbyController(context: strongSelf.context) + (strongSelf.navigationController as? NavigationController)?.replaceAllButRootController(controller, animated: true, completion: { [weak self] in + if let strongSelf = self { + strongSelf.contactsNode.contactListNode.listNode.clearHighlightAnimated(true) + } + }) + } + + switch status { + case .allowed: + presentPeersNearby() + default: + let controller = PermissionController(context: strongSelf.context, splashScreen: false) + controller.setState(.nearbyLocation(status: PermissionRequestStatus(accessType: status)), animated: false) + controller.proceed = { result in + if result { + presentPeersNearby() + } else { + let _ = (strongSelf.navigationController as? NavigationController)?.popViewController(animated: true) + } + } + (strongSelf.navigationController as? NavigationController)?.pushViewController(controller, completion: { [weak self] in + if let strongSelf = self { + strongSelf.contactsNode.contactListNode.listNode.clearHighlightAnimated(true) + } + }) + } + }) } self.contactsNode.openInvite = { [weak self] in @@ -384,8 +415,8 @@ public class ContactsController: ViewController { switch status { case .allowed: - let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: "", lastName: "", phoneNumbers: [DeviceContactPhoneNumberData(label: "_$!!$_", value: "")]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: []) - strongSelf.present(deviceContactInfoController(context: strongSelf.context, subject: .create(peer: nil, contactData: contactData, isSharing: false, completion: { peer, stableId, contactData in + let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: "", lastName: "", phoneNumbers: [DeviceContactPhoneNumberData(label: "_$!!$_", value: "+")]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: []) + strongSelf.present(deviceContactInfoController(context: strongSelf.context, subject: .create(peer: nil, contactData: contactData, isSharing: false, shareViaException: false, completion: { peer, stableId, contactData in guard let strongSelf = self else { return } diff --git a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift index cb72764759..1984fe92c4 100644 --- a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift @@ -127,7 +127,7 @@ private enum CreateChannelEntry: ItemListNodeEntry { func item(_ arguments: CreateChannelArguments) -> ListViewItem { switch self { case let .channelInfo(theme, strings, dateTimeFormat, peer, state, avatar): - return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false), editingNameUpdated: { editingName in + return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in arguments.updateEditingName(editingName) }, avatarTapped: { }, updatingImage: avatar, tag: CreateChannelEntryTag.info) diff --git a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift b/submodules/TelegramUI/TelegramUI/CreateGroupController.swift index d22b9f7db8..f7e89ef01d 100644 --- a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateGroupController.swift @@ -143,7 +143,7 @@ private enum CreateGroupEntry: ItemListNodeEntry { func item(_ arguments: CreateGroupArguments) -> ListViewItem { switch self { case let .groupInfo(theme, strings, dateTimeFormat, peer, state, avatar): - return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false), editingNameUpdated: { editingName in + return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in arguments.updateEditingName(editingName) }, avatarTapped: { }, updatingImage: avatar, tag: CreateGroupEntryTag.info) diff --git a/submodules/TelegramUI/TelegramUI/DeviceContactData.swift b/submodules/TelegramUI/TelegramUI/DeviceContactData.swift index 5d1b0fc240..6130764843 100644 --- a/submodules/TelegramUI/TelegramUI/DeviceContactData.swift +++ b/submodules/TelegramUI/TelegramUI/DeviceContactData.swift @@ -192,17 +192,20 @@ public final class DeviceContactInstantMessagingProfileData: Equatable, Hashable } } -public extension DeviceContactInstantMessagingProfileData { +public let phonebookUsernamePathPrefix = "@id" +private let phonebookUsernamePrefix = "https://t.me/" + phonebookUsernamePathPrefix + +public extension DeviceContactUrlData { convenience init(appProfile: PeerId) { - self.init(label: "mobile", service: "Telegram", username: "@id\(appProfile.id)") + self.init(label: "Telegram", value: "\(phonebookUsernamePrefix)\(appProfile.id)") } } func parseAppSpecificContactReference(_ value: String) -> PeerId? { - if !value.hasPrefix("@id") { + if !value.hasPrefix(phonebookUsernamePrefix) { return nil } - let idString = String(value[value.index(value.startIndex, offsetBy: 3)...]) + let idString = String(value[value.index(value.startIndex, offsetBy: phonebookUsernamePrefix.count)...]) if let id = Int32(idString) { return PeerId(namespace: Namespaces.Peer.CloudUser, id: id) } diff --git a/submodules/TelegramUI/TelegramUI/DeviceContactDataManager.swift b/submodules/TelegramUI/TelegramUI/DeviceContactDataManager.swift index c731164aac..7402d8df50 100644 --- a/submodules/TelegramUI/TelegramUI/DeviceContactDataManager.swift +++ b/submodules/TelegramUI/TelegramUI/DeviceContactDataManager.swift @@ -57,7 +57,7 @@ private final class DeviceContactDataModernContext: DeviceContactDataContext { } private func retrieveContacts() -> ([DeviceContactStableId: DeviceContactBasicData], [PeerId: DeviceContactBasicDataWithReference]) { - let keysToFetch: [CNKeyDescriptor] = [CNContactFormatter.descriptorForRequiredKeys(for: .fullName), CNContactPhoneNumbersKey as CNKeyDescriptor, CNContactInstantMessageAddressesKey as CNKeyDescriptor] + let keysToFetch: [CNKeyDescriptor] = [CNContactFormatter.descriptorForRequiredKeys(for: .fullName), CNContactPhoneNumbersKey as CNKeyDescriptor, CNContactUrlAddressesKey as CNKeyDescriptor] let request = CNContactFetchRequest(keysToFetch: keysToFetch) request.unifyResults = true @@ -67,8 +67,8 @@ private final class DeviceContactDataModernContext: DeviceContactDataContext { let _ = try? self.store.enumerateContacts(with: request, usingBlock: { contact, _ in let stableIdAndContact = DeviceContactDataModernContext.parseContact(contact) result[stableIdAndContact.0] = stableIdAndContact.1 - for address in contact.instantMessageAddresses { - if address.value.service == "Telegram", let peerId = parseAppSpecificContactReference(address.value.username) { + for address in contact.urlAddresses { + if address.label == "Telegram", let peerId = parseAppSpecificContactReference(address.value as String) { references[peerId] = DeviceContactBasicDataWithReference(stableId: stableIdAndContact.0, basicData: stableIdAndContact.1) } } diff --git a/submodules/TelegramUI/TelegramUI/DeviceContactInfoController.swift b/submodules/TelegramUI/TelegramUI/DeviceContactInfoController.swift index 0e98bfd60b..9e1d716d16 100644 --- a/submodules/TelegramUI/TelegramUI/DeviceContactInfoController.swift +++ b/submodules/TelegramUI/TelegramUI/DeviceContactInfoController.swift @@ -16,6 +16,7 @@ private enum DeviceContactInfoAction { private final class DeviceContactInfoControllerArguments { let account: Account + let isPlain: Bool let updateEditingName: (ItemListAvatarAndNameInfoItemName) -> Void let updatePhone: (Int64, String) -> Void let updatePhoneLabel: (Int64, String) -> Void @@ -28,9 +29,11 @@ private final class DeviceContactInfoControllerArguments { let openUrl: (String) -> Void let openAddress: (DeviceContactAddressData) -> Void let displayCopyContextMenu: (DeviceContactInfoEntryTag, String) -> Void + let updateShareViaException: (Bool) -> Void - init(account: Account, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, updatePhone: @escaping (Int64, String) -> Void, updatePhoneLabel: @escaping (Int64, String) -> Void, deletePhone: @escaping (Int64) -> Void, setPhoneIdWithRevealedOptions: @escaping (Int64?, Int64?) -> Void, addPhoneNumber: @escaping () -> Void, performAction: @escaping (DeviceContactInfoAction) -> Void, toggleSelection: @escaping (DeviceContactInfoDataId) -> Void, callPhone: @escaping (String) -> Void, openUrl: @escaping (String) -> Void, openAddress: @escaping (DeviceContactAddressData) -> Void, displayCopyContextMenu: @escaping (DeviceContactInfoEntryTag, String) -> Void) { + init(account: Account, isPlain: Bool, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, updatePhone: @escaping (Int64, String) -> Void, updatePhoneLabel: @escaping (Int64, String) -> Void, deletePhone: @escaping (Int64) -> Void, setPhoneIdWithRevealedOptions: @escaping (Int64?, Int64?) -> Void, addPhoneNumber: @escaping () -> Void, performAction: @escaping (DeviceContactInfoAction) -> Void, toggleSelection: @escaping (DeviceContactInfoDataId) -> Void, callPhone: @escaping (String) -> Void, openUrl: @escaping (String) -> Void, openAddress: @escaping (DeviceContactAddressData) -> Void, displayCopyContextMenu: @escaping (DeviceContactInfoEntryTag, String) -> Void, updateShareViaException: @escaping (Bool) -> Void) { self.account = account + self.isPlain = isPlain self.updateEditingName = updateEditingName self.updatePhone = updatePhone self.updatePhoneLabel = updatePhoneLabel @@ -43,6 +46,7 @@ private final class DeviceContactInfoControllerArguments { self.openUrl = openUrl self.openAddress = openAddress self.displayCopyContextMenu = displayCopyContextMenu + self.updateShareViaException = updateShareViaException } } @@ -50,6 +54,7 @@ private enum DeviceContactInfoSection: ItemListSectionId { case info case editing case data + case share } private enum DeviceContactInfoEntryTag: Equatable, ItemListItemTag { @@ -83,6 +88,8 @@ private enum DeviceContactInfoConstantEntryId: Hashable { case birthday case addPhoneNumber case phoneNumberSharingInfo + case phoneNumberShareViaException + case phoneNumberShareViaExceptionInfo } private enum DeviceContactInfoEntryId: Hashable { @@ -97,7 +104,7 @@ private enum DeviceContactInfoEntryId: Hashable { } private enum DeviceContactInfoEntry: ItemListNodeEntry { - case info(Int, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, peer: Peer, state: ItemListAvatarAndNameInfoItemState, job: String?) + case info(Int, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, peer: Peer, state: ItemListAvatarAndNameInfoItemState, job: String?, isPlain: Bool) case invite(Int, PresentationTheme, String) case sendMessage(Int, PresentationTheme, String) @@ -108,6 +115,8 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { case phoneNumber(Int, Int, PresentationTheme, String, String, String, Bool?, Bool) case editingPhoneNumber(Int, PresentationTheme, PresentationStrings, Int64, String, String, String, Bool) case phoneNumberSharingInfo(Int, PresentationTheme, String) + case phoneNumberShareViaException(Int, PresentationTheme, String, Bool) + case phoneNumberShareViaExceptionInfo(Int, PresentationTheme, String) case addPhoneNumber(Int, PresentationTheme, String) case email(Int, Int, PresentationTheme, String, String, String, Bool?) case url(Int, Int, PresentationTheme, String, String, String, Bool?) @@ -124,6 +133,8 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { return DeviceContactInfoSection.editing.rawValue case .invite, .sendMessage, .createContact, .addToExisting: return DeviceContactInfoSection.info.rawValue + case .phoneNumberShareViaException, .phoneNumberShareViaExceptionInfo: + return DeviceContactInfoSection.share.rawValue default: return DeviceContactInfoSection.data.rawValue } @@ -147,6 +158,10 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { return .phoneNumber(catIndex) case .phoneNumberSharingInfo: return .constant(.phoneNumberSharingInfo) + case .phoneNumberShareViaException: + return .constant(.phoneNumberShareViaException) + case .phoneNumberShareViaExceptionInfo: + return .constant(.phoneNumberShareViaExceptionInfo) case let .editingPhoneNumber(_, _, _, id, _, _, _, _): return .editingPhoneNumber(id) case .addPhoneNumber: @@ -168,8 +183,8 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { static func ==(lhs: DeviceContactInfoEntry, rhs: DeviceContactInfoEntry) -> Bool { switch lhs { - case let .info(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsPeer, lhsState, lhsJobSummary): - if case let .info(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsPeer, rhsState, rhsJobSummary) = rhs { + case let .info(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsPeer, lhsState, lhsJobSummary, lhsIsPlain): + if case let .info(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsPeer, rhsState, rhsJobSummary, rhsIsPlain) = rhs { if lhsIndex != rhsIndex { return false } @@ -191,6 +206,9 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { if lhsJobSummary != rhsJobSummary { return false } + if lhsIsPlain != rhsIsPlain { + return false + } return true } else { return false @@ -237,6 +255,18 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { } else { return false } + case let .phoneNumberShareViaException(lhsIndex, lhsTheme, lhsText, lhsValue): + if case let .phoneNumberShareViaException(rhsIndex, rhsTheme, rhsText, rhsValue) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue { + return true + } else { + return false + } + case let .phoneNumberShareViaExceptionInfo(lhsIndex, lhsTheme, lhsText): + if case let .phoneNumberShareViaExceptionInfo(rhsIndex, rhsTheme, rhsText) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } case let .editingPhoneNumber(lhsIndex, lhsTheme, lhsStrings, lhsId, lhsTitle, lhsLabel, lhsValue, lhsSelected): if case let .editingPhoneNumber(rhsIndex, rhsTheme, rhsStrings, rhsId, rhsTitle, rhsLabel, rhsValue, rhsSelected) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsId == rhsId, lhsTitle == rhsTitle, lhsLabel == rhsLabel, lhsValue == rhsValue, lhsSelected == rhsSelected { return true @@ -290,7 +320,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { private var sortIndex: Int { switch self { - case let .info(index, _, _, _, _, _, _): + case let .info(index, _, _, _, _, _, _, _): return index case let .sendMessage(index, _, _): return index @@ -306,6 +336,10 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { return index case let .phoneNumberSharingInfo(index, _, _): return index + case let .phoneNumberShareViaException(index, _, _, _): + return index + case let .phoneNumberShareViaExceptionInfo(index, _, _): + return index case let .editingPhoneNumber(index, _, _, _, _, _, _, _): return index case let .addPhoneNumber(index, _, _): @@ -331,44 +365,50 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { func item(_ arguments: DeviceContactInfoControllerArguments) -> ListViewItem { switch self { - case let .info(_, theme, strings, dateTimeFormat, peer, state, jobSummary): - return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .contact, peer: peer, presence: nil, label: jobSummary, cachedData: nil, state: state, sectionId: self.section, style: .plain, editingNameUpdated: { editingName in + case let .info(_, theme, strings, dateTimeFormat, peer, state, jobSummary, isPlain): + return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .contact, peer: peer, presence: nil, label: jobSummary, cachedData: nil, state: state, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks(withTopInset: false, withExtendedBottomInset: true), editingNameUpdated: { editingName in arguments.updateEditingName(editingName) }, avatarTapped: { }, context: nil, call: nil) case let .sendMessage(_, theme, title): - return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: { + return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks, action: { arguments.performAction(.sendMessage) }) case let .invite(_, theme, title): - return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: { + return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks, action: { arguments.performAction(.invite) }) case let .createContact(_, theme, title): - return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: { + return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks, action: { arguments.performAction(.createContact) }) case let .addToExisting(_, theme, title): - return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: { + return ItemListActionItem(theme: theme, title: title, kind: .generic, alignment: .natural, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks, action: { arguments.performAction(.addToExisting) }) case let .company(_, theme, title, value, selected): - return ItemListTextWithLabelItem(theme: theme, label: title, text: value, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { + return ItemListTextWithLabelItem(theme: theme, label: title, text: value, style: arguments.isPlain ? .plain : .blocks, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { }, tag: nil) case let .phoneNumber(_, index, theme, title, label, value, selected, isInteractionEnabled): - return ItemListTextWithLabelItem(theme: theme, label: title, text: value, textColor: .accent, enabledEntitiyTypes: [], multiline: false, selected: selected, sectionId: self.section, action: isInteractionEnabled ? { + return ItemListTextWithLabelItem(theme: theme, label: title, text: value, style: arguments.isPlain ? .plain : .blocks, textColor: .accent, enabledEntitiyTypes: [], multiline: false, selected: selected, sectionId: self.section, action: isInteractionEnabled ? { if selected != nil { arguments.toggleSelection(.phoneNumber(label, value)) } else { arguments.callPhone(value) } - } : nil, longTapAction: { + } : nil, longTapAction: isInteractionEnabled ? { if selected == nil { arguments.displayCopyContextMenu(.info(index), value) } - }, tag: DeviceContactInfoEntryTag.info(index)) + } : nil, tag: DeviceContactInfoEntryTag.info(index)) case let .phoneNumberSharingInfo(_, theme, text): return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section) + case let .phoneNumberShareViaException(_, theme, text, value): + return ItemListSwitchItem(theme: theme, title: text, value: value, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks, updated: { value in + arguments.updateShareViaException(value) + }) + case let .phoneNumberShareViaExceptionInfo(_, theme, text): + return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section) case let .editingPhoneNumber(_, theme, strings, id, title, label, value, hasActiveRevealControls): return UserInfoEditingPhoneItem(theme: theme, strings: strings, id: id, label: title, value: value, editing: UserInfoEditingPhoneItemEditing(editable: true, hasActiveRevealControls: hasActiveRevealControls), sectionId: self.section, setPhoneIdWithRevealedOptions: { lhs, rhs in arguments.setPhoneIdWithRevealedOptions(lhs, rhs) @@ -384,7 +424,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { arguments.addPhoneNumber() }) case let .email(_, index, theme, title, label, value, selected): - return ItemListTextWithLabelItem(theme: theme, label: title, text: value, textColor: .accent, enabledEntitiyTypes: [], multiline: false, selected: selected, sectionId: self.section, action: { + return ItemListTextWithLabelItem(theme: theme, label: title, text: value, style: arguments.isPlain ? .plain : .blocks, textColor: .accent, enabledEntitiyTypes: [], multiline: false, selected: selected, sectionId: self.section, action: { if selected != nil { arguments.toggleSelection(.email(label, value)) } else { @@ -396,7 +436,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { } }, tag: DeviceContactInfoEntryTag.info(index)) case let .url(_, index, theme, title, label, value, selected): - return ItemListTextWithLabelItem(theme: theme, label: title, text: value, textColor: .accent, enabledEntitiyTypes: [], multiline: false, selected: selected, sectionId: self.section, action: { + return ItemListTextWithLabelItem(theme: theme, label: title, text: value, style: arguments.isPlain ? .plain : .blocks, textColor: .accent, enabledEntitiyTypes: [], multiline: false, selected: selected, sectionId: self.section, action: { if selected != nil { arguments.toggleSelection(.url(label, value)) } else { @@ -423,7 +463,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { combineComponent(string: &string, component: value.city) combineComponent(string: &string, component: value.country) combineComponent(string: &string, component: value.postcode) - return ItemListAddressItem(theme: theme, label: title, text: string, imageSignal: imageSignal, selected: selected, sectionId: self.section, action: { + return ItemListAddressItem(theme: theme, label: title, text: string, imageSignal: imageSignal, selected: selected, sectionId: self.section, style: .plain, action: { if selected != nil { arguments.toggleSelection(.address(value)) } else { @@ -435,7 +475,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { } }, tag: DeviceContactInfoEntryTag.info(index)) case let .birthday(_, theme, title, value, text, selected): - return ItemListTextWithLabelItem(theme: theme, label: title, text: text, textColor: .accent, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { + return ItemListTextWithLabelItem(theme: theme, label: title, text: text, style: arguments.isPlain ? .plain : .blocks, textColor: .accent, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { if selected != nil { arguments.toggleSelection(.birthday) } else { @@ -464,7 +504,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { } }, tag: DeviceContactInfoEntryTag.birthday) case let .socialProfile(_, index, theme, title, value, text, selected): - return ItemListTextWithLabelItem(theme: theme, label: title, text: text, textColor: .accent, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { + return ItemListTextWithLabelItem(theme: theme, label: title, text: text, style: arguments.isPlain ? .plain : .blocks, textColor: .accent, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { if selected != nil { arguments.toggleSelection(.socialProfile(value)) } else if value.url.count > 0 { @@ -476,7 +516,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { } }, tag: DeviceContactInfoEntryTag.info(index)) case let .instantMessenger(_, index, theme, title, value, text, selected): - return ItemListTextWithLabelItem(theme: theme, label: title, text: text, textColor: .accent, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { + return ItemListTextWithLabelItem(theme: theme, label: title, text: text, style: arguments.isPlain ? .plain : .blocks, textColor: .accent, enabledEntitiyTypes: [], multiline: true, selected: selected, sectionId: self.section, action: { if selected != nil { arguments.toggleSelection(.instantMessenger(value)) } @@ -501,6 +541,7 @@ private struct EditingPhoneNumber: Equatable { private struct DeviceContactInfoState: Equatable { var savingData: Bool = false + var addToPrivacyExceptions: Bool = true var editingState: DeviceContactInfoEditingState? = nil var excludedComponents = Set() var phoneNumbers: [EditingPhoneNumber] = [] @@ -533,7 +574,7 @@ private func filteredContactData(contactData: DeviceContactExtendedData, exclude return DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumbers: phoneNumbers), middleName: contactData.middleName, prefix: contactData.prefix, suffix: contactData.suffix, organization: includeJob ? contactData.organization : "", jobTitle: includeJob ? contactData.jobTitle : "", department: includeJob ? contactData.department : "", emailAddresses: emailAddresses, urls: urls, addresses: addresses, birthdayDate: includeBirthday ? contactData.birthdayDate : nil, socialProfiles: socialProfiles, instantMessagingProfiles: instantMessagingProfiles) } -private func deviceContactInfoEntries(account: Account, presentationData: PresentationData, peer: Peer?, isShare: Bool, contactData: DeviceContactExtendedData, isContact: Bool, state: DeviceContactInfoState, selecting: Bool, editingPhoneNumbers: Bool) -> [DeviceContactInfoEntry] { +private func deviceContactInfoEntries(account: Account, presentationData: PresentationData, peer: Peer?, isShare: Bool, shareViaException: Bool, contactData: DeviceContactExtendedData, isContact: Bool, state: DeviceContactInfoState, selecting: Bool, editingPhoneNumbers: Bool) -> [DeviceContactInfoEntry] { var entries: [DeviceContactInfoEntry] = [] var editingName: ItemListAvatarAndNameInfoItemName? @@ -566,7 +607,7 @@ private func deviceContactInfoEntries(account: Account, presentationData: Presen let isOrganization = personName.0.isEmpty && personName.1.isEmpty && !contactData.organization.isEmpty - entries.append(.info(entries.count, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer: peer ?? TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: isOrganization ? contactData.organization : personName.0, lastName: isOrganization ? nil : personName.1, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), state: ItemListAvatarAndNameInfoItemState(editingName: editingName, updatingName: nil), job: isOrganization ? nil : jobSummary)) + entries.append(.info(entries.count, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer: peer ?? TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: isOrganization ? contactData.organization : personName.0, lastName: isOrganization ? nil : personName.1, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), state: ItemListAvatarAndNameInfoItemState(editingName: editingName, updatingName: nil), job: isOrganization ? nil : jobSummary, isPlain: !isShare)) if !selecting { if let _ = peer { @@ -593,10 +634,21 @@ private func deviceContactInfoEntries(account: Account, presentationData: Presen numberIndex += 1 } if let peer = peer { - if contactData.basicData.phoneNumbers.isEmpty { - entries.append(.phoneNumberSharingInfo(entries.count, presentationData.theme, presentationData.strings.AddContact_ContactWillBeSharedAfterMutual(peer.compactDisplayTitle).0)) + let personCompactName: String + if !personName.0.isEmpty { + personCompactName = personName.0 + } else if !personName.1.isEmpty { + personCompactName = personName.1 } else { - entries.append(.phoneNumberSharingInfo(entries.count, presentationData.theme, presentationData.strings.AddContact_ContactWillBeSharedNow(peer.compactDisplayTitle).0)) + personCompactName = peer.compactDisplayTitle + } + + if contactData.basicData.phoneNumbers.isEmpty { + entries.append(.phoneNumberSharingInfo(entries.count, presentationData.theme, presentationData.strings.AddContact_ContactWillBeSharedAfterMutual(personCompactName).0)) + } + if shareViaException { + entries.append(.phoneNumberShareViaException(entries.count, presentationData.theme, presentationData.strings.AddContact_SharedContactException, state.addToPrivacyExceptions)) + entries.append(.phoneNumberShareViaExceptionInfo(entries.count, presentationData.theme, presentationData.strings.AddContact_SharedContactExceptionInfo(personCompactName).0)) } } } else { @@ -692,7 +744,7 @@ private func deviceContactInfoEntries(account: Account, presentationData: Presen public enum DeviceContactInfoSubject { case vcard(Peer?, DeviceContactStableId?, DeviceContactExtendedData) case filter(peer: Peer?, contactId: DeviceContactStableId?, contactData: DeviceContactExtendedData, completion: (Peer?, DeviceContactExtendedData) -> Void) - case create(peer: Peer?, contactData: DeviceContactExtendedData, isSharing: Bool, completion: (Peer?, DeviceContactStableId, DeviceContactExtendedData) -> Void) + case create(peer: Peer?, contactData: DeviceContactExtendedData, isSharing: Bool, shareViaException: Bool, completion: (Peer?, DeviceContactStableId, DeviceContactExtendedData) -> Void) var peer: Peer? { switch self { @@ -711,7 +763,7 @@ public enum DeviceContactInfoSubject { return data case let .filter(_, _, data, _): return data - case let .create(_, data, _, _): + case let .create(_, data, _, _, _): return data } } @@ -747,7 +799,7 @@ private final class DeviceContactInfoController: ItemListController Void)? = nil, cancelled: (() -> Void)? = nil) -> ViewController { var initialState = DeviceContactInfoState() - if case let .create(peer, contactData, _, _) = subject { + if case let .create(peer, contactData, _, _, _) = subject { var peerPhoneNumber: String? var firstName = contactData.basicData.firstName var lastName = contactData.basicData.lastName @@ -841,7 +893,21 @@ public func deviceContactInfoController(context: AccountContext, subject: Device }) } - let arguments = DeviceContactInfoControllerArguments(account: context.account, updateEditingName: { editingName in + let contactData: Signal<(Peer?, DeviceContactStableId?, DeviceContactExtendedData), NoError> + var isShare = false + var shareViaException = false + switch subject { + case let .vcard(peer, id, data): + contactData = .single((peer, id, data)) + case let .filter(peer, id, data, _): + contactData = .single((peer, id, data)) + case let .create(peer, data, share, shareViaExceptionValue, _): + contactData = .single((peer, nil, data)) + isShare = share + shareViaException = shareViaExceptionValue + } + + let arguments = DeviceContactInfoControllerArguments(account: context.account, isPlain: !isShare, updateEditingName: { editingName in updateState { state in var state = state if let _ = state.editingState { @@ -918,7 +984,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } case .createContact: - presentControllerImpl?(deviceContactInfoController(context: context, subject: .create(peer: subject.peer, contactData: subject.contactData, isSharing: false, completion: { peer, stableId, contactData in + presentControllerImpl?(deviceContactInfoController(context: context, subject: .create(peer: subject.peer, contactData: subject.contactData, isSharing: false, shareViaException: false, completion: { peer, stableId, contactData in dismissImpl?(false) if let peer = peer { @@ -951,20 +1017,14 @@ public func deviceContactInfoController(context: AccountContext, subject: Device openAddressImpl?(address) }, displayCopyContextMenu: { tag, value in displayCopyContextMenuImpl?(tag, value) + }, updateShareViaException: { value in + updateState { state in + var state = state + state.addToPrivacyExceptions = value + return state + } }) - let contactData: Signal<(Peer?, DeviceContactStableId?, DeviceContactExtendedData), NoError> - var isShare = false - switch subject { - case let .vcard(peer, id, data): - contactData = .single((peer, id, data)) - case let .filter(peer, id, data, _): - contactData = .single((peer, id, data)) - case let .create(peer, data, share, _): - contactData = .single((peer, nil, data)) - isShare = share - } - let previousEditingPhoneIds = Atomic?>(value: nil) let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), contactData) |> map { presentationData, state, peerAndContactData -> (ItemListControllerState, (ItemListNodeState, DeviceContactInfoEntry.ItemGenerationArguments)) in @@ -988,7 +1048,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device completion(peerAndContactData.0, filteredData) dismissImpl?(true) }) - } else if case let .create(createForPeer, _, _, completion) = subject { + } else if case let .create(createForPeer, _, _, _, completion) = subject { let filteredData = filteredContactData(contactData: peerAndContactData.2, excludedComponents: state.excludedComponents) var filteredPhoneNumbers: [DeviceContactPhoneNumberData] = [] for phoneNumber in state.phoneNumbers { @@ -998,34 +1058,36 @@ public func deviceContactInfoController(context: AccountContext, subject: Device } var composedContactData: DeviceContactExtendedData? if let editingName = state.editingState?.editingName, case let .personName(firstName, lastName) = editingName, (!firstName.isEmpty || !lastName.isEmpty) { - var instantMessagingProfiles = filteredData.instantMessagingProfiles + var urls = filteredData.urls if let createForPeer = createForPeer { - let appProfile = DeviceContactInstantMessagingProfileData(appProfile: createForPeer.id) + let appProfile = DeviceContactUrlData(appProfile: createForPeer.id) var found = false - for profile in instantMessagingProfiles { - if profile.service == appProfile.service && profile.username == appProfile.username { + for url in urls { + if url.label == appProfile.label && url.value == appProfile.value { found = true break } } if !found { - instantMessagingProfiles.append(appProfile) + urls.append(appProfile) } } - composedContactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: firstName, lastName: lastName, phoneNumbers: filteredPhoneNumbers), middleName: filteredData.middleName, prefix: filteredData.prefix, suffix: filteredData.suffix, organization: filteredData.organization, jobTitle: filteredData.jobTitle, department: filteredData.department, emailAddresses: filteredData.emailAddresses, urls: filteredData.urls, addresses: filteredData.addresses, birthdayDate: filteredData.birthdayDate, socialProfiles: filteredData.socialProfiles, instantMessagingProfiles: instantMessagingProfiles) + composedContactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: firstName, lastName: lastName, phoneNumbers: filteredPhoneNumbers), middleName: filteredData.middleName, prefix: filteredData.prefix, suffix: filteredData.suffix, organization: filteredData.organization, jobTitle: filteredData.jobTitle, department: filteredData.department, emailAddresses: filteredData.emailAddresses, urls: urls, addresses: filteredData.addresses, birthdayDate: filteredData.birthdayDate, socialProfiles: filteredData.socialProfiles, instantMessagingProfiles: filteredData.instantMessagingProfiles) } rightNavigationButton = ItemListNavigationButton(content: .text(isShare ? presentationData.strings.Common_Done : presentationData.strings.Compose_Create), style: .bold, enabled: (isShare || !filteredPhoneNumbers.isEmpty) && composedContactData != nil, action: { if let composedContactData = composedContactData { + var addToPrivacyExceptions = false updateState { state in var state = state state.savingData = true + addToPrivacyExceptions = state.addToPrivacyExceptions return state } if let contactDataManager = context.sharedContext.contactDataManager { switch subject { - case let .create(peer, _, share, _): + case let .create(peer, _, share, shareViaException, _): if share, filteredPhoneNumbers.count <= 1, let peer = peer { - addContactDisposable.set((addContactInteractively(account: context.account, peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "") + addContactDisposable.set((addContactInteractively(account: context.account, peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "", addToPrivacyExceptions: shareViaException && addToPrivacyExceptions) |> deliverOnMainQueue).start(error: { _ in presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil) }, completed: { @@ -1057,9 +1119,9 @@ public func deviceContactInfoController(context: AccountContext, subject: Device } if filteredPhoneNumbers.count <= 1 { switch subject { - case let .create(peer, _, share, _): + case let .create(peer, _, share, shareViaException, _): if share, let peer = peer { - return addContactInteractively(account: context.account, peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "") + return addContactInteractively(account: context.account, peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "", addToPrivacyExceptions: shareViaException && addToPrivacyExceptions) |> mapToSignal { _ -> Signal<(DeviceContactStableId, DeviceContactExtendedData, Peer?)?, AddContactError> in return .complete() } @@ -1147,7 +1209,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device focusItemTag = DeviceContactInfoEntryTag.editingPhone(insertedPhoneId) } - let listState = ItemListNodeState(entries: deviceContactInfoEntries(account: context.account, presentationData: presentationData, peer: peerAndContactData.0, isShare: isShare, contactData: peerAndContactData.2, isContact: peerAndContactData.1 != nil, state: state, selecting: selecting, editingPhoneNumbers: editingPhones), style: .plain, focusItemTag: focusItemTag) + let listState = ItemListNodeState(entries: deviceContactInfoEntries(account: context.account, presentationData: presentationData, peer: peerAndContactData.0, isShare: isShare, shareViaException: shareViaException, contactData: peerAndContactData.2, isContact: peerAndContactData.1 != nil, state: state, selecting: selecting, editingPhoneNumbers: editingPhones), style: isShare ? .blocks : .plain, focusItemTag: focusItemTag) return (controllerState, (listState, arguments)) } @@ -1270,7 +1332,7 @@ private func addContactToExisting(context: AccountContext, parentController: Vie let _ = (dataSignal |> deliverOnMainQueue).start(next: { peer, stableId in guard let stableId = stableId else { - parentController.present(deviceContactInfoController(context: context, subject: .create(peer: peer, contactData: contactData, isSharing: false, completion: { peer, stableId, contactData in + parentController.present(deviceContactInfoController(context: context, subject: .create(peer: peer, contactData: contactData, isSharing: false, shareViaException: false, completion: { peer, stableId, contactData in })), in: .window(.root)) return @@ -1316,7 +1378,7 @@ func addContactOptionsController(context: AccountContext, peer: Peer?, contactDa controller.setItemGroups([ ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: presentationData.strings.Profile_CreateNewContact, action: { [weak controller] in - controller?.present(deviceContactInfoController(context: context, subject: .create(peer: peer, contactData: contactData, isSharing: peer != nil, completion: { peer, stableId, contactData in + controller?.present(deviceContactInfoController(context: context, subject: .create(peer: peer, contactData: contactData, isSharing: peer != nil, shareViaException: false, completion: { peer, stableId, contactData in if let peer = peer { } else { diff --git a/submodules/TelegramUI/TelegramUI/EditSettingsController.swift b/submodules/TelegramUI/TelegramUI/EditSettingsController.swift index 89375bfce0..a2da800fce 100644 --- a/submodules/TelegramUI/TelegramUI/EditSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/EditSettingsController.swift @@ -183,7 +183,7 @@ private enum SettingsEntry: ItemListNodeEntry { func item(_ arguments: EditSettingsItemArguments) -> ListViewItem { switch self { case let .userInfo(theme, strings, dateTimeFormat, peer, cachedData, state, updatingImage): - return ItemListAvatarAndNameInfoItem(account: arguments.context.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .editSettings, peer: peer, presence: TelegramUserPresence(status: .present(until: Int32.max), lastActivity: 0), cachedData: cachedData, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false), editingNameUpdated: { editingName in + return ItemListAvatarAndNameInfoItem(account: arguments.context.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .editSettings, peer: peer, presence: TelegramUserPresence(status: .present(until: Int32.max), lastActivity: 0), cachedData: cachedData, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in arguments.updateEditingName(editingName) }, avatarTapped: { arguments.avatarTapAction() diff --git a/submodules/TelegramUI/TelegramUI/Geocoding.swift b/submodules/TelegramUI/TelegramUI/Geocoding.swift index 828b7ba6b4..9a39958f09 100644 --- a/submodules/TelegramUI/TelegramUI/Geocoding.swift +++ b/submodules/TelegramUI/TelegramUI/Geocoding.swift @@ -19,12 +19,37 @@ func geocodeLocation(dictionary: [String: String]) -> Signal<(Double, Double)?, } } -func reverseGeocodeLocation(latitude: Double, longitude: Double) -> Signal { +struct ReverseGeocodedPlacemark { + let street: String? + let city: String? + let country: String? + + var fullAddress: String { + var components: [String] = [] + if let street = self.street { + components.append(street) + } + if let city = self.city { + components.append(city) + } + if let country = self.country { + components.append(country) + } + + return components.joined(separator: ", ") + } +} + +func reverseGeocodeLocation(latitude: Double, longitude: Double) -> Signal { return Signal { subscriber in let geocoder = CLGeocoder() geocoder.reverseGeocodeLocation(CLLocation(latitude: latitude, longitude: longitude), completionHandler: { placemarks, _ in - if let placemarks = placemarks, let locality = placemarks.first?.locality { - subscriber.putNext(locality) + if let placemarks = placemarks, let placemark = placemarks.first { + let result = ReverseGeocodedPlacemark(street: placemark.thoroughfare, city: placemark.locality, country: placemark.country) + subscriber.putNext(result) + subscriber.putCompletion() + } else { + subscriber.putNext(nil) subscriber.putCompletion() } }) diff --git a/submodules/TelegramUI/TelegramUI/GroupInfoController.swift b/submodules/TelegramUI/TelegramUI/GroupInfoController.swift index af39048302..08fbe952e4 100644 --- a/submodules/TelegramUI/TelegramUI/GroupInfoController.swift +++ b/submodules/TelegramUI/TelegramUI/GroupInfoController.swift @@ -38,8 +38,9 @@ private final class GroupInfoArguments { let openStickerPackSetup: () -> Void let openGroupTypeSetup: () -> Void let openLinkedChannelSetup: () -> Void + let openLocation: (PeerGeoLocation) -> Void - init(context: AccountContext, avatarAndNameInfoContext: ItemListAvatarAndNameInfoItemContext, tapAvatarAction: @escaping () -> Void, changeProfilePhoto: @escaping () -> Void, pushController: @escaping (ViewController) -> Void, presentController: @escaping (ViewController, ViewControllerPresentationArguments) -> Void, changeNotificationMuteSettings: @escaping () -> Void, openPreHistory: @escaping () -> Void, openSharedMedia: @escaping () -> Void, openAdministrators: @escaping () -> Void, openPermissions: @escaping () -> Void, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, updateEditingDescriptionText: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, addMember: @escaping () -> Void, promotePeer: @escaping (RenderedChannelParticipant) -> Void, restrictPeer: @escaping (RenderedChannelParticipant) -> Void, removePeer: @escaping (PeerId) -> Void, leave: @escaping () -> Void, displayUsernameShareMenu: @escaping (String) -> Void, displayUsernameContextMenu: @escaping (String) -> Void, displayAboutContextMenu: @escaping (String) -> Void, aboutLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> Void, openStickerPackSetup: @escaping () -> Void, openGroupTypeSetup: @escaping () -> Void, openLinkedChannelSetup: @escaping () -> Void) { + init(context: AccountContext, avatarAndNameInfoContext: ItemListAvatarAndNameInfoItemContext, tapAvatarAction: @escaping () -> Void, changeProfilePhoto: @escaping () -> Void, pushController: @escaping (ViewController) -> Void, presentController: @escaping (ViewController, ViewControllerPresentationArguments) -> Void, changeNotificationMuteSettings: @escaping () -> Void, openPreHistory: @escaping () -> Void, openSharedMedia: @escaping () -> Void, openAdministrators: @escaping () -> Void, openPermissions: @escaping () -> Void, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, updateEditingDescriptionText: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, addMember: @escaping () -> Void, promotePeer: @escaping (RenderedChannelParticipant) -> Void, restrictPeer: @escaping (RenderedChannelParticipant) -> Void, removePeer: @escaping (PeerId) -> Void, leave: @escaping () -> Void, displayUsernameShareMenu: @escaping (String) -> Void, displayUsernameContextMenu: @escaping (String) -> Void, displayAboutContextMenu: @escaping (String) -> Void, aboutLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> Void, openStickerPackSetup: @escaping () -> Void, openGroupTypeSetup: @escaping () -> Void, openLinkedChannelSetup: @escaping () -> Void, openLocation: @escaping (PeerGeoLocation) -> Void) { self.context = context self.avatarAndNameInfoContext = avatarAndNameInfoContext self.tapAvatarAction = tapAvatarAction @@ -66,6 +67,7 @@ private final class GroupInfoArguments { self.openStickerPackSetup = openStickerPackSetup self.openGroupTypeSetup = openGroupTypeSetup self.openLinkedChannelSetup = openLinkedChannelSetup + self.openLocation = openLocation } } @@ -138,6 +140,7 @@ private enum GroupInfoEntry: ItemListNodeEntry { case groupDescriptionSetup(PresentationTheme, String, String) case aboutHeader(PresentationTheme, String) case about(PresentationTheme, String) + case location(PresentationTheme, PeerGeoLocation) case link(PresentationTheme, String) case sharedMedia(PresentationTheme, String) case notifications(PresentationTheme, String, String) @@ -155,7 +158,7 @@ private enum GroupInfoEntry: ItemListNodeEntry { switch self { case .info, .setGroupPhoto, .groupDescriptionSetup: return GroupInfoSection.info.rawValue - case .aboutHeader, .about, .link: + case .aboutHeader, .about, .link, .location: return GroupInfoSection.about.rawValue case .groupTypeSetup, .linkedChannelSetup, .preHistory, .stickerPack: return GroupInfoSection.infoManagement.rawValue @@ -249,6 +252,12 @@ private enum GroupInfoEntry: ItemListNodeEntry { } else { return false } + case let .location(lhsTheme, lhsLocation): + if case let .location(rhsTheme, rhsLocation) = rhs, lhsTheme === rhsTheme, lhsLocation == rhsLocation { + return true + } else { + return false + } case let .notifications(lhsTheme, lhsTitle, lhsText): if case let .notifications(rhsTheme, rhsTitle, rhsText) = rhs { if lhsTheme !== rhsTheme { @@ -393,6 +402,8 @@ private enum GroupInfoEntry: ItemListNodeEntry { return 5 case .link: return 6 + case .location: + return 7 case .groupTypeSetup: return 8 case .linkedChannelSetup: @@ -425,7 +436,7 @@ private enum GroupInfoEntry: ItemListNodeEntry { func item(_ arguments: GroupInfoArguments) -> ListViewItem { switch self { case let .info(theme, strings, dateTimeFormat, peer, cachedData, state, updatingAvatar): - return ItemListAvatarAndNameInfoItem(account: arguments.context.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: cachedData, state: state, sectionId: self.section, style: .blocks(withTopInset: false), editingNameUpdated: { editingName in + return ItemListAvatarAndNameInfoItem(account: arguments.context.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: cachedData, state: state, sectionId: self.section, style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in arguments.updateEditingName(editingName) }, avatarTapped: { arguments.tapAvatarAction() @@ -448,6 +459,12 @@ private enum GroupInfoEntry: ItemListNodeEntry { }, longTapAction: { arguments.displayUsernameContextMenu(url) }, tag: GroupInfoEntryTag.link) + case let .location(theme, location): + let imageSignal = chatMapSnapshotImage(account: arguments.context.account, resource: MapSnapshotMediaResource(latitude: location.latitude, longitude: location.longitude, width: 90, height: 90)) + return ItemListAddressItem(theme: theme, label: "", text: location.address, imageSignal: imageSignal, selected: nil, sectionId: self.section, style: .blocks, action: { + arguments.openLocation(location) + }, longTapAction: { + }) case let .notifications(theme, title, text): return ItemListDisclosureItem(theme: theme, title: title, label: text, sectionId: self.section, style: .blocks, action: { arguments.changeNotificationMuteSettings() @@ -840,6 +857,10 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa } if let peer = view.peers[view.peerId] as? TelegramChannel, let username = peer.username, !username.isEmpty { entries.append(.link(presentationData.theme, "t.me/" + username)) + + if let location = cachedChannelData.peerGeoLocation { + entries.append(.location(presentationData.theme, location)) + } } } else if let cachedGroupData = view.cachedData as? CachedGroupData { if let about = cachedGroupData.about, !about.isEmpty { @@ -1927,6 +1948,17 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: |> deliverOnMainQueue).start(next: { peerView in pushControllerImpl?(channelDiscussionGroupSetupController(context: context, peerId: peerView.peerId)) }) + }, openLocation: { location in + let _ = (peerView.get() + |> take(1) + |> deliverOnMainQueue).start(next: { peerView in + guard let peer = peerView.peers[peerView.peerId] else { + return + } + let mapMedia = TelegramMediaMap(latitude: location.latitude, longitude: location.longitude, geoPlace: nil, venue: MapVenue(title: peer.displayTitle, address: location.address, provider: nil, id: nil, type: nil), liveBroadcastingTimeout: nil) + let controller = legacyLocationController(message: nil, mapMedia: mapMedia, context: context, isModal: false, openPeer: { _ in }, sendLiveLocation: { _, _ in }, stopLiveLocation: {}, openUrl: { _ in }) + pushControllerImpl?(controller) + }) }) let loadMoreControl = Atomic<(PeerId, PeerChannelMemberCategoryControl)?>(value: nil) diff --git a/submodules/TelegramUI/TelegramUI/ItemListAddressItem.swift b/submodules/TelegramUI/TelegramUI/ItemListAddressItem.swift index 29e7f877c7..769ae5853a 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListAddressItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListAddressItem.swift @@ -12,19 +12,21 @@ final class ItemListAddressItem: ListViewItem, ItemListItem { let imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? let selected: Bool? let sectionId: ItemListSectionId + let style: ItemListStyle let action: (() -> Void)? let longTapAction: (() -> Void)? let linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? let tag: Any? - init(theme: PresentationTheme, label: String, text: String, imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?, selected: Bool? = nil, sectionId: ItemListSectionId, action: (() -> Void)?, longTapAction: (() -> Void)? = nil, linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil, tag: Any? = nil) { + init(theme: PresentationTheme, label: String, text: String, imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?, selected: Bool? = nil, sectionId: ItemListSectionId, style: ItemListStyle, action: (() -> Void)?, longTapAction: (() -> Void)? = nil, linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil, tag: Any? = nil) { self.theme = theme self.label = label self.text = text self.imageSignal = imageSignal self.selected = selected self.sectionId = sectionId + self.style = style self.action = action self.longTapAction = longTapAction self.linkItemAction = linkItemAction @@ -145,11 +147,24 @@ class ItemListAddressItemNode: ListViewItemNode { updatedTheme = item.theme } - let insets = itemListNeighborsPlainInsets(neighbors) + let insets: UIEdgeInsets let leftInset: CGFloat = 16.0 + params.leftInset let rightInset: CGFloat = 8.0 + params.rightInset let separatorHeight = UIScreenPixel + let itemBackgroundColor: UIColor + let itemSeparatorColor: UIColor + switch item.style { + case .plain: + itemBackgroundColor = item.theme.list.plainBackgroundColor + itemSeparatorColor = item.theme.list.itemPlainSeparatorColor + insets = itemListNeighborsPlainInsets(neighbors) + case .blocks: + itemBackgroundColor = item.theme.list.itemBlocksBackgroundColor + itemSeparatorColor = item.theme.list.itemBlocksSeparatorColor + insets = itemListNeighborsGroupedInsets(neighbors) + } + var leftOffset: CGFloat = 0.0 var selectionNodeWidthAndApply: (CGFloat, (CGSize, Bool) -> ItemListSelectableControlNode)? if let selected = item.selected { @@ -165,7 +180,8 @@ class ItemListAddressItemNode: ListViewItemNode { let string = stringWithAppliedEntities(item.text, entities: [], baseColor: baseColor, linkColor: item.theme.list.itemAccentColor, baseFont: textFont, linkFont: textFont, boldFont: textBoldFont, italicFont: textItalicFont, fixedFont: textFixedFont) let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: string, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - leftOffset - leftInset - rightInset - 98.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let contentSize = CGSize(width: params.width, height: textLayout.size.height + 39.0) + var padding: CGFloat = !item.label.isEmpty ? 39.0 : 20.0 + let contentSize = CGSize(width: params.width, height: textLayout.size.height + padding) let imageSide = min(90.0, contentSize.height - 18.0) let imageSize = CGSize(width: imageSide, height: imageSide) @@ -189,9 +205,9 @@ class ItemListAddressItemNode: ListViewItemNode { } if let _ = updatedTheme { - strongSelf.topStripeNode.backgroundColor = item.theme.list.itemPlainSeparatorColor - strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemPlainSeparatorColor - strongSelf.backgroundNode.backgroundColor = item.theme.list.plainBackgroundColor + strongSelf.topStripeNode.backgroundColor = itemSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor + strongSelf.backgroundNode.backgroundColor = itemBackgroundColor strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor } @@ -220,12 +236,11 @@ class ItemListAddressItemNode: ListViewItemNode { } strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: leftOffset + leftInset, y: 11.0), size: labelLayout.size) - strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftOffset + leftInset, y: 31.0), size: textLayout.size) + strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftOffset + leftInset, y: item.label.isEmpty ? 11.0 : 31.0), size: textLayout.size) strongSelf.imageNode.frame = CGRect(origin: CGPoint(x: params.width - imageSize.width - rightInset, y: floorToScreenPixels((contentSize.height - imageSize.height) / 2.0)), size: imageSize) let leftInset: CGFloat - let style = ItemListStyle.plain - switch style { + switch item.style { case .plain: leftInset = 16.0 + params.leftInset + leftOffset diff --git a/submodules/TelegramUI/TelegramUI/ItemListAvatarAndNameItem.swift b/submodules/TelegramUI/TelegramUI/ItemListAvatarAndNameItem.swift index 867df57c47..f265a1e277 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListAvatarAndNameItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListAvatarAndNameItem.swift @@ -118,7 +118,7 @@ final class ItemListAvatarAndNameInfoItemContext { enum ItemListAvatarAndNameInfoItemStyle { case plain - case blocks(withTopInset: Bool) + case blocks(withTopInset: Bool, withExtendedBottomInset: Bool) } enum ItemListAvatarAndNameInfoItemUpdatingAvatar: Equatable { @@ -490,7 +490,7 @@ class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNode, Ite let separatorHeight = UIScreenPixel let contentSize: CGSize - let insets: UIEdgeInsets + var insets: UIEdgeInsets let itemBackgroundColor: UIColor let itemSeparatorColor: UIColor switch item.style { @@ -499,7 +499,7 @@ class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNode, Ite itemSeparatorColor = item.theme.list.itemPlainSeparatorColor contentSize = CGSize(width: params.width, height: 96.0) insets = itemListNeighborsPlainInsets(neighbors) - case let .blocks(withTopInset): + case let .blocks(withTopInset, withExtendedBottomInset): itemBackgroundColor = item.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: 92.0) @@ -514,6 +514,9 @@ class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNode, Ite topInset = separatorHeight + 35.0 } insets = UIEdgeInsets(top: topInset, left: 0.0, bottom: separatorHeight, right: 0.0) + if withExtendedBottomInset { + insets.bottom += 12.0 + } } } @@ -624,7 +627,7 @@ class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNode, Ite strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: params.width, height: contentSize.height)) strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: contentSize.height + UIScreenPixel)) strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layoutSize.width, height: separatorHeight)) - strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: layoutSize.height - insets.top - separatorHeight), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight)) + strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: layoutSize.height - insets.top - insets.bottom), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight)) } let _ = nameNodeApply() diff --git a/submodules/TelegramUI/TelegramUI/ItemListItem.swift b/submodules/TelegramUI/TelegramUI/ItemListItem.swift index 6e0efcd790..6ace1c8d6d 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListItem.swift @@ -35,9 +35,15 @@ protocol ItemListItemFocusableNode { func focus() } +enum ItemListInsetWithOtherSection { + case none + case full + case reduced +} + enum ItemListNeighbor { case none - case otherSection(requestsNoInset: Bool) + case otherSection(ItemListInsetWithOtherSection) case sameSection(alwaysPlain: Bool) } @@ -50,7 +56,17 @@ func itemListNeighbors(item: ItemListItem, topItem: ItemListItem?, bottomItem: I let topNeighbor: ItemListNeighbor if let topItem = topItem { if topItem.sectionId != item.sectionId { - topNeighbor = .otherSection(requestsNoInset: topItem.requestsNoInset) + let topInset: ItemListInsetWithOtherSection + if topItem.requestsNoInset { + topInset = .none + } else { + if topItem is ItemListTextItem { + topInset = .reduced + } else { + topInset = .full + } + } + topNeighbor = .otherSection(topInset) } else { topNeighbor = .sameSection(alwaysPlain: topItem.isAlwaysPlain) } @@ -61,7 +77,13 @@ func itemListNeighbors(item: ItemListItem, topItem: ItemListItem?, bottomItem: I let bottomNeighbor: ItemListNeighbor if let bottomItem = bottomItem { if bottomItem.sectionId != item.sectionId { - bottomNeighbor = .otherSection(requestsNoInset: bottomItem.requestsNoInset) + let bottomInset: ItemListInsetWithOtherSection + if bottomItem.requestsNoInset { + bottomInset = .none + } else { + bottomInset = .full + } + bottomNeighbor = .otherSection(bottomInset) } else { bottomNeighbor = .sameSection(alwaysPlain: bottomItem.isAlwaysPlain) } @@ -96,11 +118,14 @@ func itemListNeighborsGroupedInsets(_ neighbors: ItemListNeighbors) -> UIEdgeIns topInset = UIScreenPixel + 35.0 case .sameSection: topInset = 0.0 - case let .otherSection(requestsNoInset): - if requestsNoInset { - topInset = 0.0 - } else { - topInset = UIScreenPixel + 35.0 + case let .otherSection(otherInset): + switch otherInset { + case .none: + topInset = 0.0 + case .full: + topInset = UIScreenPixel + 35.0 + case .reduced: + topInset = UIScreenPixel + 16.0 } } let bottomInset: CGFloat diff --git a/submodules/TelegramUI/TelegramUI/ItemListPeerActionItem.swift b/submodules/TelegramUI/TelegramUI/ItemListPeerActionItem.swift index c1027c47af..f7997746d5 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListPeerActionItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListPeerActionItem.swift @@ -146,7 +146,7 @@ class ItemListPeerActionItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel let insets = itemListNeighborsGroupedInsets(neighbors) - let contentSize = CGSize(width: params.width, height: 44.0) + let contentSize = CGSize(width: params.width, height: 50.0) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size @@ -167,7 +167,6 @@ class ItemListPeerActionItemNode: ListViewItemNode { let _ = titleApply() - let transition: ContainedViewLayoutTransition if animated { transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring) @@ -210,9 +209,9 @@ class ItemListPeerActionItemNode: ListViewItemNode { strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight)) transition.updateFrame(node: strongSelf.bottomStripeNode, frame: CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))) - transition.updateFrame(node: strongSelf.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + editingOffset, y: 11.0), size: titleLayout.size)) + transition.updateFrame(node: strongSelf.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + editingOffset, y: 14.0), size: titleLayout.size)) - strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: 44.0 + UIScreenPixel + UIScreenPixel)) + strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: 50.0 + UIScreenPixel + UIScreenPixel)) } }) } diff --git a/submodules/TelegramUI/TelegramUI/ItemListPlaceholderItem.swift b/submodules/TelegramUI/TelegramUI/ItemListPlaceholderItem.swift index f6c8392166..9f8ebed1b0 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListPlaceholderItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListPlaceholderItem.swift @@ -187,7 +187,7 @@ class ItemListPlaceholderItemNode: ListViewItemNode, ItemListItemNode { strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight)) } - strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 17.0), size: textLayout.size) + strongSelf.textNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((params.width - textLayout.size.width) / 2.0), y: 17.0), size: textLayout.size) } }) } diff --git a/submodules/TelegramUI/TelegramUI/ItemListTextWithLabelItem.swift b/submodules/TelegramUI/TelegramUI/ItemListTextWithLabelItem.swift index 18944d6b0a..14fb93fac4 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListTextWithLabelItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListTextWithLabelItem.swift @@ -15,6 +15,7 @@ final class ItemListTextWithLabelItem: ListViewItem, ItemListItem { let theme: PresentationTheme let label: String let text: String + let style: ItemListStyle let labelColor: ItemListTextWithLabelItemTextColor let textColor: ItemListTextWithLabelItemTextColor let enabledEntitiyTypes: EnabledEntityTypes @@ -27,10 +28,11 @@ final class ItemListTextWithLabelItem: ListViewItem, ItemListItem { let tag: Any? - init(theme: PresentationTheme, label: String, text: String, labelColor: ItemListTextWithLabelItemTextColor = .primary, textColor: ItemListTextWithLabelItemTextColor = .primary, enabledEntitiyTypes: EnabledEntityTypes, multiline: Bool, selected: Bool? = nil, sectionId: ItemListSectionId, action: (() -> Void)?, longTapAction: (() -> Void)? = nil, linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil, tag: Any? = nil) { + init(theme: PresentationTheme, label: String, text: String, style: ItemListStyle = .plain, labelColor: ItemListTextWithLabelItemTextColor = .primary, textColor: ItemListTextWithLabelItemTextColor = .primary, enabledEntitiyTypes: EnabledEntityTypes, multiline: Bool, selected: Bool? = nil, sectionId: ItemListSectionId, action: (() -> Void)?, longTapAction: (() -> Void)? = nil, linkItemAction: ((TextLinkItemActionType, TextLinkItem) -> Void)? = nil, tag: Any? = nil) { self.theme = theme self.label = label self.text = text + self.style = style self.labelColor = labelColor self.textColor = textColor self.enabledEntitiyTypes = enabledEntitiyTypes @@ -226,9 +228,16 @@ class ItemListTextWithLabelItemNode: ListViewItemNode { strongSelf.accessibilityValue = item.text if let _ = updatedTheme { - strongSelf.topStripeNode.backgroundColor = item.theme.list.itemPlainSeparatorColor - strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemPlainSeparatorColor - strongSelf.backgroundNode.backgroundColor = item.theme.list.plainBackgroundColor + switch item.style { + case .plain: + strongSelf.topStripeNode.backgroundColor = item.theme.list.itemPlainSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemPlainSeparatorColor + strongSelf.backgroundNode.backgroundColor = item.theme.list.plainBackgroundColor + case .blocks: + strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor + } strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor } @@ -259,8 +268,7 @@ class ItemListTextWithLabelItemNode: ListViewItemNode { strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftOffset + leftInset, y: 31.0), size: textLayout.size) let leftInset: CGFloat - let style = ItemListStyle.plain - switch style { + switch item.style { case .plain: leftInset = 16.0 + params.leftInset + leftOffset diff --git a/submodules/TelegramUI/TelegramUI/LegacyLocationPicker.swift b/submodules/TelegramUI/TelegramUI/LegacyLocationPicker.swift index 597d8b0222..63bfeb7e91 100644 --- a/submodules/TelegramUI/TelegramUI/LegacyLocationPicker.swift +++ b/submodules/TelegramUI/TelegramUI/LegacyLocationPicker.swift @@ -11,9 +11,9 @@ private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) } -func legacyLocationPickerController(context: AccountContext, selfPeer: Peer, peer: Peer, sendLocation: @escaping (CLLocationCoordinate2D, MapVenue?) -> Void, sendLiveLocation: @escaping (CLLocationCoordinate2D, Int32) -> Void, theme: PresentationTheme) -> ViewController { +func legacyLocationPickerController(context: AccountContext, selfPeer: Peer, peer: Peer, sendLocation: @escaping (CLLocationCoordinate2D, MapVenue?) -> Void, sendLiveLocation: @escaping (CLLocationCoordinate2D, Int32) -> Void, theme: PresentationTheme, customLocationPicker: Bool = false) -> ViewController { let legacyController = LegacyController(presentation: .modal(animateIn: true), theme: theme) - let controller = TGLocationPickerController(context: legacyController.context, intent: TGLocationPickerControllerDefaultIntent)! + let controller = TGLocationPickerController(context: legacyController.context, intent: customLocationPicker ? TGLocationPickerControllerCustomLocationIntent : TGLocationPickerControllerDefaultIntent)! controller.peer = makeLegacyPeer(selfPeer) controller.receivingPeer = makeLegacyPeer(peer) controller.pallete = legacyLocationPalette(from: theme) @@ -22,7 +22,7 @@ func legacyLocationPickerController(context: AccountContext, selfPeer: Peer, pee Namespaces.Peer.CloudGroup, Namespaces.Peer.CloudUser ]) - if namespacesWithEnabledLiveLocation.contains(peer.id.namespace) { + if namespacesWithEnabledLiveLocation.contains(peer.id.namespace) && !customLocationPicker { controller.allowLiveLocationSharing = true } let navigationController = TGNavigationController(controllers: [controller])! diff --git a/submodules/TelegramUI/TelegramUI/NotificationExceptionControllerNode.swift b/submodules/TelegramUI/TelegramUI/NotificationExceptionControllerNode.swift index 41c3886a79..71389d719f 100644 --- a/submodules/TelegramUI/TelegramUI/NotificationExceptionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/NotificationExceptionControllerNode.swift @@ -754,7 +754,9 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { requestActivateSearch() } - let presentPeerSettings: (PeerId, @escaping () -> Void) -> Void = { peerId, completion in + let presentPeerSettings: (PeerId, @escaping () -> Void) -> Void = { [weak self] peerId, completion in + (self?.searchDisplayController?.contentNode as? NotificationExceptionsSearchContainerNode)?.listNode.clearHighlightAnimated(true) + let _ = (context.account.postbox.transaction { transaction -> Peer? in return transaction.getPeer(peerId) } @@ -765,6 +767,8 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { return } + let mode = stateValue.with { $0.mode } + dismissInputImpl?() presentControllerImpl?(notificationPeerExceptionController(context: context, peer: peer, mode: mode, updatePeerSound: { peerId, sound in _ = updatePeerSound(peer.id, sound).start(next: { _ in @@ -1117,7 +1121,7 @@ private func preparedNotificationExceptionsSearchContainerTransition(theme: Pres private final class NotificationExceptionsSearchContainerNode: SearchDisplayControllerContentNode { private let dimNode: ASDisplayNode - private let listNode: ListView + let listNode: ListView private var enqueuedTransitions: [NotificationExceptionsSearchContainerTransition] = [] private var hasValidLayout = false diff --git a/submodules/TelegramUI/TelegramUI/NotificationExceptionSettingsController.swift b/submodules/TelegramUI/TelegramUI/NotificationExceptionSettingsController.swift index 38c4ed32b0..d3b68f54e4 100644 --- a/submodules/TelegramUI/TelegramUI/NotificationExceptionSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/NotificationExceptionSettingsController.swift @@ -268,11 +268,9 @@ private struct NotificationExceptionPeerState : Equatable { if let notifications = notifications { self.selectedSound = notifications.messageSound switch notifications.muteState { - case .muted: + case let .muted(until) where until >= Int32.max - 1: self.mode = .alwaysOff - case .unmuted: - self.mode = .alwaysOn - case .default: + default: self.mode = .alwaysOn } self.displayPreviews = notifications.displayPreviews == .hide ? .alwaysOff : .alwaysOn diff --git a/submodules/TelegramUI/TelegramUI/NotificationExceptions.swift b/submodules/TelegramUI/TelegramUI/NotificationExceptions.swift index bb156c002d..332a7f002a 100644 --- a/submodules/TelegramUI/TelegramUI/NotificationExceptions.swift +++ b/submodules/TelegramUI/TelegramUI/NotificationExceptions.swift @@ -158,7 +158,7 @@ public class NotificationExceptionsController: ViewController { } @objc private func removeAllPressed() { - self.controllerNode + self.controllerNode.removeAll() } @objc private func editPressed() { diff --git a/submodules/TelegramUI/TelegramUI/OpenAddContact.swift b/submodules/TelegramUI/TelegramUI/OpenAddContact.swift index e1018e5146..da1669eb36 100644 --- a/submodules/TelegramUI/TelegramUI/OpenAddContact.swift +++ b/submodules/TelegramUI/TelegramUI/OpenAddContact.swift @@ -11,7 +11,7 @@ func openAddContact(context: AccountContext, firstName: String = "", lastName: S switch value { case .allowed: let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: firstName, lastName: lastName, phoneNumbers: [DeviceContactPhoneNumberData(label: label, value: phoneNumber)]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: []) - present(deviceContactInfoController(context: context, subject: .create(peer: nil, contactData: contactData, isSharing: false, completion: { peer, stableId, contactData in + present(deviceContactInfoController(context: context, subject: .create(peer: nil, contactData: contactData, isSharing: false, shareViaException: false, completion: { peer, stableId, contactData in if let peer = peer { if let infoController = peerInfoController(context: context, peer: peer) { pushController(infoController) diff --git a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift b/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift index 203467c240..e2722410ec 100644 --- a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift +++ b/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift @@ -31,7 +31,7 @@ private func chatMessageGalleryControllerData(context: AccountContext, message: switch action.action { case let .photoUpdated(image): if let peer = messageMainPeer(message), let image = image { - let promise: Promise<[AvatarGalleryEntry]> = Promise([AvatarGalleryEntry.image(image.reference, image.representations.map({ ImageRepresentationWithReference(representation: $0, reference: .media(media: .message(message: MessageReference(message), media: media), resource: $0.resource)) }), peer, message.timestamp, nil)]) + let promise: Promise<[AvatarGalleryEntry]> = Promise([AvatarGalleryEntry.image(image.reference, image.representations.map({ ImageRepresentationWithReference(representation: $0, reference: .media(media: .message(message: MessageReference(message), media: media), resource: $0.resource)) }), peer, message.timestamp, nil, message.id)]) let galleryController = AvatarGalleryController(context: context, peer: peer, remoteEntries: promise, replaceRootController: { controller, ready in }) diff --git a/submodules/TelegramUI/TelegramUI/PeerAvatarImageGalleryItem.swift b/submodules/TelegramUI/TelegramUI/PeerAvatarImageGalleryItem.swift index 163a8b415e..4678d64f96 100644 --- a/submodules/TelegramUI/TelegramUI/PeerAvatarImageGalleryItem.swift +++ b/submodules/TelegramUI/TelegramUI/PeerAvatarImageGalleryItem.swift @@ -79,7 +79,7 @@ class PeerAvatarImageGalleryItem: GalleryItem { switch self.entry { case let .topImage(representations, _): content = representations - case let .image(_, representations, _, _, _): + case let .image(_, representations, _, _, _, _): content = representations } @@ -168,7 +168,7 @@ final class PeerAvatarImageGalleryItemNode: ZoomableContentGalleryItemNode { switch entry { case let .topImage(topRepresentations, _): representations = topRepresentations - case let .image(_, imageRepresentations, _, _, _): + case let .image(_, imageRepresentations, _, _, _, _): representations = imageRepresentations } self.imageNode.setSignal(chatAvatarGalleryPhoto(account: self.context.account, representations: representations), dispatchOnDisplayLink: false) @@ -336,7 +336,7 @@ final class PeerAvatarImageGalleryItemNode: ZoomableContentGalleryItemNode { switch entry { case let .topImage(topRepresentations, _): representations = topRepresentations - case let .image(_, imageRepresentations, _, _, _): + case let .image(_, imageRepresentations, _, _, _, _): representations = imageRepresentations } diff --git a/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift b/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift index 60e82d953a..8ea73611da 100644 --- a/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift +++ b/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift @@ -244,6 +244,25 @@ final class PeerChannelMemberCategoriesContextsManager { } } + func transferOwnership(account: Account, peerId: PeerId, memberId: PeerId, password: String) -> Signal { + return updateChannelOwnership(postbox: account.postbox, network: account.network, accountStateManager: account.stateManager, channelId: peerId, memberId: memberId, password: password) + |> deliverOnMainQueue +// |> beforeNext { [weak self] result in +// if let strongSelf = self, let (previous, updated) = result { +// strongSelf.impl.with { impl in +// for (contextPeerId, context) in impl.contexts { +// if peerId == contextPeerId { +// context.replayUpdates([(previous, updated, nil)]) +// } +// } +// } +// } +// } +// |> mapToSignal { _ -> Signal in +// return .complete() +// } + } + func join(account: Account, peerId: PeerId) -> Signal { return joinChannel(account: account, peerId: peerId) |> deliverOnMainQueue diff --git a/submodules/TelegramUI/TelegramUI/PeerPresenceStatusManager.swift b/submodules/TelegramUI/TelegramUI/PeerPresenceStatusManager.swift index 4f388c911f..ef58217189 100644 --- a/submodules/TelegramUI/TelegramUI/PeerPresenceStatusManager.swift +++ b/submodules/TelegramUI/TelegramUI/PeerPresenceStatusManager.swift @@ -15,8 +15,8 @@ final class PeerPresenceStatusManager { } func reset(presence: TelegramUserPresence) { - timer?.invalidate() - timer = nil + self.timer?.invalidate() + self.timer = nil let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 let timeout = userPresenceStringRefreshTimeout(presence, relativeTo: Int32(timestamp)) diff --git a/submodules/TelegramUI/TelegramUI/PeopleNearbyController.swift b/submodules/TelegramUI/TelegramUI/PeersNearbyController.swift similarity index 54% rename from submodules/TelegramUI/TelegramUI/PeopleNearbyController.swift rename to submodules/TelegramUI/TelegramUI/PeersNearbyController.swift index 2eea4ba430..2ec922c17c 100644 --- a/submodules/TelegramUI/TelegramUI/PeopleNearbyController.swift +++ b/submodules/TelegramUI/TelegramUI/PeersNearbyController.swift @@ -9,14 +9,14 @@ import TelegramPresentationData import TelegramUIPreferences private struct PeerNearbyEntry { - let peer: Peer + let peer: (Peer, CachedPeerData?) let expires: Int32 let distance: Int32 } private func arePeersNearbyEqual(_ lhs: PeerNearbyEntry?, _ rhs: PeerNearbyEntry?) -> Bool { if let lhs = lhs, let rhs = rhs { - return lhs.peer.isEqual(rhs.peer) && lhs.expires == rhs.expires && lhs.distance == rhs.distance + return lhs.peer.0.isEqual(rhs.peer.0) && lhs.expires == rhs.expires && lhs.distance == rhs.distance } else { return (lhs != nil) == (rhs != nil) } @@ -27,14 +27,14 @@ private func arePeerNearbyArraysEqual(_ lhs: [PeerNearbyEntry], _ rhs: [PeerNear return false } for i in 0 ..< lhs.count { - if !lhs[i].peer.isEqual(rhs[i].peer) || lhs[i].expires != rhs[i].expires || lhs[i].distance != rhs[i].distance { + if !lhs[i].peer.0.isEqual(rhs[i].peer.0) || lhs[i].expires != rhs[i].expires || lhs[i].distance != rhs[i].distance { return false } } return true } -private final class PeopleNearbyControllerArguments { +private final class PeersNearbyControllerArguments { let context: AccountContext let openChat: (Peer) -> Void let openCreateGroup: () -> Void @@ -46,14 +46,14 @@ private final class PeopleNearbyControllerArguments { } } -private enum PeopleNearbySection: Int32 { +private enum PeersNearbySection: Int32 { case header case users case groups case channels } -private enum PeopleNearbyEntry: ItemListNodeEntry { +private enum PeersNearbyEntry: ItemListNodeEntry { case header(PresentationTheme, String) case usersHeader(PresentationTheme, String) @@ -70,13 +70,13 @@ private enum PeopleNearbyEntry: ItemListNodeEntry { var section: ItemListSectionId { switch self { case .header: - return PeopleNearbySection.header.rawValue + return PeersNearbySection.header.rawValue case .usersHeader, .empty, .user: - return PeopleNearbySection.users.rawValue + return PeersNearbySection.users.rawValue case .groupsHeader, .createGroup, .group: - return PeopleNearbySection.groups.rawValue + return PeersNearbySection.groups.rawValue case .channelsHeader, .channel: - return PeopleNearbySection.channels.rawValue + return PeersNearbySection.channels.rawValue } } @@ -103,7 +103,7 @@ private enum PeopleNearbyEntry: ItemListNodeEntry { } } - static func ==(lhs: PeopleNearbyEntry, rhs: PeopleNearbyEntry) -> Bool { + static func ==(lhs: PeersNearbyEntry, rhs: PeersNearbyEntry) -> Bool { switch lhs { case let .header(lhsTheme, lhsText): if case let .header(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { @@ -162,56 +162,71 @@ private enum PeopleNearbyEntry: ItemListNodeEntry { } } - static func <(lhs: PeopleNearbyEntry, rhs: PeopleNearbyEntry) -> Bool { + static func <(lhs: PeersNearbyEntry, rhs: PeersNearbyEntry) -> Bool { return lhs.stableId < rhs.stableId } - func item(_ arguments: PeopleNearbyControllerArguments) -> ListViewItem { + func item(_ arguments: PeersNearbyControllerArguments) -> ListViewItem { switch self { case let .header(theme, text): - return PeopleNearbyHeaderItem(theme: theme, text: text, sectionId: self.section) + return PeersNearbyHeaderItem(theme: theme, text: text, sectionId: self.section) case let .usersHeader(theme, text): return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) case let .empty(theme, text): return ItemListPlaceholderItem(theme: theme, text: text, sectionId: self.section, style: .blocks) case let .user(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer): func distance(_ distance: Int32) -> String { - var distance = max(1, distance) + let distance = max(1, distance) let formatter = MKDistanceFormatter() formatter.unitStyle = .abbreviated - return formatter.string(fromDistance: Double(distance)) + var result = formatter.string(fromDistance: Double(distance)) + if result.hasPrefix("0 ") { + result = result.replacingOccurrences(of: "0 ", with: "1 ") + } + return result } - - return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.context.account, peer: peer.peer, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(distance(peer.distance)), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { - arguments.openChat(peer.peer) - }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopStripe: false, hasTopGroupInset: false, tag: nil) + return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.context.account, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(distance(peer.distance)), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { + arguments.openChat(peer.peer.0) + }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopGroupInset: false, tag: nil) case let .groupsHeader(theme, text): return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) case let .createGroup(theme, title): - return ContactListActionItem(theme: theme, title: title, icon: .generic(UIImage(bundleImageName: "Contact List/CreateGroupActionIcon")!), header: nil, action: { + return ItemListPeerActionItem(theme: theme, icon: PresentationResourcesItemList.createGroupIcon(theme), title: title, alwaysPlain: false, sectionId: self.section, editing: false, action: { arguments.openCreateGroup() }) case let .group(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer): - return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.context.account, peer: peer.peer, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text("10 members"), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { - arguments.openChat(peer.peer) - }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopStripe: false, hasTopGroupInset: false, tag: nil) + var text: ItemListPeerItemText + if let cachedData = peer.peer.1 as? CachedChannelData, let memberCount = cachedData.participantsSummary.memberCount { + text = .text(strings.Conversation_StatusMembers(memberCount)) + } else { + text = .none + } + return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.context.account, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: text, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { + arguments.openChat(peer.peer.0) + }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopGroupInset: false, tag: nil) case let .channelsHeader(theme, text): return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) case let .channel(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer): - return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.context.account, peer: peer.peer, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text("10 members"), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { - arguments.openChat(peer.peer) - }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopStripe: false, hasTopGroupInset: false, tag: nil) + var text: ItemListPeerItemText + if let cachedData = peer.peer.1 as? CachedChannelData, let memberCount = cachedData.participantsSummary.memberCount { + text = .text(strings.Conversation_StatusSubscribers(memberCount)) + } else { + text = .none + } + return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.context.account, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: text, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: { + arguments.openChat(peer.peer.0) + }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, hasTopGroupInset: false, tag: nil) } } } -private struct PeopleNearbyControllerState: Equatable { - static func ==(lhs: PeopleNearbyControllerState, rhs: PeopleNearbyControllerState) -> Bool { +private struct PeersNearbyControllerState: Equatable { + static func ==(lhs: PeersNearbyControllerState, rhs: PeersNearbyControllerState) -> Bool { return true } } -private struct PeopleNearbyData: Equatable { +private struct PeersNearbyData: Equatable { let users: [PeerNearbyEntry] let groups: [PeerNearbyEntry] let channels: [PeerNearbyEntry] @@ -222,13 +237,13 @@ private struct PeopleNearbyData: Equatable { self.channels = channels } - static func ==(lhs: PeopleNearbyData, rhs: PeopleNearbyData) -> Bool { + static func ==(lhs: PeersNearbyData, rhs: PeersNearbyData) -> Bool { return arePeerNearbyArraysEqual(lhs.users, rhs.users) && arePeerNearbyArraysEqual(lhs.groups, rhs.groups) && arePeerNearbyArraysEqual(lhs.channels, rhs.channels) } } -private func peopleNearbyControllerEntries(state: PeopleNearbyControllerState, data: PeopleNearbyData?, presentationData: PresentationData) -> [PeopleNearbyEntry] { - var entries: [PeopleNearbyEntry] = [] +private func peersNearbyControllerEntries(state: PeersNearbyControllerState, data: PeersNearbyData?, presentationData: PresentationData) -> [PeersNearbyEntry] { + var entries: [PeersNearbyEntry] = [] entries.append(.header(presentationData.theme, presentationData.strings.PeopleNearby_Description)) entries.append(.usersHeader(presentationData.theme, presentationData.strings.PeopleNearby_Users.uppercased())) @@ -242,84 +257,120 @@ private func peopleNearbyControllerEntries(state: PeopleNearbyControllerState, d entries.append(.empty(presentationData.theme, presentationData.strings.PeopleNearby_UsersEmpty)) } -// entries.append(.groupsHeader(presentationData.theme, presentationData.strings.PeopleNearby_Groups.uppercased())) -// entries.append(.createGroup(presentationData.theme, presentationData.strings.PeopleNearby_CreateGroup)) -// if let data = data, !data.groups.isEmpty { -// var i: Int32 = 0 -// for group in data.groups { -// entries.append(.group(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, group)) -// i += 1 -// } -// } -// -// if let data = data, !data.channels.isEmpty { -// var i: Int32 = 0 -// for channel in data.channels { -// entries.append(.channel(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, channel)) -// i += 1 -// } -// } + //entries.append(.createGroup(presentationData.theme, presentationData.strings.PeopleNearby_CreateGroup)) + if let data = data, !data.groups.isEmpty { + entries.append(.groupsHeader(presentationData.theme, presentationData.strings.PeopleNearby_Groups.uppercased())) + var i: Int32 = 0 + for group in data.groups { + entries.append(.group(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, group)) + i += 1 + } + } + + if let data = data, !data.channels.isEmpty { + entries.append(.channelsHeader(presentationData.theme, presentationData.strings.PeopleNearby_Channels.uppercased())) + var i: Int32 = 0 + for channel in data.channels { + entries.append(.channel(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, channel)) + i += 1 + } + } return entries } -public func peopleNearbyController(context: AccountContext) -> ViewController { - let statePromise = ValuePromise(PeopleNearbyControllerState(), ignoreRepeated: true) - let stateValue = Atomic(value: PeopleNearbyControllerState()) - let updateState: ((PeopleNearbyControllerState) -> PeopleNearbyControllerState) -> Void = { f in +public func peersNearbyController(context: AccountContext) -> ViewController { + let statePromise = ValuePromise(PeersNearbyControllerState(), ignoreRepeated: true) + let stateValue = Atomic(value: PeersNearbyControllerState()) + let updateState: ((PeersNearbyControllerState) -> PeersNearbyControllerState) -> Void = { f in statePromise.set(stateValue.modify { f($0) }) } + var pushControllerImpl: ((ViewController) -> Void)? + var replaceTopControllerImpl: ((ViewController, Bool) -> Void)? var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)? var navigateToChatImpl: ((Peer) -> Void)? let actionsDisposable = DisposableSet() - let dataPromise = Promise(nil) + let dataPromise = Promise(nil) - let arguments = PeopleNearbyControllerArguments(context: context, openChat: { peer in + let arguments = PeersNearbyControllerArguments(context: context, openChat: { peer in navigateToChatImpl?(peer) }, openCreateGroup: { - + let controller = createGroupController(context: context, peerIds: [], supergroup: true) + replaceTopControllerImpl?(controller, true) }) - let dataSignal: Signal = currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0) - |> mapToSignal { coordinate -> Signal in + let dataSignal: Signal = currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0) + |> mapToSignal { coordinate -> Signal in guard let coordinate = coordinate else { return .single(nil) } - let poll = peersNearby(network: context.account.network, accountStateManager: context.account.stateManager, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude), radius: 100) - |> mapToSignal { peersNearby -> Signal in - return context.account.postbox.transaction { transaction -> PeopleNearbyData? in - var result: [PeerNearbyEntry] = [] - for peerNearby in peersNearby { - if peerNearby.id != context.account.peerId, let peer = transaction.getPeer(peerNearby.id) { - result.append(PeerNearbyEntry(peer: peer, expires: peerNearby.expires, distance: peerNearby.distance)) + + return Signal { subscriber in + let peersNearbyContext = PeersNearbyContext(network: context.account.network, accountStateManager: context.account.stateManager, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude)) + + let disposable = (peersNearbyContext.get() + |> mapToSignal { peersNearby -> Signal in + return context.account.postbox.transaction { transaction -> PeersNearbyData? in + var users: [PeerNearbyEntry] = [] + var groups: [PeerNearbyEntry] = [] + for peerNearby in peersNearby { + if peerNearby.id != context.account.peerId, let peer = transaction.getPeer(peerNearby.id) { + if peerNearby.id.namespace == Namespaces.Peer.CloudUser { + users.append(PeerNearbyEntry(peer: (peer, nil), expires: peerNearby.expires, distance: peerNearby.distance)) + } else { + let cachedData = transaction.getPeerCachedData(peerId: peerNearby.id) as? CachedChannelData + groups.append(PeerNearbyEntry(peer: (peer, cachedData), expires: peerNearby.expires, distance: peerNearby.distance)) + } + } } + return PeersNearbyData(users: users, groups: groups, channels: []) } - return PeopleNearbyData(users: result, groups: [], channels: []) + }).start(next: { data in + subscriber.putNext(data) + }) + + return ActionDisposable { + disposable.dispose() + let _ = peersNearbyContext.get() } } - return (poll |> then(.complete() |> suspendAwareDelay(25.0, queue: Queue.concurrentDefaultQueue()))) |> restart } - dataPromise.set(dataSignal) + dataPromise.set((dataSignal |> then(.complete() |> suspendAwareDelay(25.0, queue: Queue.concurrentDefaultQueue()))) |> restart) let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), dataPromise.get()) |> deliverOnMainQueue - |> map { presentationData, state, data -> (ItemListControllerState, (ItemListNodeState, PeopleNearbyEntry.ItemGenerationArguments)) in + |> map { presentationData, state, data -> (ItemListControllerState, (ItemListNodeState, PeersNearbyEntry.ItemGenerationArguments)) in let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(presentationData.strings.PeopleNearby_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: true) - let listState = ItemListNodeState(entries: peopleNearbyControllerEntries(state: state, data: data, presentationData: presentationData), style: .blocks, emptyStateItem: nil, crossfadeState: false, animateChanges: true, userInteractionEnabled: true) + let listState = ItemListNodeState(entries: peersNearbyControllerEntries(state: state, data: data, presentationData: presentationData), style: .blocks, emptyStateItem: nil, crossfadeState: false, animateChanges: true, userInteractionEnabled: true) return (controllerState, (listState, arguments)) - } |> afterDisposed { + } + |> afterDisposed { actionsDisposable.dispose() } let controller = ItemListController(context: context, state: signal) navigateToChatImpl = { [weak controller] peer in if let navigationController = controller?.navigationController as? NavigationController { - navigateToChatController(navigationController: navigationController, context: context, chatLocation: .peer(peer.id), keepStack: .always) + navigateToChatController(navigationController: navigationController, context: context, chatLocation: .peer(peer.id), keepStack: .always, purposefulAction: { [weak navigationController] in + if let navigationController = navigationController, let chatController = navigationController.viewControllers.last as? ChatController { + replaceTopControllerImpl?(chatController, false) + } + }) + } + } + pushControllerImpl = { [weak controller] c in + if let controller = controller { + (controller.navigationController as? NavigationController)?.pushViewController(c, animated: true) + } + } + replaceTopControllerImpl = { [weak controller] c, a in + if let controller = controller { + (controller.navigationController as? NavigationController)?.replaceAllButRootController(c, animated: a) } } presentControllerImpl = { [weak controller] c, p in diff --git a/submodules/TelegramUI/TelegramUI/PeopleNearbyHeaderItem.swift b/submodules/TelegramUI/TelegramUI/PeersNearbyHeaderItem.swift similarity index 88% rename from submodules/TelegramUI/TelegramUI/PeopleNearbyHeaderItem.swift rename to submodules/TelegramUI/TelegramUI/PeersNearbyHeaderItem.swift index f0e531abbb..33934c0924 100644 --- a/submodules/TelegramUI/TelegramUI/PeopleNearbyHeaderItem.swift +++ b/submodules/TelegramUI/TelegramUI/PeersNearbyHeaderItem.swift @@ -5,7 +5,7 @@ import AsyncDisplayKit import SwiftSignalKit import TelegramPresentationData -class PeopleNearbyHeaderItem: ListViewItem, ItemListItem { +class PeersNearbyHeaderItem: ListViewItem, ItemListItem { let theme: PresentationTheme let text: String let sectionId: ItemListSectionId @@ -18,7 +18,7 @@ class PeopleNearbyHeaderItem: ListViewItem, ItemListItem { func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { async { - let node = PeopleNearbyHeaderItemNode() + let node = PeersNearbyHeaderItemNode() let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) node.contentSize = layout.contentSize @@ -34,7 +34,7 @@ class PeopleNearbyHeaderItem: ListViewItem, ItemListItem { func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) { Queue.mainQueue().async { - guard let nodeValue = node() as? PeopleNearbyHeaderItemNode else { + guard let nodeValue = node() as? PeersNearbyHeaderItemNode else { assertionFailure() return } @@ -55,11 +55,11 @@ class PeopleNearbyHeaderItem: ListViewItem, ItemListItem { private let titleFont = Font.regular(13.0) -class PeopleNearbyHeaderItemNode: ListViewItemNode { +class PeersNearbyHeaderItemNode: ListViewItemNode { private let titleNode: TextNode - private var iconNode: PeopleNearbyIconNode? + private var iconNode: PeersNearbyIconNode? - private var item: PeopleNearbyHeaderItem? + private var item: PeersNearbyHeaderItem? init() { self.titleNode = TextNode() @@ -72,7 +72,7 @@ class PeopleNearbyHeaderItemNode: ListViewItemNode { self.addSubnode(self.titleNode) } - func asyncLayout() -> (_ item: PeopleNearbyHeaderItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + func asyncLayout() -> (_ item: PeersNearbyHeaderItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { let makeTitleLayout = TextNode.asyncLayout(self.titleNode) return { item, params, neighbors in @@ -94,12 +94,12 @@ class PeopleNearbyHeaderItemNode: ListViewItemNode { strongSelf.item = item strongSelf.accessibilityLabel = attributedText.string - let iconNode: PeopleNearbyIconNode + let iconNode: PeersNearbyIconNode if let node = strongSelf.iconNode { iconNode = node iconNode.updateTheme(item.theme) } else { - iconNode = PeopleNearbyIconNode(theme: item.theme) + iconNode = PeersNearbyIconNode(theme: item.theme) strongSelf.iconNode = iconNode strongSelf.addSubnode(iconNode) } diff --git a/submodules/TelegramUI/TelegramUI/PeopleNearbyIconNode.swift b/submodules/TelegramUI/TelegramUI/PeersNearbyIconNode.swift similarity index 90% rename from submodules/TelegramUI/TelegramUI/PeopleNearbyIconNode.swift rename to submodules/TelegramUI/TelegramUI/PeersNearbyIconNode.swift index a5e15f9269..942ed064aa 100644 --- a/submodules/TelegramUI/TelegramUI/PeopleNearbyIconNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeersNearbyIconNode.swift @@ -5,7 +5,7 @@ import AsyncDisplayKit import TelegramPresentationData import LegacyComponents -private final class PeopleNearbyIconWavesNodeParams: NSObject { +private final class PeersNearbyIconWavesNodeParams: NSObject { let color: UIColor let progress: CGFloat @@ -21,7 +21,7 @@ private func degToRad(_ degrees: CGFloat) -> CGFloat { return degrees * CGFloat.pi / 180.0 } -final class PeopleNearbyIconWavesNode: ASDisplayNode { +final class PeersNearbyIconWavesNode: ASDisplayNode { var color: UIColor { didSet { self.setNeedsDisplay() @@ -51,10 +51,10 @@ final class PeopleNearbyIconWavesNode: ASDisplayNode { let animation = POPBasicAnimation() animation.property = (POPAnimatableProperty.property(withName: "progress", initializer: { property in property?.readBlock = { node, values in - values?.pointee = (node as! PeopleNearbyIconWavesNode).effectiveProgress + values?.pointee = (node as! PeersNearbyIconWavesNode).effectiveProgress } property?.writeBlock = { node, values in - (node as! PeopleNearbyIconWavesNode).effectiveProgress = values!.pointee + (node as! PeersNearbyIconWavesNode).effectiveProgress = values!.pointee } property?.threshold = 0.01 }) as! POPAnimatableProperty) @@ -75,7 +75,7 @@ final class PeopleNearbyIconWavesNode: ASDisplayNode { override func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? { let t = CACurrentMediaTime() let value: CGFloat = CGFloat(t.truncatingRemainder(dividingBy: 2.0)) / 2.0 - return PeopleNearbyIconWavesNodeParams(color: self.color, progress: value) + return PeersNearbyIconWavesNodeParams(color: self.color, progress: value) } @objc override class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) { @@ -87,7 +87,7 @@ final class PeopleNearbyIconWavesNode: ASDisplayNode { context.fill(bounds) } - if let parameters = parameters as? PeopleNearbyIconWavesNodeParams { + if let parameters = parameters as? PeersNearbyIconWavesNodeParams { let center = CGPoint(x: bounds.width / 2.0, y: bounds.height / 2.0) let radius: CGFloat = bounds.width * 0.3333 let range: CGFloat = (bounds.width - radius * 2.0) / 2.0 @@ -158,22 +158,27 @@ private func generateIcon(size: CGSize, color: UIColor, contentColor: UIColor) - context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0) context.translateBy(x: 0.0, y: 6.0) context.setFillColor(contentColor.cgColor) + + if size.width == 120.0 { + context.translateBy(x: 30.0, y: 30.0) + } + let _ = try? drawSvgPath(context, path: "M27.8628211,52.2347452 L27.8628211,27.1373017 L2.76505663,27.1373017 C1.55217431,27.1373017 0.568938916,26.1540663 0.568938916,24.941184 C0.568938916,24.0832172 1.06857435,23.3038117 1.84819149,22.9456161 L51.2643819,0.241311309 C52.586928,-0.366333451 54.1516568,0.213208572 54.7593016,1.53575465 C55.0801868,2.23416513 55.080181,3.03785964 54.7592857,3.7362655 L32.0544935,53.1516391 C31.548107,54.2537536 30.2441593,54.7366865 29.1420449,54.2302999 C28.3624433,53.8720978 27.8628211,53.0927006 27.8628211,52.2347452 Z ") })! } -final class PeopleNearbyIconNode: ASDisplayNode { +final class PeersNearbyIconNode: ASDisplayNode { private var theme: PresentationTheme private var iconNode: ASImageNode - private var wavesNode: PeopleNearbyIconWavesNode + private var wavesNode: PeersNearbyIconWavesNode init(theme: PresentationTheme) { self.theme = theme self.iconNode = ASImageNode() self.iconNode.isOpaque = false - self.wavesNode = PeopleNearbyIconWavesNode(color: theme.list.itemAccentColor) + self.wavesNode = PeersNearbyIconWavesNode(color: theme.list.itemAccentColor) super.init() diff --git a/submodules/TelegramUI/TelegramUI/Permission.swift b/submodules/TelegramUI/TelegramUI/Permission.swift index 7547e92e87..7262410961 100644 --- a/submodules/TelegramUI/TelegramUI/Permission.swift +++ b/submodules/TelegramUI/TelegramUI/Permission.swift @@ -9,6 +9,7 @@ public enum PermissionKind: Int32 { case notifications case siri case cellularData + case nearbyLocation } public enum PermissionRequestStatus { @@ -36,6 +37,7 @@ public enum PermissionState: Equatable { case notifications(status: PermissionRequestStatus) case siri(status: PermissionRequestStatus) case cellularData + case nearbyLocation(status: PermissionRequestStatus) var kind: PermissionKind { switch self { @@ -47,6 +49,8 @@ public enum PermissionState: Equatable { return .siri case .cellularData: return .cellularData + case .nearbyLocation: + return .nearbyLocation } } @@ -60,6 +64,8 @@ public enum PermissionState: Equatable { return status case .cellularData: return .unreachable + case let .nearbyLocation(status): + return status } } } diff --git a/submodules/TelegramUI/TelegramUI/PermissionContentNode.swift b/submodules/TelegramUI/TelegramUI/PermissionContentNode.swift index af9776ddf4..c90ca6ea33 100644 --- a/submodules/TelegramUI/TelegramUI/PermissionContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/PermissionContentNode.swift @@ -9,6 +9,7 @@ final class PermissionContentNode: ASDisplayNode { let kind: PermissionKind private let iconNode: ASImageNode + private let nearbyIconNode: PeersNearbyIconNode? private let titleNode: ImmediateTextNode private let textNode: ImmediateTextNode private let actionButton: SolidRoundedButtonNode @@ -33,6 +34,12 @@ final class PermissionContentNode: ASDisplayNode { self.iconNode.displayWithoutProcessing = true self.iconNode.displaysAsynchronously = false + if kind == .nearbyLocation { + self.nearbyIconNode = PeersNearbyIconNode(theme: theme) + } else { + self.nearbyIconNode = nil + } + self.titleNode = ImmediateTextNode() self.titleNode.maximumNumberOfLines = 0 self.titleNode.textAlignment = .center @@ -62,6 +69,9 @@ final class PermissionContentNode: ASDisplayNode { self.privacyPolicyButton.isHidden = openPrivacyPolicy == nil self.addSubnode(self.iconNode) + if let nearbyIconNode = self.nearbyIconNode { + self.addSubnode(nearbyIconNode) + } self.addSubnode(self.titleNode) self.addSubnode(self.textNode) self.addSubnode(self.actionButton) @@ -110,11 +120,17 @@ final class PermissionContentNode: ASDisplayNode { imageSize = icon.size contentHeight += imageSize.height + imageSpacing } + if let _ = self.nearbyIconNode, size.width < size.height { + imageSpacing = floor(availableHeight * 0.12) + imageSize = CGSize(width: 120.0, height: 120.0) + contentHeight += imageSize.height + imageSpacing + } let privacySpacing: CGFloat = max(30.0 + privacyButtonSize.height, (availableHeight - titleSubtitleSpacing - buttonSpacing - imageSize.height - imageSpacing) / 2.0) let contentOrigin = insets.top + floor((size.height - insets.top - insets.bottom - contentHeight) / 2.0) let iconFrame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: contentOrigin), size: imageSize) + let nearbyIconFrame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: contentOrigin), size: imageSize) let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: iconFrame.maxY + imageSpacing), size: titleSize) let textFrame = CGRect(origin: CGPoint(x: floor((size.width - textSize.width) / 2.0), y: titleFrame.maxY + titleSubtitleSpacing), size: textSize) let buttonFrame = CGRect(origin: CGPoint(x: floor((size.width - buttonWidth) / 2.0), y: textFrame.maxY + buttonSpacing), size: CGSize(width: buttonWidth, height: buttonHeight)) @@ -122,6 +138,9 @@ final class PermissionContentNode: ASDisplayNode { transition.updateFrame(node: self.iconNode, frame: iconFrame) + if let nearbyIconNode = self.nearbyIconNode { + transition.updateFrame(node: nearbyIconNode, frame: nearbyIconFrame) + } transition.updateFrame(node: self.titleNode, frame: titleFrame) transition.updateFrame(node: self.textNode, frame: textFrame) transition.updateFrame(node: self.actionButton, frame: buttonFrame) diff --git a/submodules/TelegramUI/TelegramUI/PermissionController.swift b/submodules/TelegramUI/TelegramUI/PermissionController.swift index 053b9bc214..4fd8d5d43d 100644 --- a/submodules/TelegramUI/TelegramUI/PermissionController.swift +++ b/submodules/TelegramUI/TelegramUI/PermissionController.swift @@ -9,18 +9,14 @@ import DeviceAccess public final class PermissionController : ViewController { private let context: AccountContext - private let splitTest: PermissionUISplitTest + private let splitTest: PermissionUISplitTest? private var state: PermissionState? + private var splashScreen = false private var controllerNode: PermissionControllerNode { return self.displayNode as! PermissionControllerNode } - private var _ready = Promise() - override public var ready: Promise { - return self._ready - } - private var didPlayPresentationAnimation = false private var presentationData: PresentationData @@ -30,12 +26,20 @@ public final class PermissionController : ViewController { private var skip: (() -> Void)? public var proceed: ((Bool) -> Void)? - public init(context: AccountContext, splitTest: PermissionUISplitTest) { + public init(context: AccountContext, splashScreen: Bool = true, splitTest: PermissionUISplitTest? = nil) { self.context = context self.splitTest = splitTest self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + self.splashScreen = splashScreen - super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))) + let navigationBarPresentationData: NavigationBarPresentationData + if splashScreen { + navigationBarPresentationData = NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings)) + } else { + navigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData) + } + + super.init(navigationBarPresentationData: navigationBarPresentationData) self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) @@ -77,9 +81,19 @@ public final class PermissionController : ViewController { private func updateThemeAndStrings() { self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBar.style.style - self.navigationBar?.updatePresentationData(NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))) + + let navigationBarPresentationData: NavigationBarPresentationData + if self.splashScreen { + navigationBarPresentationData = NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings)) + } else { + navigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData) + } + + self.navigationBar?.updatePresentationData(navigationBarPresentationData) self.navigationItem.backBarButtonItem = UIBarButtonItem(title: nil, style: .plain, target: nil, action: nil) - self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Permissions_Skip, style: .plain, target: self, action: #selector(PermissionController.nextPressed)) + if self.navigationItem.rightBarButtonItem != nil { + self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Permissions_Skip, style: .plain, target: self, action: #selector(PermissionController.nextPressed)) + } self.controllerNode.updatePresentationData(self.presentationData) } @@ -95,19 +109,19 @@ public final class PermissionController : ViewController { self.state = state switch state { case let .contacts(status): - self.splitTest.addEvent(.ContactsModalRequest) + self.splitTest?.addEvent(.ContactsModalRequest) self.allow = { [weak self] in if let strongSelf = self { switch status { case .requestable: - strongSelf.splitTest.addEvent(.ContactsRequest) + strongSelf.splitTest?.addEvent(.ContactsRequest) DeviceAccess.authorizeAccess(to: .contacts, { [weak self] result in if let strongSelf = self { if result { - strongSelf.splitTest.addEvent(.ContactsAllowed) + strongSelf.splitTest?.addEvent(.ContactsAllowed) } else { - strongSelf.splitTest.addEvent(.ContactsDenied) + strongSelf.splitTest?.addEvent(.ContactsDenied) } strongSelf.proceed?(true) } @@ -121,22 +135,21 @@ public final class PermissionController : ViewController { } } case let .notifications(status): - self.splitTest.addEvent(.NotificationsModalRequest) + self.splitTest?.addEvent(.NotificationsModalRequest) self.allow = { [weak self] in if let strongSelf = self { switch status { case .requestable: - strongSelf.splitTest.addEvent(.NotificationsRequest) - let context = strongSelf.context + strongSelf.splitTest?.addEvent(.NotificationsRequest) DeviceAccess.authorizeAccess(to: .notifications, registerForNotifications: { [weak context] result in context?.sharedContext.applicationBindings.registerForNotifications(result) }, { [weak self] result in if let strongSelf = self { if result { - strongSelf.splitTest.addEvent(.NotificationsAllowed) + strongSelf.splitTest?.addEvent(.NotificationsAllowed) } else { - strongSelf.splitTest.addEvent(.NotificationsDenied) + strongSelf.splitTest?.addEvent(.NotificationsDenied) } strongSelf.proceed?(true) } @@ -149,7 +162,7 @@ public final class PermissionController : ViewController { } } } - case let .siri(status): + case .siri: self.allow = { [weak self] in self?.proceed?(true) } @@ -157,6 +170,25 @@ public final class PermissionController : ViewController { self.allow = { [weak self] in self?.proceed?(true) } + case let .nearbyLocation(status): + self.title = self.presentationData.strings.Permissions_PeopleNearbyTitle_v0 + self.navigationItem.rightBarButtonItem = nil + + self.allow = { [weak self] in + if let strongSelf = self { + switch status { + case .requestable: + DeviceAccess.authorizeAccess(to: .location(.tracking), context: strongSelf.context, { [weak self] result in + self?.proceed?(result) + }) + case .denied, .unreachable: + strongSelf.openAppSettings() + strongSelf.proceed?(false) + default: + break + } + } + } } self.skip = { [weak self] in diff --git a/submodules/TelegramUI/TelegramUI/PermissionControllerNode.swift b/submodules/TelegramUI/TelegramUI/PermissionControllerNode.swift index 188ca26a53..37b08037a6 100644 --- a/submodules/TelegramUI/TelegramUI/PermissionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/PermissionControllerNode.swift @@ -47,7 +47,7 @@ private func localizedString(for key: String, strings: PresentationStrings, fall final class PermissionControllerNode: ASDisplayNode { private let context: AccountContext private var presentationData: PresentationData - private let splitTest: PermissionUISplitTest + private let splitTest: PermissionUISplitTest? private var innerState: PermissionControllerInnerState @@ -57,7 +57,7 @@ final class PermissionControllerNode: ASDisplayNode { var openPrivacyPolicy: (() -> Void)? var dismiss: (() -> Void)? - init(context: AccountContext, splitTest: PermissionUISplitTest) { + init(context: AccountContext, splitTest: PermissionUISplitTest?) { self.context = context self.presentationData = context.sharedContext.currentPresentationData.with { $0 } self.splitTest = splitTest @@ -123,7 +123,7 @@ final class PermissionControllerNode: ASDisplayNode { switch dataState { case let .contacts(status): icon = UIImage(bundleImageName: "Settings/Permissions/Contacts") - if case let .modal(titleKey, textKey, allowTitleKey, allowInSettingsTitleKey) = self.splitTest.configuration.contacts { + if let splitTest = self.splitTest, case let .modal(titleKey, textKey, allowTitleKey, allowInSettingsTitleKey) = splitTest.configuration.contacts { title = localizedString(for: titleKey, strings: self.presentationData.strings) text = localizedString(for: textKey, strings: self.presentationData.strings) if status == .denied { @@ -143,7 +143,7 @@ final class PermissionControllerNode: ASDisplayNode { hasPrivacyPolicy = true case let .notifications(status): icon = UIImage(bundleImageName: "Settings/Permissions/Notifications") - if case let .modal(titleKey, textKey, allowTitleKey, allowInSettingsTitleKey) = self.splitTest.configuration.notifications { + if let splitTest = self.splitTest, case let .modal(titleKey, textKey, allowTitleKey, allowInSettingsTitleKey) = splitTest.configuration.notifications { title = localizedString(for: titleKey, strings: self.presentationData.strings, fallback: self.presentationData.strings.Permissions_NotificationsTitle_v0) text = localizedString(for: textKey, strings: self.presentationData.strings, fallback: self.presentationData.strings.Permissions_NotificationsText_v0) if status == .denied { @@ -177,6 +177,16 @@ final class PermissionControllerNode: ASDisplayNode { text = self.presentationData.strings.Permissions_CellularDataText_v0 buttonTitle = self.presentationData.strings.Permissions_CellularDataAllowInSettings_v0 hasPrivacyPolicy = false + case let .nearbyLocation(status): + icon = nil + title = self.presentationData.strings.Permissions_PeopleNearbyTitle_v0 + text = self.presentationData.strings.Permissions_PeopleNearbyText_v0 + if status == .denied { + buttonTitle = self.presentationData.strings.Permissions_PeopleNearbyAllowInSettings_v0 + } else { + buttonTitle = self.presentationData.strings.Permissions_PeopleNearbyAllow_v0 + } + hasPrivacyPolicy = false } let contentNode = PermissionContentNode(theme: self.presentationData.theme, strings: self.presentationData.strings, kind: dataState.kind, icon: icon, title: title, text: text, buttonTitle: buttonTitle, buttonAction: { [weak self] in diff --git a/submodules/TelegramUI/TelegramUI/PresentationResourceKey.swift b/submodules/TelegramUI/TelegramUI/PresentationResourceKey.swift index d1aa3768a1..0ed30632c8 100644 --- a/submodules/TelegramUI/TelegramUI/PresentationResourceKey.swift +++ b/submodules/TelegramUI/TelegramUI/PresentationResourceKey.swift @@ -43,6 +43,7 @@ enum PresentationResourceKey: Int32 { case itemListDeleteIndicatorIcon case itemListReorderIndicatorIcon case itemListAddPersonIcon + case itemListCreateGroupIcon case itemListAddExceptionIcon case itemListAddPhoneIcon case itemListClearInputIcon diff --git a/submodules/TelegramUI/TelegramUI/PresentationResourcesItemList.swift b/submodules/TelegramUI/TelegramUI/PresentationResourcesItemList.swift index e8d2c542f1..79a4398bc9 100644 --- a/submodules/TelegramUI/TelegramUI/PresentationResourcesItemList.swift +++ b/submodules/TelegramUI/TelegramUI/PresentationResourcesItemList.swift @@ -108,6 +108,12 @@ struct PresentationResourcesItemList { }) } + static func createGroupIcon(_ theme: PresentationTheme) -> UIImage? { + return theme.image(PresentationResourceKey.itemListCreateGroupIcon.rawValue, { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Contact List/CreateGroupActionIcon"), color: theme.list.itemAccentColor) + }) + } + static func addExceptionIcon(_ theme: PresentationTheme) -> UIImage? { return theme.image(PresentationResourceKey.itemListAddExceptionIcon.rawValue, { theme in return generateTintedImage(image: UIImage(bundleImageName: "Item List/AddExceptionIcon"), color: theme.list.itemAccentColor) diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 2ff9c048b9..72b1b22810 100644 Binary files a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping differ diff --git a/submodules/TelegramUI/TelegramUI/SettingsController.swift b/submodules/TelegramUI/TelegramUI/SettingsController.swift index f1186f9bf6..f4a2067536 100644 --- a/submodules/TelegramUI/TelegramUI/SettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/SettingsController.swift @@ -341,7 +341,7 @@ private enum SettingsEntry: ItemListNodeEntry { func item(_ arguments: SettingsItemArguments) -> ListViewItem { switch self { case let .userInfo(account, theme, strings, dateTimeFormat, peer, cachedData, state, updatingImage): - return ItemListAvatarAndNameInfoItem(account: account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .settings, peer: peer, presence: TelegramUserPresence(status: .present(until: Int32.max), lastActivity: 0), cachedData: cachedData, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false), editingNameUpdated: { _ in + return ItemListAvatarAndNameInfoItem(account: account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .settings, peer: peer, presence: TelegramUserPresence(status: .present(until: Int32.max), lastActivity: 0), cachedData: cachedData, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { _ in }, avatarTapped: { arguments.avatarTapAction() }, context: arguments.avatarAndNameInfoContext, updatingImage: updatingImage, action: { diff --git a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift b/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift index e307ea4285..e9bf36bc6f 100644 --- a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift +++ b/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift @@ -51,6 +51,7 @@ public final class SharedWakeupManager { private var inForeground: Bool = false private var hasActiveAudioSession: Bool = false + private var activeExplicitExtensionTimer: SwiftSignalKit.Timer? private var allowBackgroundTimeExtensionDeadline: Double? private var isInBackgroundExtension: Bool = false @@ -74,6 +75,10 @@ public final class SharedWakeupManager { return } strongSelf.inForeground = value + if value { + strongSelf.activeExplicitExtensionTimer?.invalidate() + strongSelf.activeExplicitExtensionTimer = nil + } strongSelf.checkTasks() }) @@ -158,10 +163,23 @@ public final class SharedWakeupManager { } } - func allowBackgroundTimeExtension(timeout: Double) { + func allowBackgroundTimeExtension(timeout: Double, extendNow: Bool = false) { let shouldCheckTasks = self.allowBackgroundTimeExtensionDeadline == nil self.allowBackgroundTimeExtensionDeadline = CACurrentMediaTime() + timeout - if shouldCheckTasks { + if extendNow { + if self.activeExplicitExtensionTimer == nil { + self.activeExplicitExtensionTimer = SwiftSignalKit.Timer(timeout: 20.0, repeat: false, completion: { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.activeExplicitExtensionTimer?.invalidate() + strongSelf.activeExplicitExtensionTimer = nil + strongSelf.checkTasks() + }, queue: .mainQueue()) + self.activeExplicitExtensionTimer?.start() + } + } + if shouldCheckTasks || extendNow { self.checkTasks() } } @@ -182,6 +200,9 @@ public final class SharedWakeupManager { break } } + if self.activeExplicitExtensionTimer != nil { + hasTasksForBackgroundExtension = true + } let canBeginBackgroundExtensionTasks = self.allowBackgroundTimeExtensionDeadline.flatMap({ CACurrentMediaTime() < $0 }) ?? false if hasTasksForBackgroundExtension { @@ -231,9 +252,9 @@ public final class SharedWakeupManager { } private func updateAccounts() { - if self.inForeground || self.hasActiveAudioSession || self.isInBackgroundExtension { + if self.inForeground || self.hasActiveAudioSession || self.isInBackgroundExtension || self.activeExplicitExtensionTimer != nil { for (account, primary, tasks) in self.accountsAndTasks { - if (self.inForeground && primary) || !tasks.isEmpty { + if (self.inForeground && primary) || !tasks.isEmpty || (self.activeExplicitExtensionTimer != nil && primary) { account.shouldBeServiceTaskMaster.set(.single(.always)) } else { account.shouldBeServiceTaskMaster.set(.single(.never)) diff --git a/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift b/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift index 2f57769ce8..c038c59c41 100644 --- a/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift @@ -271,7 +271,21 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode { |> take(1) |> map { (nil, $0) }]) } else if query.count > 1, let languageCode = languageCode, !languageCode.isEmpty && languageCode != "emoji" { - signals = searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: languageCode, query: query.lowercased(), completeMatch: query.count < 3) + var signal = searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: languageCode, query: query.lowercased(), completeMatch: query.count < 3) + if !languageCode.lowercased().hasPrefix("en") { + signal = signal + |> mapToSignal { keywords in + return .single(keywords) + |> then( + searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: "en-US", query: query.lowercased(), completeMatch: query.count < 3) + |> map { englishKeywords in + return keywords + englishKeywords + } + ) + } + } + + signals = signal |> map { keywords -> [Signal<(String?, [FoundStickerItem]), NoError>] in var signals: [Signal<(String?, [FoundStickerItem]), NoError>] = [] let emoticons = keywords.flatMap { $0.emoticons } diff --git a/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift b/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift index 0080e71b80..6f15d652f0 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift @@ -367,7 +367,7 @@ public func themeAutoNightSettingsController(context: AccountContext) -> ViewCon |> mapToSignal { coordinates -> Signal<(Double, Double, String), NoError> in return reverseGeocodeLocation(latitude: coordinates.0, longitude: coordinates.1) |> map { locality in - return (coordinates.0, coordinates.1, locality) + return (coordinates.0, coordinates.1, locality?.city ?? "") } } diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift index c2febbffb8..59ca64d59a 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift @@ -32,9 +32,9 @@ private final class ThemeSettingsControllerArguments { } private enum ThemeSettingsControllerSection: Int32 { - case fontSize case chatPreview - case theme + case background + case fontSize case icon case other } @@ -59,12 +59,10 @@ public enum ThemeSettingsEntryTag: ItemListItemTag { private enum ThemeSettingsControllerEntry: ItemListNodeEntry { case fontSizeHeader(PresentationTheme, String) case fontSize(PresentationTheme, PresentationFontSize) - case chatPreviewHeader(PresentationTheme, String) case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder) case wallpaper(PresentationTheme, String) case accentColor(PresentationTheme, String, Int32) case autoNightTheme(PresentationTheme, String, String) - case themeListHeader(PresentationTheme, String) case themeItem(PresentationTheme, PresentationStrings, [PresentationBuiltinThemeReference], PresentationBuiltinThemeReference, UIColor?) case iconHeader(PresentationTheme, String) case iconItem(PresentationTheme, PresentationStrings, [PresentationAppIcon], String?) @@ -75,12 +73,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { var section: ItemListSectionId { switch self { + case .chatPreview, .themeItem, .accentColor: + return ThemeSettingsControllerSection.chatPreview.rawValue case .fontSizeHeader, .fontSize: return ThemeSettingsControllerSection.fontSize.rawValue - case .chatPreviewHeader, .chatPreview, .wallpaper: - return ThemeSettingsControllerSection.chatPreview.rawValue - case .themeListHeader, .themeItem, .accentColor, .autoNightTheme: - return ThemeSettingsControllerSection.theme.rawValue + case .wallpaper, .autoNightTheme: + return ThemeSettingsControllerSection.background.rawValue case .iconHeader, .iconItem: return ThemeSettingsControllerSection.icon.rawValue case .otherHeader, .largeEmoji, .animations, .animationsInfo: @@ -90,47 +88,37 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { var stableId: Int32 { switch self { - case .fontSizeHeader: - return 0 - case .fontSize: - return 1 - case .chatPreviewHeader: - return 2 case .chatPreview: - return 3 - case .wallpaper: - return 4 - case .themeListHeader: - return 5 + return 0 case .themeItem: - return 6 + return 1 case .accentColor: - return 7 + return 2 + case .wallpaper: + return 3 case .autoNightTheme: - return 8 + return 4 + case .fontSizeHeader: + return 5 + case .fontSize: + return 6 case .iconHeader: - return 100 + return 7 case .iconItem: - return 101 + return 8 case .otherHeader: - return 102 + return 9 case .largeEmoji: - return 103 + return 10 case .animations: - return 104 + return 11 case .animationsInfo: - return 105 + return 12 } } static func ==(lhs: ThemeSettingsControllerEntry, rhs: ThemeSettingsControllerEntry) -> Bool { switch lhs { - case let .chatPreviewHeader(lhsTheme, lhsText): - if case let .chatPreviewHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { - return true - } else { - return false - } case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder): if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder { return true @@ -155,12 +143,6 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { } else { return false } - case let .themeListHeader(lhsTheme, lhsText): - if case let .themeListHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { - return true - } else { - return false - } case let .themeItem(lhsTheme, lhsStrings, lhsThemes, lhsCurrentTheme, lhsThemeAccentColor): if case let .themeItem(rhsTheme, rhsStrings, rhsThemes, rhsCurrentTheme, rhsThemeAccentColor) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsThemes == rhsThemes, lhsCurrentTheme == rhsCurrentTheme, lhsThemeAccentColor == rhsThemeAccentColor { return true @@ -230,8 +212,6 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ThemeSettingsFontSizeItem(theme: theme, fontSize: fontSize, sectionId: self.section, updated: { value in arguments.selectFontSize(value) }, tag: ThemeSettingsEntryTag.fontSize) - case let .chatPreviewHeader(theme, text): - return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder): return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder) case let .wallpaper(theme, text): @@ -246,8 +226,6 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ItemListDisclosureItem(theme: theme, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { arguments.openAutoNightTheme() }) - case let .themeListHeader(theme, text): - return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) case let .themeItem(theme, strings, themes, currentTheme, themeAccentColor): return ThemeSettingsThemeItem(theme: theme, strings: strings, sectionId: self.section, themes: themes.map { ($0, $0 == .day ? themeAccentColor : nil) }, currentTheme: currentTheme, updated: { theme in arguments.selectTheme(theme.rawValue) @@ -277,20 +255,16 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeAccentColor: Int32?, autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, largeEmoji: Bool, disableAnimations: Bool, availableAppIcons: [PresentationAppIcon], currentAppIconName: String?) -> [ThemeSettingsControllerEntry] { var entries: [ThemeSettingsControllerEntry] = [] - entries.append(.fontSizeHeader(presentationData.theme, strings.Appearance_TextSize.uppercased())) - entries.append(.fontSize(presentationData.theme, fontSize)) - entries.append(.chatPreviewHeader(presentationData.theme, strings.Appearance_Preview)) entries.append(.chatPreview(presentationData.theme, theme, wallpaper, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder)) - entries.append(.wallpaper(presentationData.theme, strings.Settings_ChatBackground)) - - entries.append(.themeListHeader(presentationData.theme, strings.Appearance_ColorTheme.uppercased())) if case let .builtin(theme) = theme.name { entries.append(.themeItem(presentationData.theme, presentationData.strings, [.dayClassic, .day, .nightAccent, .nightGrayscale], theme.reference, themeAccentColor != nil ? UIColor(rgb: UInt32(bitPattern: themeAccentColor!)) : nil)) } - if theme.name == .builtin(.day) { entries.append(.accentColor(presentationData.theme, strings.Appearance_AccentColor, themeAccentColor ?? defaultDayAccentColor)) } + + entries.append(.wallpaper(presentationData.theme, strings.Settings_ChatBackground)) + if theme.name == .builtin(.day) || theme.name == .builtin(.dayClassic) { let title: String switch autoNightSettings.trigger { @@ -304,6 +278,9 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, entries.append(.autoNightTheme(presentationData.theme, strings.Appearance_AutoNightTheme, title)) } + entries.append(.fontSizeHeader(presentationData.theme, strings.Appearance_TextSize.uppercased())) + entries.append(.fontSize(presentationData.theme, fontSize)) + if !availableAppIcons.isEmpty { entries.append(.iconHeader(presentationData.theme, strings.Appearance_AppIcon.uppercased())) entries.append(.iconItem(presentationData.theme, presentationData.strings, availableAppIcons, currentAppIconName)) diff --git a/submodules/TelegramUI/TelegramUI/UrlHandling.swift b/submodules/TelegramUI/TelegramUI/UrlHandling.swift index bad9757315..eb0d7c4bca 100644 --- a/submodules/TelegramUI/TelegramUI/UrlHandling.swift +++ b/submodules/TelegramUI/TelegramUI/UrlHandling.swift @@ -24,6 +24,7 @@ enum WallpaperUrlParameter { enum ParsedInternalUrl { case peerName(String, ParsedInternalPeerUrlParameter?) + case peerId(PeerId) case privateMessage(MessageId) case stickerPack(String) case join(String) @@ -155,6 +156,8 @@ func parseInternalUrl(query: String) -> ParsedInternalUrl? { } } } + } else if pathComponents[0].hasPrefix(phonebookUsernamePathPrefix), let idValue = Int32(String(pathComponents[0][pathComponents[0].index(pathComponents[0].startIndex, offsetBy: phonebookUsernamePathPrefix.count)...])) { + return .peerId(PeerId(namespace: Namespaces.Peer.CloudUser, id: idValue)) } return .peerName(peerName, nil) } else if pathComponents.count == 2 || pathComponents.count == 3 { @@ -276,6 +279,17 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig return .peer(nil, .info) } } + case let .peerId(peerId): + return account.postbox.transaction { transaction -> Peer? in + return transaction.getPeer(peerId) + } + |> mapToSignal { peer -> Signal in + if let peer = peer { + return .single(.peer(peer.id, .chat(textInputState: nil, messageId: nil))) + } else { + return .single(.inaccessiblePeer) + } + } case let .privateMessage(messageId): return account.postbox.transaction { transaction -> Peer? in return transaction.getPeer(messageId.peerId) diff --git a/submodules/TelegramUI/TelegramUI/UserInfoController.swift b/submodules/TelegramUI/TelegramUI/UserInfoController.swift index fcd6fdaf74..dcdd0027c1 100644 --- a/submodules/TelegramUI/TelegramUI/UserInfoController.swift +++ b/submodules/TelegramUI/TelegramUI/UserInfoController.swift @@ -649,23 +649,24 @@ private func userInfoEntries(account: Account, presentationData: PresentationDat if !(peer is TelegramSecretChat) { entries.append(UserInfoEntry.sendMessage(presentationData.theme, presentationData.strings.UserInfo_SendMessage)) - if let user = peer as? TelegramUser, user.botInfo == nil { - if view.peerIsContact { - if let phone = user.phone, !phone.isEmpty { - entries.append(UserInfoEntry.shareContact(presentationData.theme, presentationData.strings.UserInfo_ShareContact)) - } - } else { - entries.append(UserInfoEntry.addContact(presentationData.theme, presentationData.strings.Conversation_AddToContacts)) + } + + if user.botInfo == nil { + if view.peerIsContact { + if let phone = user.phone, !phone.isEmpty { + entries.append(UserInfoEntry.shareContact(presentationData.theme, presentationData.strings.UserInfo_ShareContact)) } + } else { + entries.append(UserInfoEntry.addContact(presentationData.theme, presentationData.strings.Conversation_AddToContacts)) } + } - if let cachedUserData = cachedPeerData as? CachedUserData, let peerStatusSettings = cachedUserData.peerStatusSettings, peerStatusSettings.contains(.canShareContact) { - entries.append(UserInfoEntry.shareMyContact(presentationData.theme, presentationData.strings.UserInfo_ShareMyContactInfo)) - } - - if let peer = peer as? TelegramUser, peer.botInfo == nil { - entries.append(UserInfoEntry.startSecretChat(presentationData.theme, presentationData.strings.UserInfo_StartSecretChat)) - } + if let cachedUserData = cachedPeerData as? CachedUserData, let peerStatusSettings = cachedUserData.peerStatusSettings, peerStatusSettings.contains(.canShareContact) { + entries.append(UserInfoEntry.shareMyContact(presentationData.theme, presentationData.strings.UserInfo_ShareMyContactInfo)) + } + + if let peer = peer as? TelegramUser, peer.botInfo == nil { + entries.append(UserInfoEntry.startSecretChat(presentationData.theme, presentationData.strings.UserInfo_StartSecretChat)) } if let peer = peer as? TelegramUser, let botInfo = peer.botInfo { @@ -736,16 +737,18 @@ private func userInfoEntries(account: Account, presentationData: PresentationDat return entries } -private func getUserPeer(postbox: Postbox, peerId: PeerId) -> Signal { - return postbox.transaction { transaction -> Peer? in +private func getUserPeer(postbox: Postbox, peerId: PeerId) -> Signal<(Peer?, CachedPeerData?), NoError> { + return postbox.transaction { transaction -> (Peer?, CachedPeerData?) in guard let peer = transaction.getPeer(peerId) else { - return nil + return (nil, nil) } + var resultPeer: Peer? if let peer = peer as? TelegramSecretChat { - return transaction.getPeer(peer.regularPeerId) + resultPeer = transaction.getPeer(peer.regularPeerId) } else { - return peer + resultPeer = peer } + return (resultPeer, resultPeer.flatMap({ transaction.getPeerCachedData(peerId: $0.id) })) } } @@ -857,7 +860,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us } } }, tapAvatarAction: { - let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) |> deliverOnMainQueue).start(next: { peer in + let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) |> deliverOnMainQueue).start(next: { peer, _ in guard let peer = peer else { return } @@ -880,12 +883,17 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us openChatImpl?() }, addContact: { let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, cachedData in guard let user = peer as? TelegramUser, let contactData = DeviceContactExtendedData(peer: user) else { return } - presentControllerImpl?(deviceContactInfoController(context: context, subject: .create(peer: user, contactData: contactData, isSharing: true, completion: { peer, stableId, contactData in + var shareViaException = false + if let cachedData = cachedData as? CachedUserData, let peerStatusSettings = cachedData.peerStatusSettings { + shareViaException = peerStatusSettings.contains(.addExceptionWhenAddingContact) + } + + presentControllerImpl?(deviceContactInfoController(context: context, subject: .create(peer: user, contactData: contactData, isSharing: true, shareViaException: shareViaException, completion: { peer, stableId, contactData in if let peer = peer as? TelegramUser { if let phone = peer.phone, !phone.isEmpty { } @@ -932,7 +940,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us }, openGroupsInCommon: { let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) |> take(1) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in guard let peer = peer else { return } @@ -942,7 +950,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us }, updatePeerBlocked: { value in let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) |> take(1) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in guard let peer = peer else { return } @@ -1022,7 +1030,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us ActionSheetButtonItem(title: presentationData.strings.UserInfo_DeleteContact, color: .destructive, action: { dismissAction() let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in guard let peer = peer else { return } @@ -1032,12 +1040,33 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us } else { deleteContactFromDevice = .complete() } - updatePeerBlockedDisposable.set(( - deleteContactPeerInteractively(account: context.account, peerId: peer.id) - |> then( - deleteContactFromDevice - ) - ).start()) + + var deleteSignal = deleteContactPeerInteractively(account: context.account, peerId: peer.id) + |> then(deleteContactFromDevice) + + let progressSignal = Signal { subscriber in + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let controller = OverlayStatusController(theme: presentationData.theme, strings: presentationData.strings, type: .loading(cancelled: nil)) + presentControllerImpl?(controller, nil) + return ActionDisposable { [weak controller] in + Queue.mainQueue().async() { + controller?.dismiss() + } + } + } + |> runOn(Queue.mainQueue()) + |> delay(0.15, queue: Queue.mainQueue()) + let progressDisposable = progressSignal.start() + + deleteSignal = deleteSignal + |> afterDisposed { + Queue.mainQueue().async { + progressDisposable.dispose() + } + } + + updatePeerBlockedDisposable.set((deleteSignal + |> deliverOnMainQueue).start()) }) }) ]), @@ -1053,7 +1082,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us requestCallImpl() }, openCallMenu: { number in let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in if let peer = peer as? TelegramUser, let peerPhoneNumber = peer.phone, formatPhoneNumber(number) == formatPhoneNumber(peerPhoneNumber) { let presentationData = context.sharedContext.currentPresentationData.with { $0 } let controller = ActionSheetController(presentationTheme: presentationData.theme) @@ -1213,7 +1242,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us } let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) - |> mapToSignal { peer -> Signal in + |> mapToSignal { peer, _ -> Signal in guard let peer = peer as? TelegramUser, let phone = peer.phone, !phone.isEmpty else { return .complete() } @@ -1272,7 +1301,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us } shareContactImpl = { [weak controller] in let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in if let peer = peer as? TelegramUser, let phone = peer.phone { let contact = TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil) let shareController = ShareController(context: context, subject: .media(.standalone(media: contact))) @@ -1282,7 +1311,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us } shareMyContactImpl = { [weak controller] in let _ = (getUserPeer(postbox: context.account.postbox, peerId: context.account.peerId) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in guard let peer = peer as? TelegramUser, let phone = peer.phone else { return } @@ -1378,7 +1407,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Us } shareBotImpl = { [weak controller] in let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) - |> deliverOnMainQueue).start(next: { peer in + |> deliverOnMainQueue).start(next: { peer, _ in if let peer = peer as? TelegramUser, let username = peer.username { let shareController = ShareController(context: context, subject: .url("https://t.me/\(username)")) controller?.present(shareController, in: .window(.root)) diff --git a/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj index 9e080a181b..cfed53fed2 100644 --- a/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj @@ -16,11 +16,11 @@ 090E63E62195880F00E3C035 /* ContactAddItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E63E52195880F00E3C035 /* ContactAddItem.swift */; }; 090E63EE2196FE3A00E3C035 /* OpenAddContact.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E63ED2196FE3A00E3C035 /* OpenAddContact.swift */; }; 090E777922A6A32E00CD99F5 /* ThemeSettingsThemeItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E777822A6A32E00CD99F5 /* ThemeSettingsThemeItem.swift */; }; - 090E778622A9B95A00CD99F5 /* PeopleNearbyController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778522A9B95A00CD99F5 /* PeopleNearbyController.swift */; }; - 090E778822A9B96100CD99F5 /* PeopleNearbyHeaderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778722A9B96000CD99F5 /* PeopleNearbyHeaderItem.swift */; }; + 090E778622A9B95A00CD99F5 /* PeersNearbyController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778522A9B95A00CD99F5 /* PeersNearbyController.swift */; }; + 090E778822A9B96100CD99F5 /* PeersNearbyHeaderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778722A9B96000CD99F5 /* PeersNearbyHeaderItem.swift */; }; 090E778A22A9F23C00CD99F5 /* ChannelOwnershipTransferController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778922A9F23C00CD99F5 /* ChannelOwnershipTransferController.swift */; }; 090E778C22AA842300CD99F5 /* anim_success.json in Resources */ = {isa = PBXBuildFile; fileRef = 090E778B22AA842200CD99F5 /* anim_success.json */; }; - 090E778E22AA863A00CD99F5 /* PeopleNearbyIconNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778D22AA863A00CD99F5 /* PeopleNearbyIconNode.swift */; }; + 090E778E22AA863A00CD99F5 /* PeersNearbyIconNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778D22AA863A00CD99F5 /* PeersNearbyIconNode.swift */; }; 0910B0ED21FA178C00F8F87D /* WallpaperPreviewMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0910B0EC21FA178C00F8F87D /* WallpaperPreviewMedia.swift */; }; 0910B0EF21FA532D00F8F87D /* WallpaperResources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0910B0EE21FA532D00F8F87D /* WallpaperResources.swift */; }; 0910B0F121FB3DE100F8F87D /* WallpaperPatternPanelNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0910B0F021FB3DE100F8F87D /* WallpaperPatternPanelNode.swift */; }; @@ -1188,11 +1188,11 @@ 090E63E52195880F00E3C035 /* ContactAddItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactAddItem.swift; sourceTree = ""; }; 090E63ED2196FE3A00E3C035 /* OpenAddContact.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAddContact.swift; sourceTree = ""; }; 090E777822A6A32E00CD99F5 /* ThemeSettingsThemeItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeSettingsThemeItem.swift; sourceTree = ""; }; - 090E778522A9B95A00CD99F5 /* PeopleNearbyController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleNearbyController.swift; sourceTree = ""; }; - 090E778722A9B96000CD99F5 /* PeopleNearbyHeaderItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeopleNearbyHeaderItem.swift; sourceTree = ""; }; + 090E778522A9B95A00CD99F5 /* PeersNearbyController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeersNearbyController.swift; sourceTree = ""; }; + 090E778722A9B96000CD99F5 /* PeersNearbyHeaderItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeersNearbyHeaderItem.swift; sourceTree = ""; }; 090E778922A9F23C00CD99F5 /* ChannelOwnershipTransferController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelOwnershipTransferController.swift; sourceTree = ""; }; 090E778B22AA842200CD99F5 /* anim_success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_success.json; sourceTree = ""; }; - 090E778D22AA863A00CD99F5 /* PeopleNearbyIconNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeopleNearbyIconNode.swift; sourceTree = ""; }; + 090E778D22AA863A00CD99F5 /* PeersNearbyIconNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeersNearbyIconNode.swift; sourceTree = ""; }; 0910B0EC21FA178C00F8F87D /* WallpaperPreviewMedia.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperPreviewMedia.swift; sourceTree = ""; }; 0910B0EE21FA532D00F8F87D /* WallpaperResources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperResources.swift; sourceTree = ""; }; 0910B0F021FB3DE100F8F87D /* WallpaperPatternPanelNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperPatternPanelNode.swift; sourceTree = ""; }; @@ -2444,14 +2444,14 @@ name = "Language Suggestion"; sourceTree = ""; }; - 090E778422A9B94700CD99F5 /* People Nearby */ = { + 090E778422A9B94700CD99F5 /* Peers Nearby */ = { isa = PBXGroup; children = ( - 090E778522A9B95A00CD99F5 /* PeopleNearbyController.swift */, - 090E778722A9B96000CD99F5 /* PeopleNearbyHeaderItem.swift */, - 090E778D22AA863A00CD99F5 /* PeopleNearbyIconNode.swift */, + 090E778522A9B95A00CD99F5 /* PeersNearbyController.swift */, + 090E778722A9B96000CD99F5 /* PeersNearbyHeaderItem.swift */, + 090E778D22AA863A00CD99F5 /* PeersNearbyIconNode.swift */, ); - name = "People Nearby"; + name = "Peers Nearby"; sourceTree = ""; }; 0919546D229458E900E11046 /* Animated Stickers */ = { @@ -4417,7 +4417,7 @@ 0941A99E210B053300EBE194 /* Open In */, 09F215982263E61400AEDF6D /* Passcode */, 09B4EE5721A82F5900847FA6 /* Permissions */, - 090E778422A9B94700CD99F5 /* People Nearby */, + 090E778422A9B94700CD99F5 /* Peers Nearby */, ); name = Controllers; sourceTree = ""; @@ -5245,7 +5245,7 @@ 09D968A1221F7FF100B1458A /* ChatTypingActivityContentNode.swift in Sources */, D067B4AD211C916300796039 /* TGChannelIntroController.m in Sources */, D0BE303220601FFC00FBE6D8 /* LocationBroadcastActionSheetItem.swift in Sources */, - 090E778E22AA863A00CD99F5 /* PeopleNearbyIconNode.swift in Sources */, + 090E778E22AA863A00CD99F5 /* PeersNearbyIconNode.swift in Sources */, D0EC6CF41EB9F58800EBF1C3 /* ManagedMediaId.swift in Sources */, 09D968A3221F800A00B1458A /* ChatUploadingActivityContentNode.swift in Sources */, D0CFBB971FD8B0F700B65C0D /* ChatBubbleInstantVideoDecoration.swift in Sources */, @@ -5253,7 +5253,8 @@ D0EC6CF51EB9F58800EBF1C3 /* PeerMessageManagedMediaId.swift in Sources */, D0E9BA521F0559DA00F079A4 /* STPImageLibrary.m in Sources */, D0EC6CF61EB9F58800EBF1C3 /* ChatContextResultManagedMediaId.swift in Sources */, - 090E778622A9B95A00CD99F5 /* PeopleNearbyController.swift in Sources */, + D048B33B203C777500038D05 /* RenderedTotalUnreadCount.swift in Sources */, + 090E778622A9B95A00CD99F5 /* PeersNearbyController.swift in Sources */, D04ECD721FFBF22B00DE9029 /* OpenUrl.swift in Sources */, D04B4D661EEA993A00711AF6 /* LegacyLocationController.swift in Sources */, D056CD7A1FF3CC2A00880D28 /* ListMessagePlaybackOverlayNode.swift in Sources */, @@ -6087,7 +6088,7 @@ D09E637C1F0E7C28003444CD /* SharedMediaPlayer.swift in Sources */, D0750C8522B2E52400BE5F6E /* ClearNotificationsManager.swift in Sources */, D0EC6E811EB9F58900EBF1C3 /* NotificationContainerController.swift in Sources */, - 090E778822A9B96100CD99F5 /* PeopleNearbyHeaderItem.swift in Sources */, + 090E778822A9B96100CD99F5 /* PeersNearbyHeaderItem.swift in Sources */, D0754D271EEE10C800884F6E /* BotCheckoutController.swift in Sources */, D053DADA201A4C4400993D32 /* ChatTextInputAttributes.swift in Sources */, 0952D1752176DEB500194860 /* NotificationMuteSettingsController.swift in Sources */, diff --git a/submodules/TelegramUIPreferences/Sources/MediaAutoDownloadSettings.swift b/submodules/TelegramUIPreferences/Sources/MediaAutoDownloadSettings.swift index 3075def7a7..dd1e6abf7a 100644 --- a/submodules/TelegramUIPreferences/Sources/MediaAutoDownloadSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/MediaAutoDownloadSettings.swift @@ -337,13 +337,12 @@ public func shouldDownloadMediaAutomatically(settings: MediaAutoDownloadSettings } if let (category, size) = categoryAndSizeForMedia(media, categories: effectiveAutodownloadCategories(settings: settings, networkType: networkType)) { - guard isAutodownloadEnabledForPeerType(peerType, category: category) else { - return false - } if let size = size { var sizeLimit = category.sizeLimit if let file = media as? TelegramMediaFile, file.isVoice { sizeLimit = max(2 * 1024 * 1024, sizeLimit) + } else if !isAutodownloadEnabledForPeerType(peerType, category: category) { + return false } return size <= sizeLimit } else if category.sizeLimit == Int32.max { diff --git a/submodules/lottie-ios/.gitignore b/submodules/lottie-ios/.gitignore index 3894abf5df..6b550366e5 100644 --- a/submodules/lottie-ios/.gitignore +++ b/submodules/lottie-ios/.gitignore @@ -5,8 +5,8 @@ LottieExamples/LottieExamples.xcodeproj/xcuserdata/ LottieExamples.xcworkspace/xcuserdata/ Lottie/Lottie.xcodeproj/xcuserdata/ UserInterfaceState.xcuserstate -xample/lottie-ios.xcodeproj/xcuserdata -Lottie.xcodeproj/xcuserdata/ +Example/lottie-ios.xcodeproj/xcuserdata +*/xcuserdata/* Example/lottie-ios.xcworkspace/xcuserdata/ Example/lottie-ios.xcodeproj/xcuserdata/ .idea/ diff --git a/submodules/lottie-ios/Lottie_Xcode.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist b/submodules/lottie-ios/Lottie_Xcode.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist index 1e9f030153..8aebb0b956 100644 --- a/submodules/lottie-ios/Lottie_Xcode.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/submodules/lottie-ios/Lottie_Xcode.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ Lottie_iOS.xcscheme_^#shared#^_ orderHint - 44 + 43