Various improvements

submodules/DrawingUI/Sources/DrawingTextEntity.swift

@@ -589,6 +589,7 @@ public final class DrawingTextEntityView: DrawingEntityView, UITextViewDelegate
             self.textView.layer.shadowOpacity = 0.0
             self.textView.layer.shadowRadius = 0.0
         }
+        self.textView.textAlignment = self.textEntity.alignment.alignment
         
         self.updateText(keepSelectedRange: afterAppendingEmoji)
         

submodules/TelegramCore/Sources/State/UserLimitsConfiguration.swift

@@ -18,6 +18,7 @@ public struct UserLimitsConfiguration: Equatable {
     public let maxSharedFolderInviteLinks: Int32
     public let maxSharedFolderJoin: Int32
     public let maxStoryCaptionLength: Int32
+    public let maxExpiringStoriesCount: Int32
     
     public static var defaultValue: UserLimitsConfiguration {
         return UserLimitsConfiguration(
@@ -36,7 +37,8 @@ public struct UserLimitsConfiguration: Equatable {
             maxReactionsPerMessage: 1,
             maxSharedFolderInviteLinks: 3,
             maxSharedFolderJoin: 2,
-            maxStoryCaptionLength: 1024
+            maxStoryCaptionLength: 1024,
+            maxExpiringStoriesCount: 100
         )
     }
 
@@ -56,7 +58,8 @@ public struct UserLimitsConfiguration: Equatable {
         maxReactionsPerMessage: Int32,
         maxSharedFolderInviteLinks: Int32,
         maxSharedFolderJoin: Int32,
-        maxStoryCaptionLength: Int32
+        maxStoryCaptionLength: Int32,
+        maxExpiringStoriesCount: Int32
     ) {
         self.maxPinnedChatCount = maxPinnedChatCount
         self.maxArchivedPinnedChatCount = maxArchivedPinnedChatCount
@@ -74,6 +77,7 @@ public struct UserLimitsConfiguration: Equatable {
         self.maxSharedFolderInviteLinks = maxSharedFolderInviteLinks
         self.maxSharedFolderJoin = maxSharedFolderJoin
         self.maxStoryCaptionLength = maxStoryCaptionLength
+        self.maxExpiringStoriesCount = maxExpiringStoriesCount
     }
 }
 
@@ -114,5 +118,6 @@ extension UserLimitsConfiguration {
         self.maxSharedFolderInviteLinks = getValue("chatlist_invites_limit", orElse: isPremium ? 100 : 3)
         self.maxSharedFolderJoin = getValue("chatlists_joined_limit", orElse: isPremium ? 100 : 2)
         self.maxStoryCaptionLength = getGeneralValue("story_caption_length_limit", orElse: defaultValue.maxStoryCaptionLength)
+        self.maxExpiringStoriesCount = getGeneralValue("story_expiring_limit", orElse: defaultValue.maxExpiringStoriesCount)
     }
 }

submodules/TelegramCore/Sources/TelegramEngine/Data/ConfigurationData.swift

@@ -52,6 +52,7 @@ public enum EngineConfiguration {
         public let maxSharedFolderInviteLinks: Int32
         public let maxSharedFolderJoin: Int32
         public let maxStoryCaptionLength: Int32
+        public let maxExpiringStoriesCount: Int32
         
         public static var defaultValue: UserLimits {
             return UserLimits(UserLimitsConfiguration.defaultValue)
@@ -73,7 +74,8 @@ public enum EngineConfiguration {
             maxReactionsPerMessage: Int32,
             maxSharedFolderInviteLinks: Int32,
             maxSharedFolderJoin: Int32,
-            maxStoryCaptionLength: Int32
+            maxStoryCaptionLength: Int32,
+            maxExpiringStoriesCount: Int32
         ) {
             self.maxPinnedChatCount = maxPinnedChatCount
             self.maxArchivedPinnedChatCount = maxArchivedPinnedChatCount
@@ -91,6 +93,7 @@ public enum EngineConfiguration {
             self.maxSharedFolderInviteLinks = maxSharedFolderInviteLinks
             self.maxSharedFolderJoin = maxSharedFolderJoin
             self.maxStoryCaptionLength = maxStoryCaptionLength
+            self.maxExpiringStoriesCount = maxExpiringStoriesCount
         }
     }
 }
@@ -143,7 +146,8 @@ public extension EngineConfiguration.UserLimits {
             maxReactionsPerMessage: userLimitsConfiguration.maxReactionsPerMessage,
             maxSharedFolderInviteLinks: userLimitsConfiguration.maxSharedFolderInviteLinks,
             maxSharedFolderJoin: userLimitsConfiguration.maxSharedFolderJoin,
-            maxStoryCaptionLength: userLimitsConfiguration.maxStoryCaptionLength
+            maxStoryCaptionLength: userLimitsConfiguration.maxStoryCaptionLength,
+            maxExpiringStoriesCount: userLimitsConfiguration.maxExpiringStoriesCount
         )
     }
 }

submodules/TelegramCore/Sources/TelegramEngine/Data/ContactsData.swift

@@ -56,5 +56,23 @@ public extension TelegramEngine.EngineData.Item {
                 }
             }
         }
+        
+        public struct CloseFriends: TelegramEngineDataItem, PostboxViewDataItem {
+            public typealias Result = Array<EnginePeer>
+
+            public init() {
+            }
+
+            var key: PostboxViewKey {
+                return .contacts(accountPeerId: nil, includePresences: false)
+            }
+
+            func extract(view: PostboxView) -> Result {
+                guard let view = view as? ContactPeersView else {
+                    preconditionFailure()
+                }
+                return view.peers.filter { $0.isCloseFriend }.map(EnginePeer.init)
+            }
+        }
     }
 }

submodules/TelegramCore/Sources/Utils/PeerUtils.swift

@@ -189,6 +189,15 @@ public extension Peer {
         }
     }
     
+    var isCloseFriend: Bool {
+        switch self {
+        case let user as TelegramUser:
+            return user.flags.contains(.isCloseFriend)
+        default:
+            return false
+        }
+    }
+    
     var isCopyProtectionEnabled: Bool {
         switch self {
         case let group as TelegramGroup:

submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift

@@ -3238,6 +3238,8 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
     public var dismissed: () -> Void = { }
     public var willDismiss: () -> Void = { }
     
+    private var closeFriends = Promise<[EnginePeer]>()
+    
     private let hapticFeedback = HapticFeedback()
     
     public init(
@@ -3313,6 +3315,10 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
         
         let dropInteraction = UIDropInteraction(delegate: self)
         self.displayNode.view.addInteraction(dropInteraction)
+        
+        Queue.mainQueue().after(1.0) {
+            self.closeFriends.set(self.context.engine.data.get(TelegramEngine.EngineData.Item.Contacts.CloseFriends()))
+        }
     }
             
     func openPrivacySettings(_ privacy: MediaEditorResultPrivacy? = nil, completion: @escaping () -> Void = {}) {
@@ -3325,7 +3331,12 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
         let text = self.getCaption().string
         let mentions = generateTextEntities(text, enabledTypes: [.mention], currentEntities: []).map { (text as NSString).substring(with: NSRange(location: $0.range.lowerBound + 1, length: $0.range.upperBound - $0.range.lowerBound - 1)) }
                 
-        let stateContext = ShareWithPeersScreen.StateContext(context: self.context, subject: .stories(editing: false), initialPeerIds: Set(privacy.privacy.additionallyIncludePeers))
+        let stateContext = ShareWithPeersScreen.StateContext(
+            context: self.context,
+            subject: .stories(editing: false),
+            initialPeerIds: Set(privacy.privacy.additionallyIncludePeers),
+            closeFriends: self.closeFriends.get()
+        )
         let _ = (stateContext.ready |> filter { $0 } |> take(1) |> deliverOnMainQueue).start(next: { [weak self] _ in
             guard let self else {
                 return

submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/ShareWithPeersScreen.swift

@@ -1751,13 +1751,16 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
     public final class State {
         let peers: [EnginePeer]
         let presences: [EnginePeer.Id: EnginePeer.Presence]
+        let closeFriendsPeers: [EnginePeer]
         
         fileprivate init(
             peers: [EnginePeer],
-            presences: [EnginePeer.Id: EnginePeer.Presence]
+            presences: [EnginePeer.Id: EnginePeer.Presence],
+            closeFriendsPeers: [EnginePeer]
         ) {
             self.peers = peers
             self.presences = presences
+            self.closeFriendsPeers = closeFriendsPeers
         }
     }
     
@@ -1787,28 +1790,33 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
         public init(
             context: AccountContext,
             subject: Subject = .chats,
-            initialPeerIds: Set<EnginePeer.Id> = Set()
+            initialPeerIds: Set<EnginePeer.Id> = Set(),
+            closeFriends: Signal<[EnginePeer], NoError> = .single([])
         ) {
             self.subject = subject
             self.initialPeerIds = initialPeerIds
             
             switch subject {
             case .stories:
-                var signals: [Signal<EnginePeer?, NoError>] = []
+                var peerSignals: [Signal<EnginePeer?, NoError>] = []
                 if initialPeerIds.count < 3 {
                     for peerId in initialPeerIds {
-                        signals.append(context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId)))
+                        peerSignals.append(context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId)))
                     }
                 }
-                self.stateDisposable = (combineLatest(signals)
+                                
-                |> deliverOnMainQueue).start(next: { [weak self] peers in
+                let peers = combineLatest(peerSignals)
+                                
+                self.stateDisposable = combineLatest(queue: Queue.mainQueue(), peers, closeFriends)
+                .start(next: { [weak self] peers, closeFriends in
                     guard let self else {
                         return
                     }
 
                     let state = State(
                         peers: peers.compactMap { $0 },
-                        presences: [:]
+                        presences: [:],
+                        closeFriendsPeers: closeFriends
                     )
                     self.stateValue = state
                     self.stateSubject.set(.single(state))
@@ -1840,7 +1848,8 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                     
                     let state = State(
                         peers: peers,
-                        presences: presences
+                        presences: presences,
+                        closeFriendsPeers: []
                     )
                     self.stateValue = state
                     self.stateSubject.set(.single(state))
@@ -1894,7 +1903,8 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                     
                     let state = State(
                         peers: peers,
-                        presences: contactList.presences
+                        presences: contactList.presences,
+                        closeFriendsPeers: []
                     )
                                         
                     self.stateValue = state
@@ -1902,8 +1912,17 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                     
                     self.readySubject.set(true)
                 })
-            case let .search(query, _):
+            case let .search(query, onlyContacts):
-                self.stateDisposable = (context.engine.contacts.searchLocalPeers(query: query)
+                let signal: Signal<[EngineRenderedPeer], NoError>
+                if onlyContacts {
+                    signal = context.engine.contacts.searchContacts(query: query)
+                    |> map { result in
+                        return result.0.map { EngineRenderedPeer(peer: $0) }
+                    }
+                } else {
+                    signal = context.engine.contacts.searchLocalPeers(query: query)
+                }
+                self.stateDisposable = (signal
                 |> deliverOnMainQueue).start(next: { [weak self] peers in
                     guard let self else {
                         return
@@ -1923,7 +1942,8 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                                 return false
                             }
                         },
-                        presences: [:]
+                        presences: [:],
+                        closeFriendsPeers: []
                     )
                     self.stateValue = state
                     self.stateSubject.set(.single(state))
@@ -1999,12 +2019,20 @@ public class ShareWithPeersScreen: ViewControllerComponentContainer {
                 actionTitle: contactsSubtitle
             ))
             
+            var closeFriendsSubtitle = "edit list"
+            if let peers = stateContext.stateValue?.closeFriendsPeers, !peers.isEmpty {
+                if peers.count > 2 {
+                    closeFriendsSubtitle = "\(peers.count) people"
+                } else {
+                    closeFriendsSubtitle = String(peers.map { $0.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) }.joined(separator: ", "))
+                }
+            }
             categoryItems.append(ShareWithPeersScreenComponent.CategoryItem(
                 id: .closeFriends,
                 title: "Close Friends",
                 icon: "Call/StarHighlighted",
                 iconColor: .green,
-                actionTitle: "edit list"
+                actionTitle: closeFriendsSubtitle
             ))
             
             var selectedContactsSubtitle = "choose"

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryContainerScreen.swift

@@ -363,6 +363,7 @@ private final class StoryContainerScreenComponent: Component {
         private let audioModePromise = ValuePromise<StoryContentItem.AudioMode>(.ambient, ignoreRepeated: true)
         
         private let inputMediaNodeDataPromise = Promise<ChatEntityKeyboardInputNode.InputData>()
+        private let closeFriendsPromise = Promise<[EnginePeer]>()
         
         private var availableReactions: StoryAvailableReactions?
         
@@ -1078,6 +1079,10 @@ private final class StoryContainerScreenComponent: Component {
                             sendGif: nil
                         )
                     )
+                    
+                    self.closeFriendsPromise.set(
+                        component.context.engine.data.get(TelegramEngine.EngineData.Item.Contacts.CloseFriends())
+                    )
                 }
                 
                 var update = false
@@ -1398,6 +1403,7 @@ private final class StoryContainerScreenComponent: Component {
                                     self.state?.updated(transition: .immediate)
                                 },
                                 keyboardInputData: self.inputMediaNodeDataPromise.get(),
+                                closeFriends: self.closeFriendsPromise.get(),
                                 sharedViewListsContext: self.sharedViewListsContext
                             )),
                             environment: {},

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift

@@ -103,6 +103,7 @@ public final class StoryItemSetContainerComponent: Component {
     public let controller: () -> ViewController?
     public let toggleAmbientMode: () -> Void
     public let keyboardInputData: Signal<ChatEntityKeyboardInputNode.InputData, NoError>
+    public let closeFriends: Signal<[EnginePeer], NoError>
     let sharedViewListsContext: StoryItemSetViewListComponent.SharedListsContext
     
     init(
@@ -135,6 +136,7 @@ public final class StoryItemSetContainerComponent: Component {
         controller: @escaping () -> ViewController?,
         toggleAmbientMode: @escaping () -> Void,
         keyboardInputData: Signal<ChatEntityKeyboardInputNode.InputData, NoError>,
+        closeFriends: Signal<[EnginePeer], NoError>,
         sharedViewListsContext: StoryItemSetViewListComponent.SharedListsContext
     ) {
         self.context = context
@@ -166,6 +168,7 @@ public final class StoryItemSetContainerComponent: Component {
         self.controller = controller
         self.toggleAmbientMode = toggleAmbientMode
         self.keyboardInputData = keyboardInputData
+        self.closeFriends = closeFriends
         self.sharedViewListsContext = sharedViewListsContext
     }
     
@@ -3173,16 +3176,23 @@ public final class StoryItemSetContainerComponent: Component {
         }
         
         private func openItemPrivacySettings(initialPrivacy: EngineStoryPrivacy? = nil) {
-            guard let context = self.component?.context else {
+            guard let component = self.component else {
                 return
             }
             
+            let context = component.context
+            
             let privacy = initialPrivacy ?? self.component?.slice.item.storyItem.privacy
             guard let privacy else {
                 return
             }
             
-            let stateContext = ShareWithPeersScreen.StateContext(context: context, subject: .stories(editing: true), initialPeerIds: Set(privacy.additionallyIncludePeers))
+            let stateContext = ShareWithPeersScreen.StateContext(
+                context: context,
+                subject: .stories(editing: true),
+                initialPeerIds: Set(privacy.additionallyIncludePeers),
+                closeFriends: component.closeFriends
+            )
             let _ = (stateContext.ready |> filter { $0 } |> take(1) |> deliverOnMainQueue).start(next: { [weak self] _ in
                 guard let self else {
                     return

submodules/TooltipUI/Sources/TooltipScreen.swift

@@ -542,7 +542,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
             animationSpacing = 8.0
         }
         
-        let containerWidth = max(100.0, min(layout.size.width, 614.0) - sideInset * 2.0)
+        let containerWidth = max(100.0, min(layout.size.width - sideInset * 2.0, 614.0))
         
         var actionSize: CGSize = .zero