Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: laktyushin

submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift

@@ -178,12 +178,14 @@ public final class MessageInputPanelComponent: Component {
         public var isExpanded: Bool
         public var isEmpty: Bool
         public var hasUnseenMessages: Bool
+        public var isUnifiedStream: Bool
 
-        public init(isEnabled: Bool, isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool) {
+        public init(isEnabled: Bool, isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool, isUnifiedStream: Bool) {
             self.isEnabled = isEnabled
             self.isExpanded = isExpanded
             self.isEmpty = isEmpty
             self.hasUnseenMessages = hasUnseenMessages
+            self.isUnifiedStream = isUnifiedStream
         }
     }
 
@@ -1065,7 +1067,7 @@ public final class MessageInputPanelComponent: Component {
                     rightAction = ChatTextInputPanelComponent.RightAction(kind: .empty, action: { _ in })
                 }
                 var secondaryRightAction: ChatTextInputPanelComponent.RightAction?
-                if component.isEmbeddedInCamera, let call = component.call {
+                if component.isEmbeddedInCamera, let call = component.call, let liveChatState = component.liveChatState, !liveChatState.isUnifiedStream {
                     secondaryRightAction = ChatTextInputPanelComponent.RightAction(kind: .liveMicrophone(call: call), action: { [weak self] sourceView in
                         guard let self, let component = self.component else {
                             return

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

@@ -926,9 +926,12 @@ final class LiveStreamSettingsScreenComponent: Component {
                             )
                         )),
                         action: { [weak self] _ in
-                            guard let self, let controller = self.environment?.controller() as? LiveStreamSettingsScreen else {
+                            guard let self, let component = self.component, let controller = self.environment?.controller() as? LiveStreamSettingsScreen else {
                                 return
                             }
+                            if case let .edit(_, displayExternalStream, _, _) = component.stateContext.mode {
+                                self.complete(rtmp: displayExternalStream)
+                            }
                             controller.dismiss()
                         }
                     )),
@@ -1034,7 +1037,7 @@ final class LiveStreamSettingsScreenComponent: Component {
 public class LiveStreamSettingsScreen: ViewControllerComponentContainer {
     public enum Mode {
         case create(sendAsPeerId: EnginePeer.Id?, isCustomTarget: Bool, privacy: EngineStoryPrivacy, allowComments: Bool, isForwardingDisabled: Bool, pin: Bool, paidMessageStars: Int64)
-        case edit(call: PresentationGroupCall, displayExternalStream: Bool)
+        case edit(call: PresentationGroupCall, displayExternalStream: Bool, allowComments: Bool, paidMessageStars: Int64)
     }
 
     public struct Result {
@@ -1388,16 +1391,16 @@ public class LiveStreamSettingsScreen: ViewControllerComponentContainer {
                         isForwardingDisabled = isForwardingDisabledValue
                         pin = pinValue
                         paidMessageStars = paidMessageStarsValue
-                    case let .edit(callValue, callIsStreamValue):
+                    case let .edit(callValue, callIsStreamValue, allowCommentsValue, paidMessageStarsValue):
                         call = callValue
                         isEdit = true
                         sendAsPeerId = nil
                         isCustomTarget = false
                         privacy = EngineStoryPrivacy(base: .everyone, additionallyIncludePeers: [])
-                        allowComments = true
+                        allowComments = allowCommentsValue
                         isForwardingDisabled = false
                         pin = true
-                        paidMessageStars = 0
+                        paidMessageStars = paidMessageStarsValue
                         callIsStream = callIsStreamValue
                     }
                 }

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

@@ -421,7 +421,7 @@ final class StoryContentLiveChatComponent: Component {
                 }
 
                 var items: [ContextMenuItem] = []
-                if !isPinned {
+                if !isPinned, let messagesState = self.messagesState, let message = messagesState.messages.first(where: { $0.id == id }), !message.text.isEmpty {
                     items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_ContextMenuCopy, textColor: .primary, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Copy"), color: theme.contextMenu.primaryColor) }, action: { [weak self] c, _ in
                         guard let self else {
                             return

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

@@ -119,8 +119,9 @@ final class StoryItemContentComponent: Component {
         var starStats: StarStats?
         var isAdmin: Bool
         var defaultSendAs: EnginePeer.Id?
+        var isUnifiedStream: Bool
 
-        init(isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool, areMessagesEnabled: Bool, minMessagePrice: Int64?, starStats: StarStats?, isAdmin: Bool, defaultSendAs: EnginePeer.Id?) {
+        init(isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool, areMessagesEnabled: Bool, minMessagePrice: Int64?, starStats: StarStats?, isAdmin: Bool, defaultSendAs: EnginePeer.Id?, isUnifiedStream: Bool) {
             self.isExpanded = isExpanded
             self.isEmpty = isEmpty
             self.hasUnseenMessages = hasUnseenMessages
@@ -129,6 +130,7 @@ final class StoryItemContentComponent: Component {
             self.starStats = starStats
             self.isAdmin = isAdmin
             self.defaultSendAs = defaultSendAs
+            self.isUnifiedStream = isUnifiedStream
         }
     }
 
@@ -238,7 +240,8 @@ final class StoryItemContentComponent: Component {
                 minMessagePrice: mediaStreamCallState?.minMessagePrice,
                 starStats: starStats,
                 isAdmin: mediaStreamCallState?.isAdmin ?? false,
-                defaultSendAs: mediaStreamCallState?.defaultSendAs
+                defaultSendAs: mediaStreamCallState?.defaultSendAs,
+                isUnifiedStream: mediaStreamCallState?.isUnifiedStream ?? false
             )
         }
 

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

@@ -3006,10 +3006,11 @@ public final class StoryItemSetContainerComponent: Component {
                 if let visibleItemView = self.visibleItems[component.slice.item.id]?.view.view as? StoryItemContentComponent.View {
                     if let liveChatStateValue = visibleItemView.liveChatState {
                         liveChatState = MessageInputPanelComponent.LiveChatState(
-                            isEnabled: liveChatStateValue.areMessagesEnabled,
+                            isEnabled: liveChatStateValue.areMessagesEnabled || liveChatStateValue.isAdmin,
                             isExpanded: liveChatStateValue.isExpanded,
                             isEmpty: liveChatStateValue.isEmpty,
-                            hasUnseenMessages: liveChatStateValue.hasUnseenMessages
+                            hasUnseenMessages: liveChatStateValue.hasUnseenMessages,
+                            isUnifiedStream: liveChatStateValue.isUnifiedStream
                         )
                         starStats = liveChatStateValue.starStats.flatMap { starStats in
                             return MessageInputPanelComponent.StarStats(

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

@@ -4402,7 +4402,12 @@ final class StoryItemSetContainerSendMessage: @unchecked(Sendable) {
 
             let stateContext = LiveStreamSettingsScreen.StateContext(
                 context: component.context,
-                mode: .edit(call: mediaStreamCall, displayExternalStream: callState.isUnifiedStream),
+                mode: .edit(
+                    call: mediaStreamCall,
+                    displayExternalStream: callState.isUnifiedStream,
+                    allowComments: callState.messagesAreEnabled,
+                    paidMessageStars: callState.sendPaidMessageStars ?? 0
+                ),
                 closeFriends: .single([]),
                 adminedChannels: .single([]),
                 blockedPeersContext: nil