From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 17 Nov 2021 09:13:59 +0000 (+0300)
Subject: New mattermost's model API
X-Git-Url: http://www.git.stargrave.org/?p=mmfileget.git;a=commitdiff_plain;h=d6df6c21438e91f337af67be37ec8362bd6465f9

New mattermost's model API
---

diff --git a/go.mod b/go.mod
index a4969e0..a5255d3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
 module go.stargrave.org/mmfileget
 
-go 1.15
+go 1.16
 
-require github.com/mattermost/mattermost-server/v5 v5.39.1
+require github.com/mattermost/mattermost-server/v6 v6.1.0
 
-replace github.com/mattermost/mattermost-server/v5 v5.39.1 => ./mattermost-server
+replace github.com/mattermost/mattermost-server/v6 v6.1.0 => ./mattermost-server
diff --git a/main.go b/main.go
index 38d2cb0..a31bb51 100644
--- a/main.go
+++ b/main.go
@@ -3,10 +3,11 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost-server/v6/model"
 )
 
 func main() {
@@ -20,9 +21,15 @@ func main() {
 		os.Exit(1)
 	}
 
-	Client := model.NewAPIv4Client("https://" + machine)
-	Client.Login(login, password)
-	info, resp := Client.GetFileInfo(fileId)
+	client := model.NewAPIv4Client("https://" + machine)
+	_, _, err := client.Login(login, password)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	info, resp, err := client.GetFileInfo(fileId)
+	if err != nil {
+		log.Fatalln(err)
+	}
 	if info == nil {
 		fmt.Fprintln(os.Stderr, resp)
 		os.Exit(1)
@@ -37,7 +44,10 @@ func main() {
 		fmt.Fprintln(os.Stderr, "Download? Ctrl-D/C")
 		os.Stdin.Read(make([]byte, 1))
 	}
-	data, _ := Client.GetFile(fileId)
+	data, _, err := client.GetFile(fileId)
+	if err != nil {
+		log.Fatalln(err)
+	}
 	if err := ioutil.WriteFile(filename, data, os.FileMode(0666)); err != nil {
 		panic(err)
 	}
diff --git a/vendor-done.do b/vendor-done.do
index 9ec5027..b5f38eb 100644
--- a/vendor-done.do
+++ b/vendor-done.do
@@ -1,10 +1,10 @@
-git clone --depth 1 --branch v5.29.0 https://github.com/mattermost/mattermost-server.git
+git clone --depth 1 --branch v6.1.0 https://github.com/mattermost/mattermost-server.git
 ln -fs mattermost-server/vendor .
 mkdir -p vendor/github.com/mattermost/mattermost-server
-ln -fs `pwd`/mattermost-server vendor/github.com/mattermost/mattermost-server/v5
+ln -fs `pwd`/mattermost-server vendor/github.com/mattermost/mattermost-server/v6
 cat > vendor/modules.txt <<EOF
-# github.com/mattermost/mattermost-server/v5 v5.39.1 => ./mattermost-server
+# github.com/mattermost/mattermost-server/v6 v6.1.0 => ./mattermost-server
 ## explicit
-github.com/mattermost/mattermost-server/v5
+github.com/mattermost/mattermost-server/v6
 EOF
 touch $3