chore: replace mattermost-server with mattermost/server/public/

plugin.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 //go:embed plugin.json

server/command.go

@@ -3,11 +3,11 @@ package main
 import (
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 
-	"github.com/mattermost/mattermost-server/v5/model"
-	"github.com/mattermost/mattermost-server/v5/plugin"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/plugin"
 )
 
 const (
@@ -51,7 +51,7 @@ func (p *Plugin) getAutocompleteIconData() string {
 		return ""
 	}
 
-	icon, err := ioutil.ReadFile(filepath.Join(bundlePath, "assets", "broom.svg"))
+	icon, err := os.ReadFile(filepath.Join(bundlePath, "assets", "broom.svg"))
 	if err != nil {
 		p.API.LogError("Failed to open icon", "error", err)
 		return ""

server/command_last.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost/server/public/model"
 
 	root "github.com/nathanaelhoun/mattermost-plugin-broomer"
 )

server/http.go

@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v5/plugin"
+	"github.com/mattermost/mattermost/server/public/plugin"
 )
 
 const (

server/http_dialogs.go

@@ -2,36 +2,33 @@ package main
 
 import (
 	"net/http"
-	"strconv"
-
-	"github.com/mattermost/mattermost-server/v5/model"
 )
 
 func (p *Plugin) dialogDeleteLast(w http.ResponseWriter, r *http.Request) {
-	request := model.SubmitDialogRequestFromJson(r.Body)
-	if request == nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
+	// request := model.SubmitDialogRequestFromJson(r.Body)
+	// if request == nil {
+	// 	w.WriteHeader(http.StatusBadRequest)
+	// 	return
+	// }
 
-	if request.Cancelled {
-		w.WriteHeader(http.StatusOK)
-		return
-	}
+	// if request.Canceled {
+	// 	w.WriteHeader(http.StatusOK)
+	// 	return
+	// }
 
-	numPostToDelete, err := strconv.Atoi(request.State)
-	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
+	// numPostToDelete, err := strconv.Atoi(request.State)
+	// if err != nil {
+	// 	w.WriteHeader(http.StatusBadRequest)
+	// 	return
+	// }
 
-	w.WriteHeader(http.StatusOK)
+	// w.WriteHeader(http.StatusOK)
 
-	p.deleteLastPostsInChannel(&deletionOptions{
-		channelID:             request.ChannelId,
-		userID:                request.UserId,
-		numPost:               numPostToDelete,
-		optDeletePinnedPosts:  request.Submission["deletePinnedPost"] == "true",
-		permDeleteOthersPosts: canDeleteOthersPosts(p, request.UserId, request.ChannelId),
-	})
+	// p.deleteLastPostsInChannel(&deletionOptions{
+	// 	channelID:             request.ChannelId,
+	// 	userID:                request.UserId,
+	// 	numPost:               numPostToDelete,
+	// 	optDeletePinnedPosts:  request.Submission["deletePinnedPost"] == "true",
+	// 	permDeleteOthersPosts: canDeleteOthersPosts(p, request.UserId, request.ChannelId),
+	// })
 }

server/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/mattermost/mattermost-server/v5/plugin"
+	"github.com/mattermost/mattermost/server/public/plugin"
 )
 
 func main() {

server/plugin.go

@@ -3,14 +3,16 @@ package main
 import (
 	"sync"
 
-	"github.com/mattermost/mattermost-server/v5/model"
-	"github.com/mattermost/mattermost-server/v5/plugin"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/plugin"
+	"github.com/mattermost/mattermost/server/public/pluginapi"
 	"github.com/pkg/errors"
 )
 
 // Plugin implements the interface expected by the Mattermost server to communicate between the server and plugin processes.
 type Plugin struct {
 	plugin.MattermostPlugin
+	client *pluginapi.Client
 
 	// configurationLock synchronizes access to the configuration.
 	configurationLock sync.RWMutex
@@ -28,14 +30,13 @@ func (p *Plugin) OnActivate() error {
 		return errors.Errorf("SiteURL is not configured. Please head to the System Console > Environment > Web Server > Site URL")
 	}
 
-	botUserID, err := p.Helpers.EnsureBot(
+	botUserID, err := p.client.Bot.EnsureBot(
 		&model.Bot{
 			Username:    "broomerbot",
 			DisplayName: "Broomer",
 			Description: "Bot managed by the Broomer plugin.",
 		},
-		plugin.IconImagePath("/assets/broom.svg"),
-		plugin.ProfileImagePath("/assets/broom.png"),
+		pluginapi.ProfileImagePath("/assets/broom.png"),
 	)
 	if err != nil {
 		return errors.Wrap(err, "Failed to ensure bot")

server/utils.go

@@ -3,7 +3,7 @@ package main
 import (
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 // Checks if the user has sysadmin permission
@@ -19,14 +19,14 @@ func isSysadmin(p *Plugin, userID string) bool {
 
 // Checks if the user has the "delete_post" permission
 func canDeletePost(p *Plugin, userID string, channelID string) bool {
-	return p.API.HasPermissionTo(userID, model.PERMISSION_DELETE_POST) ||
-		p.API.HasPermissionToChannel(userID, channelID, model.PERMISSION_DELETE_POST)
+	return p.API.HasPermissionTo(userID, model.PermissionDeletePost) ||
+		p.API.HasPermissionToChannel(userID, channelID, model.PermissionDeletePost)
 }
 
 // Checks if the user has the "delete_others_posts" permission
 func canDeleteOthersPosts(p *Plugin, userID string, channelID string) bool {
-	return p.API.HasPermissionTo(userID, model.PERMISSION_DELETE_OTHERS_POSTS) ||
-		p.API.HasPermissionToChannel(userID, channelID, model.PERMISSION_DELETE_OTHERS_POSTS)
+	return p.API.HasPermissionTo(userID, model.PermissionDeleteOthersPosts) ||
+		p.API.HasPermissionToChannel(userID, channelID, model.PermissionDeleteOthersPosts)
 }
 
 // Returns "s" if the given number is > 1

server/utils_commands.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 )
 
@@ -86,7 +86,7 @@ func (p *Plugin) parseAndCheckCommandArgs(args *model.CommandArgs) (string, *del
 		}
 
 		if numPostToDelete64 < 1 {
-			return subcommand, nil, errors.Errorf("You may want to delete at least one post :wink:")
+			return subcommand, nil, errors.Errorf("You may want to delete at least one post :wink: ")
 		}
 
 		currentChannel, appErr := p.API.GetChannel(args.ChannelId)

server/utils_posts.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 // getRelevantPostList filters out the unwanted posts and return the postList with the relevant posts