Merge pull request #13 from NoRespect/slackFormatEscaping

remove slackFormatEscaping
pvzig · Mar 18, 2018 · b5b303c · b5b303c
2 parents fcf3f74 + 2e4fa97
commit b5b303c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Sources/NetworkInterface.swift b/Sources/NetworkInterface.swift
@@ -175,6 +175,10 @@ public struct NetworkInterface {
         // encoded when included in a query string. As a result, we need to manually apply the encoding after Apple's
         // default encoding is applied.
         var encodedQuery = components?.percentEncodedQuery
+        encodedQuery = encodedQuery?.replacingOccurrences(of: ">", with: "%3E")
+        encodedQuery = encodedQuery?.replacingOccurrences(of: "<", with: "%3C")
+        encodedQuery = encodedQuery?.replacingOccurrences(of: "@", with: "%40")
+
         encodedQuery = encodedQuery?.replacingOccurrences(of: "?", with: "%3F")
         encodedQuery = encodedQuery?.replacingOccurrences(of: "+", with: "%2B")
         components?.percentEncodedQuery = encodedQuery

diff --git a/Sources/WebAPI.swift b/Sources/WebAPI.swift
@@ -240,7 +240,6 @@ extension WebAPI {
     public func sendMessage(
         channel: String,
         text: String,
-        escapeCharacters: Bool = true,
         username: String? = nil,
         asUser: Bool? = nil,
         parse: ParseMode? = nil,
@@ -256,7 +255,7 @@ extension WebAPI {
         let parameters: [String: Any?] = [
             "token": token,
             "channel": channel,
-            "text": escapeCharacters ? text.slackFormatEscaping : text,
+            "text": text,
             "as_user": asUser,
             "parse": parse?.rawValue,
             "link_names": linkNames,
@@ -278,7 +277,6 @@ extension WebAPI {
         channel: String,
         thread: String,
         text: String,
-        escapeCharacters: Bool = true,
         broadcastReply: Bool = false,
         username: String? = nil,
         asUser: Bool? = nil,
@@ -296,7 +294,7 @@ extension WebAPI {
             "token": token,
             "channel": channel,
             "thread_ts": thread,
-            "text": escapeCharacters ? text.slackFormatEscaping : text,
+            "text": text,
             "broadcastReply": broadcastReply,
             "as_user": asUser,
             "parse": parse?.rawValue,
@@ -318,11 +316,10 @@ extension WebAPI {
     public func sendMeMessage(
         channel: String,
         text: String,
-        escapeCharacters: Bool = true,
         success: (((ts: String?, channel: String?)) -> Void)?,
         failure: FailureClosure?
     ) {
-        let parameters: [String: Any?] = ["token": token, "channel": channel, "text": escapeCharacters ? text.slackFormatEscaping : text]
+        let parameters: [String: Any?] = ["token": token, "channel": channel, "text":  text]
         networkInterface.request(.chatMeMessage, parameters: parameters, successClosure: {(response) in
             success?((ts: response["ts"] as? String, response["channel"] as? String))
         }) {(error) in
@@ -337,15 +334,14 @@ extension WebAPI {
         attachments: [Attachment?]? = nil,
         parse: ParseMode = .none,
         linkNames: Bool = false,
-        escapeCharacters: Bool = true,
         success: SuccessClosure?,
         failure: FailureClosure?
     ) {
         let parameters: [String: Any?] = [
             "token": token,
             "channel": channel,
             "ts": ts,
-            "text": escapeCharacters ? message.slackFormatEscaping : message,
+            "text": message,
             "parse": parse.rawValue,
             "link_names": linkNames,
             "attachments": encodeAttachments(attachments)
@@ -460,7 +456,7 @@ extension WebAPI {
 // MARK: - File Comments
 extension WebAPI {
     public func addFileComment(fileID: String, comment: String, success: CommentClosure?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["token": token, "file": fileID, "comment": comment.slackFormatEscaping]
+        let parameters: [String: Any] = ["token": token, "file": fileID, "comment": comment]
         networkInterface.request(.filesCommentsAdd, parameters: parameters, successClosure: {(response) in
             success?(Comment(comment: response["comment"] as? [String: Any]))
         }) {(error) in
@@ -469,7 +465,7 @@ extension WebAPI {
     }
 
     public func editFileComment(fileID: String, commentID: String, comment: String, success: CommentClosure?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["token": token, "file": fileID, "id": commentID, "comment": comment.slackFormatEscaping]
+        let parameters: [String: Any] = ["token": token, "file": fileID, "id": commentID, "comment": comment]
         networkInterface.request(.filesCommentsEdit, parameters: parameters, successClosure: {(response) in
             success?(Comment(comment: response["comment"] as? [String: Any]))
         }) {(error) in