Skip to content

Commit e56c345

Browse files
author
Isaac
committed
Fix
1 parent 441b4cc commit e56c345

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,14 @@ public final class MessageInputPanelComponent: Component {
178178
public var isExpanded: Bool
179179
public var isEmpty: Bool
180180
public var hasUnseenMessages: Bool
181+
public var isUnifiedStream: Bool
181182

182-
public init(isEnabled: Bool, isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool) {
183+
public init(isEnabled: Bool, isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool, isUnifiedStream: Bool) {
183184
self.isEnabled = isEnabled
184185
self.isExpanded = isExpanded
185186
self.isEmpty = isEmpty
186187
self.hasUnseenMessages = hasUnseenMessages
188+
self.isUnifiedStream = isUnifiedStream
187189
}
188190
}
189191

@@ -1065,7 +1067,7 @@ public final class MessageInputPanelComponent: Component {
10651067
rightAction = ChatTextInputPanelComponent.RightAction(kind: .empty, action: { _ in })
10661068
}
10671069
var secondaryRightAction: ChatTextInputPanelComponent.RightAction?
1068-
if component.isEmbeddedInCamera, let call = component.call {
1070+
if component.isEmbeddedInCamera, let call = component.call, let liveChatState = component.liveChatState, !liveChatState.isUnifiedStream {
10691071
secondaryRightAction = ChatTextInputPanelComponent.RightAction(kind: .liveMicrophone(call: call), action: { [weak self] sourceView in
10701072
guard let self, let component = self.component else {
10711073
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ final class StoryContentLiveChatComponent: Component {
421421
}
422422

423423
var items: [ContextMenuItem] = []
424-
if !isPinned {
424+
if !isPinned, let messagesState = self.messagesState, let message = messagesState.messages.first(where: { $0.id == id }), !message.text.isEmpty {
425425
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
426426
guard let self else {
427427
return

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ final class StoryItemContentComponent: Component {
119119
var starStats: StarStats?
120120
var isAdmin: Bool
121121
var defaultSendAs: EnginePeer.Id?
122+
var isUnifiedStream: Bool
122123

123-
init(isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool, areMessagesEnabled: Bool, minMessagePrice: Int64?, starStats: StarStats?, isAdmin: Bool, defaultSendAs: EnginePeer.Id?) {
124+
init(isExpanded: Bool, isEmpty: Bool, hasUnseenMessages: Bool, areMessagesEnabled: Bool, minMessagePrice: Int64?, starStats: StarStats?, isAdmin: Bool, defaultSendAs: EnginePeer.Id?, isUnifiedStream: Bool) {
124125
self.isExpanded = isExpanded
125126
self.isEmpty = isEmpty
126127
self.hasUnseenMessages = hasUnseenMessages
@@ -129,6 +130,7 @@ final class StoryItemContentComponent: Component {
129130
self.starStats = starStats
130131
self.isAdmin = isAdmin
131132
self.defaultSendAs = defaultSendAs
133+
self.isUnifiedStream = isUnifiedStream
132134
}
133135
}
134136

@@ -238,7 +240,8 @@ final class StoryItemContentComponent: Component {
238240
minMessagePrice: mediaStreamCallState?.minMessagePrice,
239241
starStats: starStats,
240242
isAdmin: mediaStreamCallState?.isAdmin ?? false,
241-
defaultSendAs: mediaStreamCallState?.defaultSendAs
243+
defaultSendAs: mediaStreamCallState?.defaultSendAs,
244+
isUnifiedStream: mediaStreamCallState?.isUnifiedStream ?? false
242245
)
243246
}
244247

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3009,7 +3009,8 @@ public final class StoryItemSetContainerComponent: Component {
30093009
isEnabled: liveChatStateValue.areMessagesEnabled,
30103010
isExpanded: liveChatStateValue.isExpanded,
30113011
isEmpty: liveChatStateValue.isEmpty,
3012-
hasUnseenMessages: liveChatStateValue.hasUnseenMessages
3012+
hasUnseenMessages: liveChatStateValue.hasUnseenMessages,
3013+
isUnifiedStream: liveChatStateValue.isUnifiedStream
30133014
)
30143015
starStats = liveChatStateValue.starStats.flatMap { starStats in
30153016
return MessageInputPanelComponent.StarStats(

0 commit comments

Comments
 (0)