mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2026-01-08 05:55:13 +00:00
Merge branch 'monoforums'
This commit is contained in:
@@ -1548,8 +1548,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
break
|
||||
case .businessLinkSetup:
|
||||
displayMediaButton = false
|
||||
case .postSuggestions:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1875,7 +1873,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
peerUpdated = true
|
||||
}
|
||||
|
||||
if peerUpdated || previousState?.interfaceState.silentPosting != interfaceState.interfaceState.silentPosting || themeUpdated || !self.initializedPlaceholder || previousState?.keyboardButtonsMessage?.id != interfaceState.keyboardButtonsMessage?.id || previousState?.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder != interfaceState.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder || dismissedButtonMessageUpdated || replyMessageUpdated || (previousState?.interfaceState.editMessage == nil) != (interfaceState.interfaceState.editMessage == nil) || previousState?.forumTopicData != interfaceState.forumTopicData || previousState?.replyMessage?.id != interfaceState.replyMessage?.id || previousState?.sendPaidMessageStars != interfaceState.sendPaidMessageStars {
|
||||
if peerUpdated || previousState?.chatLocation != interfaceState.chatLocation || previousState?.interfaceState.silentPosting != interfaceState.interfaceState.silentPosting || themeUpdated || !self.initializedPlaceholder || previousState?.keyboardButtonsMessage?.id != interfaceState.keyboardButtonsMessage?.id || previousState?.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder != interfaceState.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder || dismissedButtonMessageUpdated || replyMessageUpdated || (previousState?.interfaceState.editMessage == nil) != (interfaceState.interfaceState.editMessage == nil) || previousState?.forumTopicData != interfaceState.forumTopicData || previousState?.replyMessage?.id != interfaceState.replyMessage?.id || previousState?.sendPaidMessageStars != interfaceState.sendPaidMessageStars {
|
||||
self.initializedPlaceholder = true
|
||||
|
||||
var placeholder: String = ""
|
||||
@@ -1904,7 +1902,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
} else {
|
||||
placeholder = interfaceState.strings.Conversation_InputTextPlaceholderReply
|
||||
}
|
||||
} else if let channel = peer as? TelegramChannel, channel.isForum, let forumTopicData = interfaceState.forumTopicData {
|
||||
} else if let channel = peer as? TelegramChannel, channel.isForumOrMonoForum, let forumTopicData = interfaceState.forumTopicData {
|
||||
if let replyMessage = interfaceState.replyMessage, let threadInfo = replyMessage.associatedThreadInfo {
|
||||
placeholder = interfaceState.strings.Chat_InputPlaceholderReplyInTopic(threadInfo.title).string
|
||||
} else {
|
||||
@@ -1936,10 +1934,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
}
|
||||
case .businessLinkSetup:
|
||||
placeholder = interfaceState.strings.Chat_Placeholder_BusinessLinkPreset
|
||||
case let .postSuggestions(postSuggestions):
|
||||
//TODO:localize
|
||||
placeholder = "Suggest for # \(postSuggestions)"
|
||||
placeholderHasStar = true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1967,8 +1961,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
break
|
||||
case .businessLinkSetup:
|
||||
sendButtonHasApplyIcon = true
|
||||
case .postSuggestions:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2496,8 +2488,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
showTitle = true
|
||||
} else if case let .customChatContents(customChatContents) = interfaceState.subject {
|
||||
switch customChatContents.kind {
|
||||
case .postSuggestions:
|
||||
showTitle = true
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -3775,8 +3765,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
break
|
||||
case .businessLinkSetup:
|
||||
keepSendButtonEnabled = true
|
||||
case .postSuggestions:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3897,8 +3885,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
break
|
||||
case .businessLinkSetup:
|
||||
hideMicButton = true
|
||||
case .postSuggestions:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4004,8 +3990,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
|
||||
break
|
||||
case .businessLinkSetup:
|
||||
sendButtonHasApplyIcon = true
|
||||
case .postSuggestions:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user