From 8baf8ee84bc0cc5542f822518f3b169eecec32d0 Mon Sep 17 00:00:00 2001
From: mavolin <48887425+mavolin@users.noreply.github.com>
Date: Wed, 29 Jul 2020 22:50:55 +0200
Subject: [PATCH] Multipartutil: move back to package api

---
 api/send.go                        | 35 +++++++++++++++++++++++---
 internal/mulipartutil/multipart.go | 40 ------------------------------
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/api/send.go b/api/send.go
index 6e4b463..5ff0c5b 100644
--- a/api/send.go
+++ b/api/send.go
@@ -3,12 +3,12 @@ package api
 import (
 	"io"
 	"mime/multipart"
+	"strconv"
 	"strings"
 
 	"github.com/pkg/errors"
 
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/mulipartutil"
 	"github.com/diamondburned/arikawa/utils/httputil"
 	"github.com/diamondburned/arikawa/utils/json"
 )
@@ -115,7 +115,7 @@ type SendMessageData struct {
 }
 
 func (data *SendMessageData) WriteMultipart(body *multipart.Writer) error {
-	return mulipartutil.WriteMultipart(body, data, data.Files)
+	return writeMultipart(body, data, data.Files)
 }
 
 // SendMessageComplex posts a message to a guild text or DM channel. If
@@ -204,5 +204,34 @@ type ExecuteWebhookData struct {
 }
 
 func (data *ExecuteWebhookData) WriteMultipart(body *multipart.Writer) error {
-	return mulipartutil.WriteMultipart(body, data, data.Files)
+	return writeMultipart(body, data, data.Files)
+}
+
+func writeMultipart(body *multipart.Writer, item interface{}, files []SendMessageFile) error {
+	defer body.Close()
+
+	// Encode the JSON body first
+	w, err := body.CreateFormField("payload_json")
+	if err != nil {
+		return errors.Wrap(err, "failed to create bodypart for JSON")
+	}
+
+	if err := json.EncodeStream(w, item); err != nil {
+		return errors.Wrap(err, "failed to encode JSON")
+	}
+
+	for i, file := range files {
+		num := strconv.Itoa(i)
+
+		w, err := body.CreateFormFile("file"+num, file.Name)
+		if err != nil {
+			return errors.Wrap(err, "failed to create bodypart for "+num)
+		}
+
+		if _, err := io.Copy(w, file.Reader); err != nil {
+			return errors.Wrap(err, "failed to write for file "+num)
+		}
+	}
+
+	return nil
 }
diff --git a/internal/mulipartutil/multipart.go b/internal/mulipartutil/multipart.go
index 992589a..530a1d5 100644
--- a/internal/mulipartutil/multipart.go
+++ b/internal/mulipartutil/multipart.go
@@ -1,41 +1 @@
 package mulipartutil
-
-import (
-	"io"
-	"mime/multipart"
-	"strconv"
-
-	"github.com/pkg/errors"
-
-	"github.com/diamondburned/arikawa/api"
-	"github.com/diamondburned/arikawa/utils/json"
-)
-
-func WriteMultipart(body *multipart.Writer, item interface{}, files []api.SendMessageFile) error {
-	defer body.Close()
-
-	// Encode the JSON body first
-	w, err := body.CreateFormField("payload_json")
-	if err != nil {
-		return errors.Wrap(err, "failed to create bodypart for JSON")
-	}
-
-	if err := json.EncodeStream(w, item); err != nil {
-		return errors.Wrap(err, "failed to encode JSON")
-	}
-
-	for i, file := range files {
-		num := strconv.Itoa(i)
-
-		w, err := body.CreateFormFile("file"+num, file.Name)
-		if err != nil {
-			return errors.Wrap(err, "failed to create bodypart for "+num)
-		}
-
-		if _, err := io.Copy(w, file.Reader); err != nil {
-			return errors.Wrap(err, "failed to write for file "+num)
-		}
-	}
-
-	return nil
-}