Stories

submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift

@@ -938,7 +938,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 messageLifetime = Int32(value)
             }
             
-            if isStream {
+            if streamPeerId != nil {
                 messageLifetime = Int32.max
             }
             
@@ -948,7 +948,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 reference: .id(id: initialCall.description.id, accessHash: initialCall.description.accessHash),
                 e2eContext: self.e2eContext,
                 messageLifetime: messageLifetime,
-                isLiveStream: isStream
+                isLiveStream: streamPeerId != nil
             )
             self.messagesStatePromise.set(self.messagesContext!.state)
         }

submodules/TelegramUI/Components/Chat/ChatSendStarsScreen/Sources/ChatSendStarsScreen.swift

@@ -126,7 +126,7 @@ private final class BadgeComponent: Component {
         }
         
         override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-            if self.badgeView.frame.contains(point) {
+            if self.isUserInteractionEnabled && self.badgeView.frame.contains(point) {
                 return self
             } else {
                 return nil
@@ -1401,7 +1401,18 @@ private final class ChatSendStarsScreenComponent: Component {
             }
             let sideInset: CGFloat = floor((availableSize.width - fillingSize) * 0.5) + 16.0
             
+            var isOnlyDisplay = false
+            switch component.initialData.subjectInitialData {
+            case let .react(reactData):
+                if case let .liveStream(_, _, _, _, _, isOnlyDisplayValue) = reactData.reactSubject {
+                    isOnlyDisplay = isOnlyDisplayValue
+                }
+            case .liveStreamMessage:
+                break
+            }
+            
             let context = component.context
+            if !isOnlyDisplay {
                 let balanceSize = self.balanceOverlay.update(
                     transition: .immediate,
                     component: AnyComponent(
@@ -1456,6 +1467,7 @@ private final class ChatSendStarsScreenComponent: Component {
                     }
                     view.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((availableSize.width - balanceSize.width) / 2.0), y: environment.statusBarHeight + 5.0), size: balanceSize)
                 }
+            }
             
             if self.component == nil {
                 self.balance = component.initialData.balance
@@ -1500,7 +1512,7 @@ private final class ChatSendStarsScreenComponent: Component {
                                 }
                             }
                         })
-                    case let .liveStream(_, _, _, _, availableSendAsPeers):
+                    case let .liveStream(_, _, _, _, availableSendAsPeers, _):
                         self.channelsForPublicReaction = availableSendAsPeers.filter({ $0.id != reactData.myPeer.id })
                     }
                 case let .liveStreamMessage(liveStreamMessageData):
@@ -1653,7 +1665,7 @@ private final class ChatSendStarsScreenComponent: Component {
                     self.isPastTopCutoff = nil
                 }
                 
-                if case let .liveStream(_, _, _, liveChatMessageParams, _) = reactData.reactSubject {
+                if case let .liveStream(_, _, _, liveChatMessageParams, _, _) = reactData.reactSubject {
                     let color = GroupCallMessagesContext.getStarAmountParamMapping(params: liveChatMessageParams, value: Int64(self.amount.realValue)).color ?? GroupCallMessagesContext.Message.Color(rawValue: 0x985FDC)
                     sliderColor = StoryLiveChatMessageComponent.getMessageColor(color: color)
                 }
@@ -1680,6 +1692,10 @@ private final class ChatSendStarsScreenComponent: Component {
                     self.scrollContentView.addSubview(self.badgeStars)
                     self.scrollContentView.addSubview(sliderBackgroundView)
                     self.scrollContentView.addSubview(sliderView)
+                    
+                    if isOnlyDisplay {
+                        sliderView.isUserInteractionEnabled = false
+                    }
                 }
                 transition.setFrame(view: sliderView, frame: sliderFrame)
                 
@@ -1703,6 +1719,9 @@ private final class ChatSendStarsScreenComponent: Component {
                 var badgeFrame = CGRect(origin: CGPoint(x: sliderForegroundFrame.minX + sliderForegroundFrame.width - floorToScreenPixels(sliderMinWidth * 0.5), y: sliderForegroundFrame.minY - 8.0), size: badgeSize)
                 if let badgeView = self.badge.view as? BadgeComponent.View {
                     if badgeView.superview == nil {
+                        if isOnlyDisplay {
+                            badgeView.isUserInteractionEnabled = false
+                        }
                         self.scrollContentView.insertSubview(badgeView, belowSubview: self.badgeStars)
                     }
                     
@@ -2238,7 +2257,7 @@ private final class ChatSendStarsScreenComponent: Component {
                         
                         var peerColor: UIColor = UIColor(rgb: 0xFFB10D)
                         var topPlace: Int?
-                        if case let .liveStream(_, _, _, liveChatMessageParams, _) = reactData.reactSubject {
+                        if case let .liveStream(_, _, _, liveChatMessageParams, _, _) = reactData.reactSubject {
                             let color = GroupCallMessagesContext.getStarAmountParamMapping(params: liveChatMessageParams, value: Int64(topPeer.count)).color ?? GroupCallMessagesContext.Message.Color(rawValue: 0x985FDC)
                             peerColor = StoryLiveChatMessageComponent.getMessageColor(color: color)
                             topPlace = validIds.count - 1
@@ -2488,7 +2507,12 @@ private final class ChatSendStarsScreenComponent: Component {
             let buttonString: String
             switch component.initialData.subjectInitialData {
             case .react:
+                if isOnlyDisplay {
+                    //TODO:localize
+                    buttonString = "Close"
+                } else {
                     buttonString = environment.strings.SendStarReactions_SendButtonTitle("\(self.amount.realValue)").string
+                }
             case .liveStreamMessage:
                 //TODO:localize
                 buttonString = "Add  # \(self.amount.realValue)"
@@ -2522,6 +2546,19 @@ private final class ChatSendStarsScreenComponent: Component {
                         guard let self, let component = self.component else {
                             return
                         }
+                        
+                        switch component.initialData.subjectInitialData {
+                        case let .react(reactData):
+                            if case let .liveStream(_, _, _, _, _, isOnlyDisplay) = reactData.reactSubject {
+                                if isOnlyDisplay {
+                                    self.environment?.controller()?.dismiss()
+                                    return
+                                }
+                            }
+                        case .liveStreamMessage:
+                            break
+                        }
+                        
                         guard let balance = self.balance else {
                             return
                         }
@@ -2604,10 +2641,11 @@ private final class ChatSendStarsScreenComponent: Component {
             
             var buttonDescriptionTextSize: CGSize?
             if case .react = component.initialData.subjectInitialData {
+                //TODO:localize
                 buttonDescriptionTextSize = self.buttonDescriptionText.update(
                     transition: .immediate,
                     component: AnyComponent(MultilineTextComponent(
-                        text: .markdown(text: environment.strings.SendStarReactions_TermsOfServiceFooter, attributes: MarkdownAttributes(
+                        text: .markdown(text: isOnlyDisplay ? "You can't send star reactions to own story." : environment.strings.SendStarReactions_TermsOfServiceFooter, attributes: MarkdownAttributes(
                             body: MarkdownAttributeSet(font: Font.regular(13.0), textColor: environment.theme.list.itemSecondaryTextColor),
                             bold: MarkdownAttributeSet(font: Font.semibold(13.0), textColor: environment.theme.list.itemSecondaryTextColor),
                             link: MarkdownAttributeSet(font: Font.regular(13.0), textColor: environment.theme.list.itemAccentColor),
@@ -2716,7 +2754,7 @@ private final class ChatSendStarsScreenComponent: Component {
 public class ChatSendStarsScreen: ViewControllerComponentContainer {
     public enum ReactSubject {
         case message(EngineMessage.Id)
-        case liveStream(peerId: EnginePeer.Id, storyId: Int32, minAmount: Int, liveChatMessageParams: LiveChatMessageParams, availableSendAsPeers: [EnginePeer])
+        case liveStream(peerId: EnginePeer.Id, storyId: Int32, minAmount: Int, liveChatMessageParams: LiveChatMessageParams, availableSendAsPeers: [EnginePeer], isDisplayOnly: Bool)
     }
     
     fileprivate enum SubjectInitialData {
@@ -2925,7 +2963,7 @@ public class ChatSendStarsScreen: ViewControllerComponentContainer {
         switch reactSubject {
         case .message:
             channelsForPublicReaction = context.engine.peers.channelsForPublicReaction(useLocalCache: true)
-        case let .liveStream(_, _, _, _, availableSendAsPeers):
+        case let .liveStream(_, _, _, _, availableSendAsPeers, _):
             channelsForPublicReaction = .single(availableSendAsPeers)
         }
         
@@ -2958,7 +2996,7 @@ public class ChatSendStarsScreen: ViewControllerComponentContainer {
         }
         
         var minAmount = 1
-        if case let .liveStream(_, _, minAmountValue, _, _) = reactSubject {
+        if case let .liveStream(_, _, minAmountValue, _, _, _) = reactSubject {
             minAmount = minAmountValue
         }
         

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

@@ -3306,10 +3306,10 @@ public final class StoryItemSetContainerComponent: Component {
                             }
                         },
                         sendStarsAction: (isLiveStream && canSendStars) ? { [weak self] sourceView, isLongPress in
-                            guard let self else {
+                            guard let self, let component = self.component else {
                                 return
                             }
-                            if isLongPress {
+                            if isLongPress || component.isEmbeddedInCamera {
                                 self.sendMessageContext.openSendStars(view: self)
                             } else {
                                 self.sendMessageContext.performSendStars(view: self, buttonView: sourceView, count: 1, isFromExpandedView: false)

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

@@ -4041,7 +4041,7 @@ final class StoryItemSetContainerSendMessage: @unchecked(Sendable) {
                 context: component.context,
                 peerId: peerId,
                 myPeer: (sendAsPeer?.peer).flatMap(EnginePeer.init),
-                reactSubject: .liveStream(peerId: peerId, storyId: focusedItem.storyItem.id, minAmount: Int(minAmount), liveChatMessageParams: LiveChatMessageParams(appConfig: component.context.currentAppConfiguration.with({ $0 })), availableSendAsPeers: self.sendAsData?.availablePeers.map({ EnginePeer($0.peer) }) ?? []),
+                reactSubject: .liveStream(peerId: peerId, storyId: focusedItem.storyItem.id, minAmount: Int(minAmount), liveChatMessageParams: LiveChatMessageParams(appConfig: component.context.currentAppConfiguration.with({ $0 })), availableSendAsPeers: component.isEmbeddedInCamera ? [] : (self.sendAsData?.availablePeers.map({ EnginePeer($0.peer) }) ?? []), isDisplayOnly: component.isEmbeddedInCamera),
                 topPeers: topPeers,
                 completion: { [weak self, weak view] amount, privacy, _, _ in
                     guard let self, let view else {