From 0f20c37afabad34a25d433076561ae084258a7af Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 31 Jan 2022 08:56:42 +1100 Subject: [PATCH] Regenerated the SessionProtos for message requests --- .../Protos/Generated/SNProto.swift | 28 ++ .../Protos/Generated/SessionProtos.pb.swift | 434 +++++++++++------- .../Generated/WebSocketResources.pb.swift | 56 ++- .../Protos/SessionProtos.proto | 2 + 4 files changed, 338 insertions(+), 182 deletions(-) diff --git a/SessionMessagingKit/Protos/Generated/SNProto.swift b/SessionMessagingKit/Protos/Generated/SNProto.swift index 8d4f98a4e..41e8cb9cc 100644 --- a/SessionMessagingKit/Protos/Generated/SNProto.swift +++ b/SessionMessagingKit/Protos/Generated/SNProto.swift @@ -2396,6 +2396,12 @@ extension SNProtoConfigurationMessageClosedGroup.SNProtoConfigurationMessageClos if let _value = profileKey { builder.setProfileKey(_value) } + if hasIsApproved { + builder.setIsApproved(isApproved) + } + if hasIsBlocked { + builder.setIsBlocked(isBlocked) + } return builder } @@ -2428,6 +2434,14 @@ extension SNProtoConfigurationMessageClosedGroup.SNProtoConfigurationMessageClos proto.profileKey = valueParam } + @objc public func setIsApproved(_ valueParam: Bool) { + proto.isApproved = valueParam + } + + @objc public func setIsBlocked(_ valueParam: Bool) { + proto.isBlocked = valueParam + } + @objc public func build() throws -> SNProtoConfigurationMessageContact { return try SNProtoConfigurationMessageContact.parseProto(proto) } @@ -2463,6 +2477,20 @@ extension SNProtoConfigurationMessageClosedGroup.SNProtoConfigurationMessageClos return proto.hasProfileKey } + @objc public var isApproved: Bool { + return proto.isApproved + } + @objc public var hasIsApproved: Bool { + return proto.hasIsApproved + } + + @objc public var isBlocked: Bool { + return proto.isBlocked + } + @objc public var hasIsBlocked: Bool { + return proto.hasIsBlocked + } + private init(proto: SessionProtos_ConfigurationMessage.Contact, publicKey: Data, name: String) { diff --git a/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift b/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift index ea16218a6..beb6a5a70 100644 --- a/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift +++ b/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift @@ -1076,6 +1076,26 @@ struct SessionProtos_ConfigurationMessage { /// Clears the value of `profileKey`. Subsequent reads from it will return its default value. mutating func clearProfileKey() {self._profileKey = nil} + /// added for msg requests + var isApproved: Bool { + get {return _isApproved ?? false} + set {_isApproved = newValue} + } + /// Returns true if `isApproved` has been explicitly set. + var hasIsApproved: Bool {return self._isApproved != nil} + /// Clears the value of `isApproved`. Subsequent reads from it will return its default value. + mutating func clearIsApproved() {self._isApproved = nil} + + /// added for msg requests + var isBlocked: Bool { + get {return _isBlocked ?? false} + set {_isBlocked = newValue} + } + /// Returns true if `isBlocked` has been explicitly set. + var hasIsBlocked: Bool {return self._isBlocked != nil} + /// Clears the value of `isBlocked`. Subsequent reads from it will return its default value. + mutating func clearIsBlocked() {self._isBlocked = nil} + var unknownFields = SwiftProtobuf.UnknownStorage() init() {} @@ -1084,6 +1104,8 @@ struct SessionProtos_ConfigurationMessage { fileprivate var _name: String? = nil fileprivate var _profilePicture: String? = nil fileprivate var _profileKey: Data? = nil + fileprivate var _isApproved: Bool? = nil + fileprivate var _isBlocked: Bool? = nil } init() {} @@ -1456,24 +1478,28 @@ extension SessionProtos_Envelope: SwiftProtobuf.Message, SwiftProtobuf._MessageI } func traverse(visitor: inout V) throws { - if let v = self._type { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) - } - if let v = self._source { + } }() + try { if let v = self._source { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._timestamp { + } }() + try { if let v = self._timestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 5) - } - if let v = self._sourceDevice { + } }() + try { if let v = self._sourceDevice { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 7) - } - if let v = self._content { + } }() + try { if let v = self._content { try visitor.visitSingularBytesField(value: v, fieldNumber: 8) - } - if let v = self._serverTimestamp { + } }() + try { if let v = self._serverTimestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 10) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -1523,12 +1549,16 @@ extension SessionProtos_TypingMessage: SwiftProtobuf.Message, SwiftProtobuf._Mes } func traverse(visitor: inout V) throws { - if let v = self._timestamp { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._timestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 1) - } - if let v = self._action { + } }() + try { if let v = self._action { try visitor.visitSingularEnumField(value: v, fieldNumber: 2) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -1574,12 +1604,16 @@ extension SessionProtos_UnsendRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes } func traverse(visitor: inout V) throws { - if let v = self._timestamp { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._timestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 1) - } - if let v = self._author { + } }() + try { if let v = self._author { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -1630,24 +1664,28 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm } func traverse(visitor: inout V) throws { - if let v = self._dataMessage { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._dataMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = self._receiptMessage { + } }() + try { if let v = self._receiptMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } - if let v = self._typingMessage { + } }() + try { if let v = self._typingMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 6) - } - if let v = self._configurationMessage { + } }() + try { if let v = self._configurationMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 7) - } - if let v = self._dataExtractionNotification { + } }() + try { if let v = self._dataExtractionNotification { try visitor.visitSingularMessageField(value: v, fieldNumber: 8) - } - if let v = self._unsendRequest { + } }() + try { if let v = self._unsendRequest { try visitor.visitSingularMessageField(value: v, fieldNumber: 9) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -1690,12 +1728,16 @@ extension SessionProtos_KeyPair: SwiftProtobuf.Message, SwiftProtobuf._MessageIm } func traverse(visitor: inout V) throws { - if let v = self._publicKey { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._publicKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = self._privateKey { + } }() + try { if let v = self._privateKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 2) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -1733,12 +1775,16 @@ extension SessionProtos_DataExtractionNotification: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - if let v = self._type { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) - } - if let v = self._timestamp { + } }() + try { if let v = self._timestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -1859,45 +1905,49 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa func traverse(visitor: inout V) throws { try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._body { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = _storage._body { try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } + } }() if !_storage._attachments.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._attachments, fieldNumber: 2) } - if let v = _storage._group { + try { if let v = _storage._group { try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._flags { + } }() + try { if let v = _storage._flags { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) - } - if let v = _storage._expireTimer { + } }() + try { if let v = _storage._expireTimer { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 5) - } - if let v = _storage._profileKey { + } }() + try { if let v = _storage._profileKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 6) - } - if let v = _storage._timestamp { + } }() + try { if let v = _storage._timestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 7) - } - if let v = _storage._quote { + } }() + try { if let v = _storage._quote { try visitor.visitSingularMessageField(value: v, fieldNumber: 8) - } + } }() if !_storage._preview.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._preview, fieldNumber: 10) } - if let v = _storage._profile { + try { if let v = _storage._profile { try visitor.visitSingularMessageField(value: v, fieldNumber: 101) - } - if let v = _storage._openGroupInvitation { + } }() + try { if let v = _storage._openGroupInvitation { try visitor.visitSingularMessageField(value: v, fieldNumber: 102) - } - if let v = _storage._closedGroupControlMessage { + } }() + try { if let v = _storage._closedGroupControlMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 104) - } - if let v = _storage._syncTarget { + } }() + try { if let v = _storage._syncTarget { try visitor.visitSingularStringField(value: v, fieldNumber: 105) - } + } }() } try unknownFields.traverse(visitor: &visitor) } @@ -1967,15 +2017,19 @@ extension SessionProtos_DataMessage.Quote: SwiftProtobuf.Message, SwiftProtobuf. } func traverse(visitor: inout V) throws { - if let v = self._id { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._id { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 1) - } - if let v = self._author { + } }() + try { if let v = self._author { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._text { + } }() + try { if let v = self._text { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } + } }() if !self.attachments.isEmpty { try visitor.visitRepeatedMessageField(value: self.attachments, fieldNumber: 4) } @@ -2022,18 +2076,22 @@ extension SessionProtos_DataMessage.Quote.QuotedAttachment: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - if let v = self._contentType { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._contentType { try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._fileName { + } }() + try { if let v = self._fileName { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._thumbnail { + } }() + try { if let v = self._thumbnail { try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = self._flags { + } }() + try { if let v = self._flags { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2082,15 +2140,19 @@ extension SessionProtos_DataMessage.Preview: SwiftProtobuf.Message, SwiftProtobu } func traverse(visitor: inout V) throws { - if let v = self._url { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._url { try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._title { + } }() + try { if let v = self._title { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._image { + } }() + try { if let v = self._image { try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2124,12 +2186,16 @@ extension SessionProtos_DataMessage.LokiProfile: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - if let v = self._displayName { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._displayName { try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._profilePicture { + } }() + try { if let v = self._profilePicture { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2168,12 +2234,16 @@ extension SessionProtos_DataMessage.OpenGroupInvitation: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - if let v = self._url { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._url { try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._name { + } }() + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2225,18 +2295,22 @@ extension SessionProtos_DataMessage.ClosedGroupControlMessage: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - if let v = self._type { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) - } - if let v = self._publicKey { + } }() + try { if let v = self._publicKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 2) - } - if let v = self._name { + } }() + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } - if let v = self._encryptionKeyPair { + } }() + try { if let v = self._encryptionKeyPair { try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - } + } }() if !self.members.isEmpty { try visitor.visitRepeatedBytesField(value: self.members, fieldNumber: 5) } @@ -2246,9 +2320,9 @@ extension SessionProtos_DataMessage.ClosedGroupControlMessage: SwiftProtobuf.Mes if !self.wrappers.isEmpty { try visitor.visitRepeatedMessageField(value: self.wrappers, fieldNumber: 7) } - if let v = self._expirationTimer { + try { if let v = self._expirationTimer { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 8) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2305,12 +2379,16 @@ extension SessionProtos_DataMessage.ClosedGroupControlMessage.KeyPairWrapper: Sw } func traverse(visitor: inout V) throws { - if let v = self._publicKey { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._publicKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = self._encryptedKeyPair { + } }() + try { if let v = self._encryptedKeyPair { try visitor.visitSingularBytesField(value: v, fieldNumber: 2) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2357,21 +2435,25 @@ extension SessionProtos_ConfigurationMessage: SwiftProtobuf.Message, SwiftProtob } func traverse(visitor: inout V) throws { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 if !self.closedGroups.isEmpty { try visitor.visitRepeatedMessageField(value: self.closedGroups, fieldNumber: 1) } if !self.openGroups.isEmpty { try visitor.visitRepeatedStringField(value: self.openGroups, fieldNumber: 2) } - if let v = self._displayName { + try { if let v = self._displayName { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } - if let v = self._profilePicture { + } }() + try { if let v = self._profilePicture { try visitor.visitSingularStringField(value: v, fieldNumber: 4) - } - if let v = self._profileKey { + } }() + try { if let v = self._profileKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 5) - } + } }() if !self.contacts.isEmpty { try visitor.visitRepeatedMessageField(value: self.contacts, fieldNumber: 6) } @@ -2424,24 +2506,28 @@ extension SessionProtos_ConfigurationMessage.ClosedGroup: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - if let v = self._publicKey { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._publicKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = self._name { + } }() + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._encryptionKeyPair { + } }() + try { if let v = self._encryptionKeyPair { try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + } }() if !self.members.isEmpty { try visitor.visitRepeatedBytesField(value: self.members, fieldNumber: 4) } if !self.admins.isEmpty { try visitor.visitRepeatedBytesField(value: self.admins, fieldNumber: 5) } - if let v = self._expirationTimer { + try { if let v = self._expirationTimer { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 6) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2464,6 +2550,8 @@ extension SessionProtos_ConfigurationMessage.Contact: SwiftProtobuf.Message, Swi 2: .same(proto: "name"), 3: .same(proto: "profilePicture"), 4: .same(proto: "profileKey"), + 5: .same(proto: "isApproved"), + 6: .same(proto: "isBlocked"), ] public var isInitialized: Bool { @@ -2482,24 +2570,36 @@ extension SessionProtos_ConfigurationMessage.Contact: SwiftProtobuf.Message, Swi case 2: try { try decoder.decodeSingularStringField(value: &self._name) }() case 3: try { try decoder.decodeSingularStringField(value: &self._profilePicture) }() case 4: try { try decoder.decodeSingularBytesField(value: &self._profileKey) }() + case 5: try { try decoder.decodeSingularBoolField(value: &self._isApproved) }() + case 6: try { try decoder.decodeSingularBoolField(value: &self._isBlocked) }() default: break } } } func traverse(visitor: inout V) throws { - if let v = self._publicKey { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._publicKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = self._name { + } }() + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._profilePicture { + } }() + try { if let v = self._profilePicture { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } - if let v = self._profileKey { + } }() + try { if let v = self._profileKey { try visitor.visitSingularBytesField(value: v, fieldNumber: 4) - } + } }() + try { if let v = self._isApproved { + try visitor.visitSingularBoolField(value: v, fieldNumber: 5) + } }() + try { if let v = self._isBlocked { + try visitor.visitSingularBoolField(value: v, fieldNumber: 6) + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2508,6 +2608,8 @@ extension SessionProtos_ConfigurationMessage.Contact: SwiftProtobuf.Message, Swi if lhs._name != rhs._name {return false} if lhs._profilePicture != rhs._profilePicture {return false} if lhs._profileKey != rhs._profileKey {return false} + if lhs._isApproved != rhs._isApproved {return false} + if lhs._isBlocked != rhs._isBlocked {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -2539,9 +2641,13 @@ extension SessionProtos_ReceiptMessage: SwiftProtobuf.Message, SwiftProtobuf._Me } func traverse(visitor: inout V) throws { - if let v = self._type { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) - } + } }() if !self.timestamp.isEmpty { try visitor.visitRepeatedUInt64Field(value: self.timestamp, fieldNumber: 2) } @@ -2609,42 +2715,46 @@ extension SessionProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftProtobuf. } func traverse(visitor: inout V) throws { - if let v = self._id { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._id { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 1) - } - if let v = self._contentType { + } }() + try { if let v = self._contentType { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._key { + } }() + try { if let v = self._key { try visitor.visitSingularBytesField(value: v, fieldNumber: 3) - } - if let v = self._size { + } }() + try { if let v = self._size { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) - } - if let v = self._thumbnail { + } }() + try { if let v = self._thumbnail { try visitor.visitSingularBytesField(value: v, fieldNumber: 5) - } - if let v = self._digest { + } }() + try { if let v = self._digest { try visitor.visitSingularBytesField(value: v, fieldNumber: 6) - } - if let v = self._fileName { + } }() + try { if let v = self._fileName { try visitor.visitSingularStringField(value: v, fieldNumber: 7) - } - if let v = self._flags { + } }() + try { if let v = self._flags { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 8) - } - if let v = self._width { + } }() + try { if let v = self._width { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 9) - } - if let v = self._height { + } }() + try { if let v = self._height { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10) - } - if let v = self._caption { + } }() + try { if let v = self._caption { try visitor.visitSingularStringField(value: v, fieldNumber: 11) - } - if let v = self._url { + } }() + try { if let v = self._url { try visitor.visitSingularStringField(value: v, fieldNumber: 101) - } + } }() try unknownFields.traverse(visitor: &visitor) } @@ -2741,21 +2851,25 @@ extension SessionProtos_GroupContext: SwiftProtobuf.Message, SwiftProtobuf._Mess func traverse(visitor: inout V) throws { try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._id { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = _storage._id { try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = _storage._type { + } }() + try { if let v = _storage._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 2) - } - if let v = _storage._name { + } }() + try { if let v = _storage._name { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } + } }() if !_storage._members.isEmpty { try visitor.visitRepeatedStringField(value: _storage._members, fieldNumber: 4) } - if let v = _storage._avatar { + try { if let v = _storage._avatar { try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } + } }() if !_storage._admins.isEmpty { try visitor.visitRepeatedStringField(value: _storage._admins, fieldNumber: 6) } diff --git a/SessionMessagingKit/Protos/Generated/WebSocketResources.pb.swift b/SessionMessagingKit/Protos/Generated/WebSocketResources.pb.swift index 4c6491fa2..737e40ce6 100644 --- a/SessionMessagingKit/Protos/Generated/WebSocketResources.pb.swift +++ b/SessionMessagingKit/Protos/Generated/WebSocketResources.pb.swift @@ -249,18 +249,22 @@ extension WebSocketProtos_WebSocketRequestMessage: SwiftProtobuf.Message, SwiftP } func traverse(visitor: inout V) throws { - if let v = self._verb { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._verb { try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._path { + } }() + try { if let v = self._path { try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = self._body { + } }() + try { if let v = self._body { try visitor.visitSingularBytesField(value: v, fieldNumber: 3) - } - if let v = self._requestID { + } }() + try { if let v = self._requestID { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) - } + } }() if !self.headers.isEmpty { try visitor.visitRepeatedStringField(value: self.headers, fieldNumber: 5) } @@ -305,18 +309,22 @@ extension WebSocketProtos_WebSocketResponseMessage: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - if let v = self._requestID { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._requestID { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 1) - } - if let v = self._status { + } }() + try { if let v = self._status { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 2) - } - if let v = self._message { + } }() + try { if let v = self._message { try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } - if let v = self._body { + } }() + try { if let v = self._body { try visitor.visitSingularBytesField(value: v, fieldNumber: 4) - } + } }() if !self.headers.isEmpty { try visitor.visitRepeatedStringField(value: self.headers, fieldNumber: 5) } @@ -357,15 +365,19 @@ extension WebSocketProtos_WebSocketMessage: SwiftProtobuf.Message, SwiftProtobuf } func traverse(visitor: inout V) throws { - if let v = self._type { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every if/case branch local when no optimizations + // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and + // https://github.com/apple/swift-protobuf/issues/1182 + try { if let v = self._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) - } - if let v = self._request { + } }() + try { if let v = self._request { try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = self._response { + } }() + try { if let v = self._response { try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + } }() try unknownFields.traverse(visitor: &visitor) } diff --git a/SessionMessagingKit/Protos/SessionProtos.proto b/SessionMessagingKit/Protos/SessionProtos.proto index 5b1999255..37e71a933 100644 --- a/SessionMessagingKit/Protos/SessionProtos.proto +++ b/SessionMessagingKit/Protos/SessionProtos.proto @@ -179,6 +179,8 @@ message ConfigurationMessage { required string name = 2; optional string profilePicture = 3; optional bytes profileKey = 4; + optional bool isApproved = 5; // added for msg requests + optional bool isBlocked = 6; // added for msg requests } repeated ClosedGroup closedGroups = 1;