Remove mattermost 5 support (#1936)

1 files changed, 15 insertions, 166 deletions

diff --git a/bridge/mattermost/handlers.go b/bridge/mattermost/handlers.go
index c7b51243..fccb31b6 100644
--- a/bridge/mattermost/handlers.go
+++ b/bridge/mattermost/handlers.go
@@ -3,10 +3,8 @@ package bmattermost
 import (
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
-	"github.com/42wim/matterbridge/matterclient"
-	matterclient6 "github.com/matterbridge/matterclient"
-	"github.com/mattermost/mattermost-server/v5/model"
-	model6 "github.com/mattermost/mattermost-server/v6/model"
+	"github.com/matterbridge/matterclient"
+	"github.com/mattermost/mattermost-server/v6/model"
 )
 
 // handleDownloadAvatar downloads the avatar of userid from channel
@@ -26,20 +24,11 @@ func (b *Bmattermost) handleDownloadAvatar(userid string, channel string) {
 		var (
 			data []byte
 			err  error
-			resp *model.Response
 		)
-		if b.mc6 != nil {
-			data, _, err = b.mc6.Client.GetProfileImage(userid, "")
-			if err != nil {
-				b.Log.Errorf("ProfileImage download failed for %#v %s", userid, err)
-				return
-			}
-		} else {
-			data, resp = b.mc.Client.GetProfileImage(userid, "")
-			if resp.Error != nil {
-				b.Log.Errorf("ProfileImage download failed for %#v %s", userid, resp.Error)
-				return
-			}
+		data, _, err = b.mc.Client.GetProfileImage(userid, "")
+		if err != nil {
+			b.Log.Errorf("ProfileImage download failed for %#v %s", userid, err)
+			return
 		}
 
 		err = helper.HandleDownloadSize(b.Log, &rmsg, userid+".png", int64(len(data)), b.General)
@@ -52,33 +41,10 @@ func (b *Bmattermost) handleDownloadAvatar(userid string, channel string) {
 	}
 }
 
-// handleDownloadFile handles file download
-func (b *Bmattermost) handleDownloadFile(rmsg *config.Message, id string) error {
-	if b.mc6 != nil {
-		return b.handleDownloadFile6(rmsg, id)
-	}
-
-	url, _ := b.mc.Client.GetFileLink(id)
-	finfo, resp := b.mc.Client.GetFileInfo(id)
-	if resp.Error != nil {
-		return resp.Error
-	}
-	err := helper.HandleDownloadSize(b.Log, rmsg, finfo.Name, finfo.Size, b.General)
-	if err != nil {
-		return err
-	}
-	data, resp := b.mc.Client.DownloadFile(id, true)
-	if resp.Error != nil {
-		return resp.Error
-	}
-	helper.HandleDownloadData(b.Log, rmsg, finfo.Name, rmsg.Text, url, &data, b.General)
-	return nil
-}
-
 // nolint:wrapcheck
-func (b *Bmattermost) handleDownloadFile6(rmsg *config.Message, id string) error {
-	url, _, _ := b.mc6.Client.GetFileLink(id)
-	finfo, _, err := b.mc6.Client.GetFileInfo(id)
+func (b *Bmattermost) handleDownloadFile(rmsg *config.Message, id string) error {
+	url, _, _ := b.mc.Client.GetFileLink(id)
+	finfo, _, err := b.mc.Client.GetFileInfo(id)
 	if err != nil {
 		return err
 	}
@@ -86,7 +52,7 @@ func (b *Bmattermost) handleDownloadFile6(rmsg *config.Message, id string) error
 	if err != nil {
 		return err
 	}
-	data, _, err := b.mc6.Client.DownloadFile(id, true)
+	data, _, err := b.mc.Client.DownloadFile(id, true)
 	if err != nil {
 		return err
 	}
@@ -125,15 +91,10 @@ func (b *Bmattermost) handleMatter() {
 	}
 }
 
+// nolint:cyclop
 func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
-	if b.mc6 != nil {
-		b.Log.Debug("starting matterclient6")
-		b.handleMatterClient6(messages)
-		return
-	}
-
 	for message := range b.mc.MessageChan {
-		b.Log.Debugf("%#v", message.Raw.Data)
+		b.Log.Debugf("%#v %#v", message.Raw.GetData(), message.Raw.EventType())
 
 		if b.skipMessage(message) {
 			b.Log.Debugf("Skipped message: %#v", message)
@@ -166,11 +127,11 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
 		b.handleProps(rmsg, message)
 
 		// create a text for bridges that don't support native editing
-		if message.Raw.Event == model.WEBSOCKET_EVENT_POST_EDITED && !b.GetBool("EditDisable") {
+		if message.Raw.EventType() == model.WebsocketEventPostEdited && !b.GetBool("EditDisable") {
 			rmsg.Text = message.Text + b.GetString("EditSuffix")
 		}
 
-		if message.Raw.Event == model.WEBSOCKET_EVENT_POST_DELETED {
+		if message.Raw.EventType() == model.WebsocketEventPostDeleted {
 			rmsg.Event = config.EventMsgDelete
 		}
 
@@ -192,68 +153,6 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
 	}
 }
 
-// nolint:cyclop
-func (b *Bmattermost) handleMatterClient6(messages chan *config.Message) {
-	for message := range b.mc6.MessageChan {
-		b.Log.Debugf("%#v %#v", message.Raw.GetData(), message.Raw.EventType())
-
-		if b.skipMessage6(message) {
-			b.Log.Debugf("Skipped message: %#v", message)
-			continue
-		}
-
-		channelName := b.getChannelName(message.Post.ChannelId)
-		if channelName == "" {
-			channelName = message.Channel
-		}
-
-		// only download avatars if we have a place to upload them (configured mediaserver)
-		if b.General.MediaServerUpload != "" || b.General.MediaDownloadPath != "" {
-			b.handleDownloadAvatar(message.UserID, channelName)
-		}
-
-		b.Log.Debugf("== Receiving event %#v", message)
-
-		rmsg := &config.Message{
-			Username: message.Username,
-			UserID:   message.UserID,
-			Channel:  channelName,
-			Text:     message.Text,
-			ID:       message.Post.Id,
-			ParentID: message.Post.RootId, // ParentID is obsolete with mattermost
-			Extra:    make(map[string][]interface{}),
-		}
-
-		// handle mattermost post properties (override username and attachments)
-		b.handleProps6(rmsg, message)
-
-		// create a text for bridges that don't support native editing
-		if message.Raw.EventType() == model6.WebsocketEventPostEdited && !b.GetBool("EditDisable") {
-			rmsg.Text = message.Text + b.GetString("EditSuffix")
-		}
-
-		if message.Raw.EventType() == model6.WebsocketEventPostDeleted {
-			rmsg.Event = config.EventMsgDelete
-		}
-
-		for _, id := range message.Post.FileIds {
-			err := b.handleDownloadFile(rmsg, id)
-			if err != nil {
-				b.Log.Errorf("download failed: %s", err)
-			}
-		}
-
-		// Use nickname instead of username if defined
-		if !b.GetBool("useusername") {
-			if nick := b.mc6.GetNickName(rmsg.UserID); nick != "" {
-				rmsg.Username = nick
-			}
-		}
-
-		messages <- rmsg
-	}
-}
-
 func (b *Bmattermost) handleMatterHook(messages chan *config.Message) {
 	for {
 		message := b.mh.Receive()
@@ -268,12 +167,7 @@ func (b *Bmattermost) handleMatterHook(messages chan *config.Message) {
 	}
 }
 
-// handleUploadFile handles native upload of files
 func (b *Bmattermost) handleUploadFile(msg *config.Message) (string, error) {
-	if b.mc6 != nil {
-		return b.handleUploadFile6(msg)
-	}
-
 	var err error
 	var res, id string
 	channelID := b.getChannelID(msg.Channel)
@@ -292,53 +186,8 @@ func (b *Bmattermost) handleUploadFile(msg *config.Message) (string, error) {
 	return res, err
 }
 
-// nolint:forcetypeassert,wrapcheck
-func (b *Bmattermost) handleUploadFile6(msg *config.Message) (string, error) {
-	var err error
-	var res, id string
-	channelID := b.getChannelID(msg.Channel)
-	for _, f := range msg.Extra["file"] {
-		fi := f.(config.FileInfo)
-		id, err = b.mc6.UploadFile(*fi.Data, channelID, fi.Name)
-		if err != nil {
-			return "", err
-		}
-		msg.Text = fi.Comment
-		if b.GetBool("PrefixMessagesWithNick") {
-			msg.Text = msg.Username + msg.Text
-		}
-		res, err = b.mc6.PostMessageWithFiles(channelID, msg.Text, msg.ParentID, []string{id})
-	}
-	return res, err
-}
-
-func (b *Bmattermost) handleProps(rmsg *config.Message, message *matterclient.Message) {
-	props := message.Post.Props
-	if props == nil {
-		return
-	}
-	if _, ok := props["override_username"].(string); ok {
-		rmsg.Username = props["override_username"].(string)
-	}
-	if _, ok := props["attachments"].([]interface{}); ok {
-		rmsg.Extra["attachments"] = props["attachments"].([]interface{})
-		if rmsg.Text == "" {
-			for _, attachment := range rmsg.Extra["attachments"] {
-				attach := attachment.(map[string]interface{})
-				if attach["text"].(string) != "" {
-					rmsg.Text += attach["text"].(string)
-					continue
-				}
-				if attach["fallback"].(string) != "" {
-					rmsg.Text += attach["fallback"].(string)
-				}
-			}
-		}
-	}
-}
-
 // nolint:forcetypeassert
-func (b *Bmattermost) handleProps6(rmsg *config.Message, message *matterclient6.Message) {
+func (b *Bmattermost) handleProps(rmsg *config.Message, message *matterclient.Message) {
 	props := message.Post.Props
 	if props == nil {
 		return