Merge commit '9a2253d7fd36f396b9d16b23a7727e06e59e49f0'

This commit is contained in:
Ali
2021-01-22 17:40:52 +04:00
20 changed files with 3437 additions and 3331 deletions

View File

@@ -17,7 +17,7 @@ private enum ChatReportPeerTitleButton: Equatable {
case reportUserSpam
case reportIrrelevantGeoLocation
case unarchive
case inviteMembers
case addMembers
func title(strings: PresentationStrings) -> String {
switch self {
@@ -39,8 +39,8 @@ private enum ChatReportPeerTitleButton: Equatable {
return strings.Conversation_ReportGroupLocation
case .unarchive:
return strings.Conversation_Unarchive
case .inviteMembers:
return strings.PeerInfo_ButtonAddMember
case .addMembers:
return strings.Conversation_AddMembers
}
}
}
@@ -88,13 +88,13 @@ private func peerButtons(_ state: ChatPresentationInterfaceState) -> [ChatReport
}
}
} else if let _ = state.renderedPeer?.chatMainPeer {
if let contactStatus = state.contactStatus, contactStatus.canReportIrrelevantLocation, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
if let contactStatus = state.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.suggestAddMembers) {
buttons.append(.addMembers)
} else if let contactStatus = state.contactStatus, contactStatus.canReportIrrelevantLocation, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
buttons.append(.reportIrrelevantGeoLocation)
} else if let contactStatus = state.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.autoArchived) {
buttons.append(.reportUserSpam)
buttons.append(.unarchive)
} else if let peerStatusSettings = state.contactStatus?.peerStatusSettings, peerStatusSettings.contains(.inviteMembers) {
buttons.append(.inviteMembers)
} else {
buttons.append(.reportSpam)
}
@@ -515,7 +515,7 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
self.interfaceInteraction?.reportPeer()
case .unarchive:
self.interfaceInteraction?.unarchivePeer()
case .inviteMembers:
case .addMembers:
self.interfaceInteraction?.presentInviteMembers()
case .addContact:
self.interfaceInteraction?.presentPeerContact()