Code refactoring and review fixes

plugin.json

@@ -12,12 +12,14 @@
                 "key": "RejectDMs",
                 "display_name": "Reject DMs:",
                 "type": "bool",
+                "default": true,
                 "help_text": "If set the plugin will reject direct messages."
             },
             {
                 "key": "RejectGroupChats",
                 "display_name": "Reject Group Chats:",
                 "type": "bool",
+                "default": true,
                 "help_text": "If set the plugin will reject messages sent to group chats."
             },
             {

server/config/main.go

@@ -2,19 +2,13 @@ package config
 
 import (
 	"errors"
+	"strings"
 
 	"github.com/mattermost/mattermost-server/plugin"
 	"go.uber.org/atomic"
 )
 
 const (
-	CommandPrefix             = PluginName
-	URLMappingKeyPrefix       = "url_"
-	ServerExeToWebappRootPath = "/../webapp"
-
-	URLPluginBase = "/plugins/" + PluginName
-	URLStaticBase = URLPluginBase + "/static"
-
 	HeaderMattermostUserID = "Mattermost-User-Id"
 )
 
@@ -40,6 +34,8 @@ func SetConfig(c *Configuration) {
 func (c *Configuration) ProcessConfiguration() error {
 	// any post-processing on configurations goes here
 
+	c.RejectionMessage = strings.TrimSpace(c.RejectionMessage)
+
 	return nil
 }
 

server/plugin.go

@@ -54,15 +54,7 @@ func (p *Plugin) MessageWillBePosted(c *plugin.Context, post *model.Post) (*mode
 		return nil, ""
 	}
 
-	if channel.Type == model.CHANNEL_DIRECT && conf.RejectDMs {
-		config.Mattermost.SendEphemeralPost(post.UserId, &model.Post{
-			Message:   conf.RejectionMessage,
-			ChannelId: post.ChannelId,
-		})
-		return nil, conf.RejectionMessage
-	}
-
-	if channel.Type == model.CHANNEL_GROUP && conf.RejectGroupChats {
+	if (channel.Type == model.CHANNEL_DIRECT && conf.RejectDMs) || (channel.Type == model.CHANNEL_GROUP && conf.RejectGroupChats) {
 		config.Mattermost.SendEphemeralPost(post.UserId, &model.Post{
 			Message:   conf.RejectionMessage,
 			ChannelId: post.ChannelId,