[MM-387] Review fixes: Fix typo and methods

Author: ayusht2810

server/hooks.go

@@ -14,8 +14,9 @@ import (
 
 // UserHasBeenCreated is invoked after a user was created.
 func (p *Plugin) UserHasBeenCreated(c *plugin.Context, user *model.User) {
-	data := p.getGlobalMessageTemplateData(user.Id)
-	if data == nil {
+	data, err := p.getGlobalMessageTemplateData(user.Id)
+	if err != nil {
+		p.API.LogError("Unable to get global message template data", "UserID", user.Id, "Error", err.Error())
 		return
 	}
 
@@ -24,25 +25,25 @@ func (p *Plugin) UserHasBeenCreated(c *plugin.Context, user *model.User) {
 			continue
 		}
 
-		if len(message.GlobalWelcomeMessage) > 0 {
-			tmpMsg, _ := template.New(templateNameResponse).Parse(strings.Join(message.GlobalWelcomeMessage, "\n"))
-			var message bytes.Buffer
-			err := tmpMsg.Execute(&message, data)
-			if err != nil {
-				p.API.LogError("Failed to execute message template", "Error", err.Error())
-			}
-
-			post := &model.Post{
-				Message:   message.String(),
-				UserId:    p.botUserID,
-				ChannelId: data.DirectMessage.Id,
-			}
-
-			if _, err := p.API.CreatePost(post); err != nil {
-				p.API.LogError("We could not create the response post", "UserID", post.UserId, "Error", err.Error())
-			}
-
-			return
+		if len(message.GlobalWelcomeMessage) == 0 {
+			continue
+		}
+		
+		tmpMsg, _ := template.New(templateNameResponse).Parse(strings.Join(message.GlobalWelcomeMessage, "\n"))
+		var message bytes.Buffer
+		err := tmpMsg.Execute(&message, data)
+		if err != nil {
+			p.API.LogError("Failed to execute message template", "Error", err.Error())
+		}
+
+		post := &model.Post{
+			Message:   message.String(),
+			UserId:    p.botUserID,
+			ChannelId: data.DirectMessage.Id,
+		}
+
+		if _, err := p.API.CreatePost(post); err != nil {
+			p.API.LogError("We could not create the response post", "UserID", post.UserId, "Error", err.Error())
 		}
 	}
 }

server/message_template.go

@@ -12,8 +12,8 @@ type MessageTemplate struct {
 	UserDisplayName string
 }
 
-// GloablMessageTemplate represents all the data that can be used in the template for a welcomebot global message
-type GloablMessageTemplate struct {
+// GlobalMessageTemplate represents all the data that can be used in the template for a welcomebot global message
+type GlobalMessageTemplate struct {
 	WelcomeBot      *model.User
 	User            *model.User
 	DirectMessage   *model.Channel

server/welcomebot.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/pkg/errors"
 )
 
 func (p *Plugin) constructMessageTemplate(userID, teamID string) *MessageTemplate {
@@ -45,27 +46,25 @@ func (p *Plugin) constructMessageTemplate(userID, teamID string) *MessageTemplat
 	return data
 }
 
-func (p *Plugin) getGlobalMessageTemplateData(userID string) *GloablMessageTemplate {
-	data := &GloablMessageTemplate{}
-	var err *model.AppError
+func (p *Plugin) getGlobalMessageTemplateData(userID string) (*GlobalMessageTemplate, error) {
+	data := &GlobalMessageTemplate{}
+	var appErr *model.AppError
 
 	if len(userID) > 0 {
-		if data.User, err = p.API.GetUser(userID); err != nil {
-			p.API.LogError("failed to query user", "user_id", userID)
-			return nil
+		if data.User, appErr = p.API.GetUser(userID); appErr != nil {
+			return nil, errors.Wrap(appErr, "failed to query user")
 		}
 	}
 
 	if data.User != nil {
-		if data.DirectMessage, err = p.API.GetDirectChannel(userID, p.botUserID); err != nil {
-			p.API.LogError("failed to query direct message channel", "user_id", userID)
-			return nil
+		if data.DirectMessage, appErr = p.API.GetDirectChannel(userID, p.botUserID); appErr != nil {
+			return nil, errors.Wrap(appErr, "failed to query direct message channel")
 		}
 	}
 
 	data.UserDisplayName = data.User.GetDisplayName(model.ShowNicknameFullName)
 
-	return data
+	return data, nil
 }
 
 func (p *Plugin) getSiteURL() string {