Story improvements

submodules/DrawingUI/Sources/DrawingStickerEntity.swift

@@ -545,10 +545,11 @@ public final class DrawingStickerEntityView: DrawingEntityView {
         }
         
         reactionContextNode.premiumReactionsSelected = { [weak self] file in
-            guard let self, let file else {
+            guard let self else {
                 return
             }
 
+            if let file {
                 let context = self.context
                 let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                 
@@ -560,6 +561,10 @@ public final class DrawingStickerEntityView: DrawingEntityView {
                     return false
                 })
                 self.containerView?.present(controller)
+            } else {
+                let controller = self.context.sharedContext.makePremiumIntroController(context: self.context, source: .storiesExpirationDurations, forceDark: true, dismissed: nil)
+                self.containerView?.push(controller)
+            }
         }
         
         let anchorRect = self.convert(self.bounds, to: superview).offsetBy(dx: 0.0, dy: -20.0)

submodules/ReactionSelectionNode/Sources/ReactionContextNode.swift

@@ -2621,15 +2621,43 @@ public final class StandaloneReactionAnimation: ASDisplayNode {
             
             var additionalCachePathPrefix: String?
             additionalCachePathPrefix = itemNode.context.account.postbox.mediaBox.shortLivedResourceCachePathPrefix(additionalAnimation.resource.id)
-            //#if DEBUG
             additionalCachePathPrefix = nil
-            //#endif
             
             additionalAnimationNodeValue.setup(source: AnimatedStickerResourceSource(account: itemNode.context.account, resource: additionalAnimation.resource), width: Int(effectFrame.width * 1.33), height: Int(effectFrame.height * 1.33), playbackMode: .once, mode: .direct(cachePathPrefix: additionalCachePathPrefix))
             additionalAnimationNodeValue.frame = effectFrame
             additionalAnimationNodeValue.updateLayout(size: effectFrame.size)
             self.addSubnode(additionalAnimationNodeValue)
         } else if itemNode.item.isCustom {
+            
+            var effectURL: URL?
+            if let genericReactionEffect = self.genericReactionEffect {
+                effectURL = URL(fileURLWithPath: genericReactionEffect)
+            } else {
+                if let url = getAppBundle().url(forResource: "generic_reaction_small_effect", withExtension: "json") {
+                    effectURL = url
+                }
+            }
+            
+            if "".isEmpty, let effectURL {
+                let additionalAnimationNodeValue: AnimatedStickerNode
+                if self.useDirectRendering {
+                    additionalAnimationNodeValue = DirectAnimatedStickerNode()
+                } else {
+                    additionalAnimationNodeValue = DefaultAnimatedStickerNodeImpl()
+                }
+                additionalAnimationNode = additionalAnimationNodeValue
+                
+                if isLarge && !forceSmallEffectAnimation {
+                    if incomingMessage {
+                        additionalAnimationNodeValue.transform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
+                    }
+                }
+                
+                additionalAnimationNodeValue.setup(source: AnimatedStickerNodeLocalFileSource(name: effectURL.path), width: Int(effectFrame.width * 1.33), height: Int(effectFrame.height * 1.33), playbackMode: .once, mode: .direct(cachePathPrefix: nil))
+                additionalAnimationNodeValue.frame = effectFrame
+                additionalAnimationNodeValue.updateLayout(size: effectFrame.size)
+                self.addSubnode(additionalAnimationNodeValue)
+            } else {
                 additionalAnimationNode = nil
                 
                 var effectData: Data?
@@ -2686,6 +2714,7 @@ public final class StandaloneReactionAnimation: ASDisplayNode {
                     view.frame = effectFrame.insetBy(dx: -20.0, dy: -20.0)//.offsetBy(dx: incomingMessage ? 22.0 : -22.0, dy: 0.0)
                     self.view.addSubview(view)
                 }
+            }
         } else {
             additionalAnimationNode = nil
         }

submodules/TelegramAnimatedStickerNode/Sources/TelegramAnimatedStickerNode.swift

@@ -40,7 +40,7 @@ public final class AnimatedStickerNodeLocalFileSource: AnimatedStickerNodeSource
         } else if let path = getAppBundle().path(forResource: self.name, ofType: "json") {
             return path
         } else {
-            return nil
+            return self.name
         }
     }
 }

submodules/TelegramCore/Sources/TelegramEngine/Messages/StoryListContext.swift

@@ -584,6 +584,18 @@ public final class PeerStoryListContext {
                                 }
                             }
                         }
+                        for mediaArea in mappedItem.mediaAreas {
+                            if case let .reaction(_, reaction, _) = mediaArea {
+                                if case let .custom(fileId) = reaction {
+                                    let mediaId = MediaId(namespace: Namespaces.Media.CloudFile, id: fileId)
+                                    if allEntityFiles[mediaId] == nil {
+                                        if let file = transaction.getMedia(mediaId) as? TelegramMediaFile {
+                                            allEntityFiles[file.fileId] = file
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
                 

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

@@ -563,7 +563,11 @@ public final class PeerListItemComponent: Component {
             }
             
             let availableTextWidth = availableSize.width - leftInset - rightInset
-            let titleAvailableWidth = component.style == .compact ? availableTextWidth * 0.7 : availableSize.width - leftInset - rightInset
+            var titleAvailableWidth = component.style == .compact ? availableTextWidth * 0.7 : availableSize.width - leftInset - rightInset
+            if case .none = component.rightAccessory {
+            } else {
+                titleAvailableWidth -= 20.0
+            }
             let titleSize = self.title.update(
                 transition: .immediate,
                 component: AnyComponent(MultilineTextComponent(

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

@@ -1394,7 +1394,6 @@ private final class StoryContainerScreenComponent: Component {
                         
                         itemSetView.view.parentState = self.state
                         
-                        let startTime = CFAbsoluteTimeGetCurrent()
                         let _ = itemSetView.view.update(
                             transition: itemSetTransition,
                             component: AnyComponent(StoryItemSetContainerComponent(
@@ -1538,7 +1537,7 @@ private final class StoryContainerScreenComponent: Component {
                         if let itemSetComponentView = itemSetView.view.view as? StoryItemSetContainerComponent.View {
                             if itemSetView.superview == nil {
                                 self.addSubview(itemSetView)
-                                print("init time: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+                                //print("init time: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
                             }
                             if itemSetComponentView.superview == nil {
                                 itemSetView.tintLayer.isDoubleSided = false

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

@@ -1574,6 +1574,9 @@ public final class StoryItemSetContainerComponent: Component {
                                 self.visibleItems.removeValue(forKey: itemId)
                                 visibleItem.contentContainerView.removeFromSuperview()
                                 visibleItem.unclippedContainerView.removeFromSuperview()
+                                visibleItem.contentTintLayer.removeFromSuperlayer()
+                                visibleItem.footerPanel?.view?.removeFromSuperview()
+                                visibleItem.contentViewsShadowView?.removeFromSuperview()
                             }
                         })
                         itemTransition.setBounds(view: visibleItem.contentContainerView, bounds: CGRect(origin: CGPoint(), size: itemLayout.contentFrame.size))

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

@@ -3328,7 +3328,7 @@ final class StoryItemSetContainerSendMessage {
                     view.standaloneReactionAnimation = nil
                     
                     let standaloneReactionAnimationView = standaloneReactionAnimation.view
-                    standaloneReactionAnimation.view.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.1, removeOnCompletion: false, completion: { [weak standaloneReactionAnimationView] _ in
+                    standaloneReactionAnimation.view.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak standaloneReactionAnimationView] _ in
                         standaloneReactionAnimationView?.removeFromSuperview()
                     })
                 }