convert init in extension to factory method

billypchan · May 31, 2021 · 89277d8 · 89277d8
1 parent 576aba7
commit 89277d8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Source/Model/Message/ZMClientMessage+LinkPreview.swift b/Source/Model/Message/ZMClientMessage+LinkPreview.swift
@@ -175,7 +175,7 @@ extension ZMClientMessage: ZMImageOwner {
 
             let text = Text.with {
                 $0.content = textMessageData.messageText ?? ""
-                $0.mentions = textMessageData.mentions.compactMap { WireProtos.Mention($0) }
+                $0.mentions = textMessageData.mentions.compactMap { WireProtos.Mention.createMention($0) }
                 $0.linkPreview = [linkPreview]
             }
 

diff --git a/Source/Utilis/Protos/GenericMessage+Helper.swift b/Source/Utilis/Protos/GenericMessage+Helper.swift
@@ -358,7 +358,7 @@ extension Text {
     public init(content: String, mentions: [Mention] = [], linkPreviews: [LinkMetadata] = [], replyingTo: ZMOTRMessage? = nil) {
         self = Text.with {
             $0.content = content
-            $0.mentions = mentions.compactMap { WireProtos.Mention($0) }
+            $0.mentions = mentions.compactMap { WireProtos.Mention.createMention($0) }
             $0.linkPreview = linkPreviews.map { WireProtos.LinkPreview($0) }
 
             if let quotedMessage = replyingTo,
@@ -517,10 +517,10 @@ extension External {
 // MARK: - Mention
 
 public extension WireProtos.Mention {
-    init?(_ mention: WireDataModel.Mention) {
+    static func createMention(_ mention: WireDataModel.Mention) -> WireProtos.Mention? {
         guard let userID = (mention.user as? ZMUser)?.remoteIdentifier.transportString() else { return nil }
 
-        self = WireProtos.Mention.with {
+        return WireProtos.Mention.with {
             $0.start = Int32(mention.range.location)
             $0.length = Int32(mention.range.length)
             $0.userID = userID
@@ -531,8 +531,8 @@ public extension WireProtos.Mention {
 // MARK: - Availability
 
 extension WireProtos.Availability {
-    public init(_ availability: Availability) {
-        self = WireProtos.Availability.with {
+    public static func createAvailability(_ availability: Availability) -> WireProtos.Availability {
+        return WireProtos.Availability.with {
             switch availability {
             case .none:
                 $0.type = .none

diff --git a/Tests/Source/Model/Messages/GenericMessageTests.swift b/Tests/Source/Model/Messages/GenericMessageTests.swift
@@ -38,7 +38,7 @@ class GenericMessageTests: XCTestCase {
             { return GenericMessage(content: Location(latitude: 1, longitude: 2)) },
             { return GenericMessage(content: MessageDelete(messageId: UUID.create())) },
             { return GenericMessage(content: WireProtos.Reaction.createReaction(emoji: "test", messageID: UUID.create())) },
-            { return GenericMessage(content: WireProtos.Availability(.away)) }
+            { return GenericMessage(content: WireProtos.Availability.createAvailability(.away)) }
         ]
 
         generators.forEach { generator in

diff --git a/Tests/Source/Model/Messages/ZMClientMessageTests.swift b/Tests/Source/Model/Messages/ZMClientMessageTests.swift
@@ -378,7 +378,7 @@ extension ClientMessageTests {
         let senderClientID = NSString.createAlphanumerical()
         let conversation = ZMConversation.insertNewObject(in: self.uiMOC)
         conversation.remoteIdentifier = UUID.create()
-        let availability = WireProtos.Availability(.away) 
+        let availability = WireProtos.Availability.createAvailability(.away) 
         let contentData = try? GenericMessage(content: availability, nonce: UUID.create()).serializedData()
         let data: NSDictionary = [
             "sender": senderClientID,

diff --git a/Tests/Source/Model/User/ZMUserTests+Swift.swift b/Tests/Source/Model/User/ZMUserTests+Swift.swift
@@ -466,7 +466,7 @@ extension ZMUserTests_Swift {
         // given
         let user = ZMUser.insert(in: self.uiMOC, name: "Foo")
         XCTAssertEqual(user.availability, .none)
-        let availability = WireProtos.Availability(.away)
+        let availability = WireProtos.Availability.createAvailability(.away)
         // when
         user.updateAvailability(from: GenericMessage(content: availability))