Merge pull request #639 from innogames/change_upload_api

use new slack file upload API

client/slack.go

@@ -120,7 +120,7 @@ type SlackClient interface {
 	GetUserPresence(user string) (*slack.UserPresence, error)
 
 	// UploadFile uploads a file to Slack
-	UploadFile(params slack.FileUploadParameters) (*slack.File, error)
+	UploadFile(params slack.UploadFileV2Parameters) (*slack.FileSummary, error)
 
 	// PinMessage will pin a message to the channel
 	PinMessage(channel string, timestamp string) error
@@ -331,8 +331,8 @@ func (s *Slack) GetUserPresence(user string) (*slack.UserPresence, error) {
 }
 
 // UploadFile uploads a file to Slack
-func (s *Slack) UploadFile(params slack.FileUploadParameters) (*slack.File, error) {
-	return s.Client.UploadFile(params)
+func (s *Slack) UploadFile(params slack.UploadFileV2Parameters) (*slack.FileSummary, error) {
+	return s.Client.UploadFileV2(params)
 }
 
 // GetUserIDAndName returns the user-id and user-name based on a identifier. If can get a user-id or name

command/export/export.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/csv"
 	"fmt"
-	"io"
 	"sort"
 	"time"
 
@@ -48,10 +47,10 @@ func (c *exportCommand) exportChannel(match matcher.Result, message msg.Message)
 	if lines >= limit {
 		c.SendMessage(message, fmt.Sprintf("Attention: The export is limited to %d messages.", limit))
 	}
-	_, err = c.UploadFile(slack.FileUploadParameters{
+	_, err = c.UploadFile(slack.UploadFileV2Parameters{
 		Filename:        "export.csv",
-		Filetype:        "csv",
-		Channels:        []string{message.Channel},
+		FileSize:        buffer.Len(),
+		Channel:         message.Channel,
 		ThreadTimestamp: message.Timestamp,
 		Reader:          buffer,
 		InitialComment:  fmt.Sprintf("Export %d messages from channel <#%s|%s>", lines, channelID, channelName),
@@ -91,7 +90,7 @@ func getConversations(client client.SlackClient, channelID string) ([]slack.Mess
 	return messages, nil
 }
 
-func exportChannelMessagesToBuffer(client client.SlackClient, channelID string) (io.Reader, int, error) {
+func exportChannelMessagesToBuffer(client client.SlackClient, channelID string) (*bytes.Buffer, int, error) {
 	buffer := new(bytes.Buffer)
 	messages, err := getConversations(client, channelID)
 	if err != nil {

command/openai/dalle.go

@@ -59,12 +59,12 @@ func (c *openaiCommand) sendImageInSlack(image DalleResponseImage, message msg.M
 	}
 	defer resp.Body.Close()
 
-	_, err = c.SlackClient.UploadFile(slack.FileUploadParameters{
+	_, err = c.SlackClient.UploadFile(slack.UploadFileV2Parameters{
 		Filename:        "dalle.png",
-		Filetype:        "png",
-		Channels:        []string{message.Channel},
-		ThreadTimestamp: message.Timestamp,
+		FileSize:        int(resp.ContentLength),
 		Reader:          resp.Body,
+		Channel:         message.Channel,
+		ThreadTimestamp: message.Timestamp,
 		InitialComment:  fmt.Sprintf("Dall-e prompt: %s", image.RevisedPrompt),
 	})
 

command/openai/dalle_test.go

@@ -109,7 +109,7 @@ func TestDalle(t *testing.T) {
 
 		slackClient.On(
 			"UploadFile",
-			mock.MatchedBy(func(params slack.FileUploadParameters) bool {
+			mock.MatchedBy(func(params slack.UploadFileV2Parameters) bool {
 				assert.Equal(t, "dalle.png", params.Filename)
 				return true
 			}),