Merge branch 'master' into buck-test

This commit is contained in:
Peter
2019-08-30 04:16:26 +04:00
660 changed files with 20469 additions and 11858 deletions

View File

@@ -83,8 +83,8 @@ public enum MessageContentKind: Equatable {
public func messageContentKind(_ message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId) -> MessageContentKind {
for attribute in message.attributes {
if let attribute = attribute as? RestrictedContentMessageAttribute {
if attribute.matchesPlatform() {
return .restricted(attribute.text)
if let text = attribute.platformText(platform: "ios") {
return .restricted(text)
}
break
}