Merge branch 'develop'

givip · Dec 29, 2019 · 988b13e · 988b13e
2 parents 0ece615 + 6037ce1
commit 988b13e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/API/Makefile b/API/Makefile
diff --git a/Sources/Telegrammer/Bot/Telegram/Bot.swift b/Sources/Telegrammer/Bot/Telegram/Bot.swift
@@ -104,7 +104,7 @@ public final class Bot: BotProtocol {
         }
 
         if let object = object as? MultipartEncodable {
-            return .string(try object.encodeBody(boundary: boundary))
+            return .byteBuffer(try object.encodeBody(boundary: boundary))
         }
 
         return nil

diff --git a/Sources/Telegrammer/Types/TelegramEncodables.swift b/Sources/Telegrammer/Types/TelegramEncodables.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import MultipartKit
+import struct NIO.ByteBufferAllocator
 
 /// Represent Telegram type, which will be encoded as Json on sending to server
 protocol JSONEncodable: Encodable {}
@@ -21,7 +22,10 @@ extension JSONEncodable {
 protocol MultipartEncodable: Encodable {}
 
 extension MultipartEncodable {
-    func encodeBody(boundary: String) throws -> String {
-        return try FormDataEncoder().encode(self, boundary: boundary)
+    func encodeBody(boundary: String) throws -> ByteBuffer {
+        let encoder = FormDataEncoder()
+        var buffer = ByteBufferAllocator().buffer(capacity: 0)
+        try encoder.encode(self, boundary: boundary, into: &buffer)
+        return buffer
     }
 }