From a782f36aa4408cdc7fea86eda486216a1847c558 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 6 Nov 2020 16:01:51 +1100
Subject: [PATCH] Clean

---
 .../Messages/Control Message/ClosedGroupUpdate.swift   |  2 +-
 .../Messages/Control Message/SessionRequest.swift      |  2 +-
 .../Visible Message/VisibleMessage+LinkPreview.swift   |  8 ++++----
 .../Visible Message/VisibleMessage+Profile.swift       | 10 ++++++++--
 .../Visible Message/VisibleMessage+Quote.swift         |  4 ++--
 SessionMessagingKit/Utilities/ProofOfWork.swift        |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/SessionMessagingKit/Messages/Control Message/ClosedGroupUpdate.swift b/SessionMessagingKit/Messages/Control Message/ClosedGroupUpdate.swift
index 27efebb41..acdc3fa05 100644
--- a/SessionMessagingKit/Messages/Control Message/ClosedGroupUpdate.swift	
+++ b/SessionMessagingKit/Messages/Control Message/ClosedGroupUpdate.swift	
@@ -1,5 +1,5 @@
-import SessionUtilities
 import SessionProtocolKit
+import SessionUtilities
 
 @objc(SNClosedGroupUpdate)
 public final class ClosedGroupUpdate : ControlMessage {
diff --git a/SessionMessagingKit/Messages/Control Message/SessionRequest.swift b/SessionMessagingKit/Messages/Control Message/SessionRequest.swift
index 995881c0f..0f0223008 100644
--- a/SessionMessagingKit/Messages/Control Message/SessionRequest.swift	
+++ b/SessionMessagingKit/Messages/Control Message/SessionRequest.swift	
@@ -1,5 +1,5 @@
-import SessionUtilities
 import SessionProtocolKit
+import SessionUtilities
 
 @objc(SNSessionRequest)
 public final class SessionRequest : ControlMessage {
diff --git a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift
index 072978b03..5c7839032 100644
--- a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift	
+++ b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift	
@@ -7,7 +7,7 @@ public extension VisibleMessage {
         public var title: String?
         public var url: String?
 
-        internal init(title: String, url: String) {
+        internal init(title: String?, url: String) {
             self.title = title
             self.url = url
         }
@@ -23,18 +23,18 @@ public extension VisibleMessage {
         }
 
         public static func fromProto(_ proto: SNProtoDataMessagePreview) -> LinkPreview? {
-            guard let title = proto.title else { return nil }
+            let title = proto.title
             let url = proto.url
             return LinkPreview(title: title, url: url)
         }
 
         public func toProto() -> SNProtoDataMessagePreview? {
-            guard let title = title, let url = url else {
+            guard let url = url else {
                 SNLog("Couldn't construct link preview proto from: \(self).")
                 return nil
             }
             let linkPreviewProto = SNProtoDataMessagePreview.builder(url: url)
-            linkPreviewProto.setTitle(title)
+            if let title = title { linkPreviewProto.setTitle(title) }
             do {
                 return try linkPreviewProto.build()
             } catch {
diff --git a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Profile.swift b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Profile.swift
index 68708d1b2..f450cb005 100644
--- a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Profile.swift	
+++ b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Profile.swift	
@@ -37,15 +37,21 @@ public extension VisibleMessage {
             }
         }
 
-        public func toProto() -> SNProtoDataMessageLokiProfile? {
+        public func toProto() -> SNProtoDataMessage? {
             guard let displayName = displayName else {
                 SNLog("Couldn't construct profile proto from: \(self).")
                 return nil
             }
+            let dataMessageProto = SNProtoDataMessage.builder()
             let profileProto = SNProtoDataMessageLokiProfile.builder()
             profileProto.setDisplayName(displayName)
+            if let profileKey = profileKey, let profilePictureURL = profilePictureURL {
+                dataMessageProto.setProfileKey(profileKey)
+                profileProto.setProfilePicture(profilePictureURL)
+            }
             do {
-                return try profileProto.build()
+                dataMessageProto.setProfile(try profileProto.build())
+                return try dataMessageProto.build()
             } catch {
                 SNLog("Couldn't construct profile proto from: \(self).")
                 return nil
diff --git a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift
index 1724e2dc1..f25eb7d9c 100644
--- a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift	
+++ b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift	
@@ -34,12 +34,12 @@ public extension VisibleMessage {
         }
 
         public func toProto() -> SNProtoDataMessageQuote? {
-            guard let timestamp = timestamp, let publicKey = publicKey else {
+            guard let timestamp = timestamp, let publicKey = publicKey, let text = text else {
                 SNLog("Couldn't construct quote proto from: \(self).")
                 return nil
             }
             let quoteProto = SNProtoDataMessageQuote.builder(id: timestamp, author: publicKey)
-            if let text = text { quoteProto.setText(text) }
+            quoteProto.setText(text)
             do {
                 return try quoteProto.build()
             } catch {
diff --git a/SessionMessagingKit/Utilities/ProofOfWork.swift b/SessionMessagingKit/Utilities/ProofOfWork.swift
index 80d4d582e..4271f4cf5 100644
--- a/SessionMessagingKit/Utilities/ProofOfWork.swift
+++ b/SessionMessagingKit/Utilities/ProofOfWork.swift
@@ -1,5 +1,5 @@
-import SessionUtilities
 import SessionSnodeKit
+import SessionUtilities
 
 enum ProofOfWork {