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

This commit is contained in:
Ilya Laktyushin 2020-10-19 20:51:13 +04:00
commit 26848ce702

View File

@ -648,21 +648,12 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState:
if data.canPin, case .peer = chatPresentationInterfaceState.chatLocation { if data.canPin, case .peer = chatPresentationInterfaceState.chatLocation {
var pinnedSelectedMessageId: MessageId? var pinnedSelectedMessageId: MessageId?
if let _ = chatPresentationInterfaceState.renderedPeer?.peer as? TelegramChannel {
for message in messages { for message in messages {
if message.tags.contains(.pinned) { if message.tags.contains(.pinned) {
pinnedSelectedMessageId = message.id pinnedSelectedMessageId = message.id
break break
} }
} }
} else {
for message in messages {
if chatPresentationInterfaceState.pinnedMessage?.message.id == message.id {
pinnedSelectedMessageId = message.id
break
}
}
}
if let pinnedSelectedMessageId = pinnedSelectedMessageId { if let pinnedSelectedMessageId = pinnedSelectedMessageId {
actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.Conversation_Unpin, icon: { theme in actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.Conversation_Unpin, icon: { theme in