[GH-65]

README.md

@@ -32,7 +32,7 @@ To configure the Welcome Bot, edit your `config.json` file with a message you wa
             "com.mattermost.welcomebot": {
                 "WelcomeMessages": [
                     {
-                        "TeamName": "your-team-name",
+                        "TeamName": "your-team-name,your-second-team-name",
                         "DelayInSeconds": 3,
                         "Message": [
                             "Your welcome message here. Each list item specifies one line in the message text."
@@ -63,7 +63,7 @@ To configure the Welcome Bot, edit your `config.json` file with a message you wa
 
 where
 
-- **TeamName**: The team for which the Welcome Bot sends a message for. Must be the team handle used in the URL, in lowercase. For example, in the following URL the **TeamName** value is `my-team`: https://example.com/my-team/channels/my-channel
+- **TeamName**: The teams for which the Welcome Bot sends a message for. Must be the team handle used in the URL, in lowercase. For example, in the following URL the **TeamName** value is `my-team`: https://example.com/my-team/channels/my-channel . In case of multiple teams, use comma seperated fields. For example `"my-team, my-team-2"` to display the same messages for both `my-team`  and `my-team-2`
 - **DelayInSeconds**: The number of seconds after joining a team that the user receives a welcome message.
 - **Message**: The message posted to the user.
 - (Optional) **AttachmentMessage**: Message text in attachment containing user action buttons.
@@ -100,7 +100,7 @@ To accomplish the above, you can specify the following configuration in your `co
             "com.mattermost.welcomebot": {
                 "WelcomeMessages": [
                     {
-                        "TeamName": "staff",
+                        "TeamName": "staff,devsecops",
                         "DelayInSeconds": 5,
                         "Message": [
                             "### Welcome {{.UserDisplayName}} to the Staff {{.Team.DisplayName}} team!",

server/command.go

@@ -84,11 +84,27 @@ func (p *Plugin) validateCommand(action string, parameters []string) string {
 	return ""
 }
 
+// contains checks if a string is present in a slice
+func contains(s []string, str string) bool {
+	for _, v := range s {
+		if v == str {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (p *Plugin) executeCommandPreview(teamName string, args *model.CommandArgs) {
 	found := false
 	for _, message := range p.getWelcomeMessages() {
-		if message.TeamName == teamName {
-			if err := p.previewWelcomeMessage(teamName, args, *message); err != nil {
+		// splits the string and removes white spaces from underlying strings
+		teamNameSlice := strings.Split(message.TeamName, ",")
+		for i := range teamNameSlice {
+			teamNameSlice[i] = strings.TrimSpace(teamNameSlice[i])
+		}
+		if contains(teamNameSlice, teamName) {
+			if err := p.previewWelcomeMessage(args, *message); err != nil {
 				p.postCommandResponse(args, "error occurred while processing greeting for team `%s`: `%s`", teamName, err)
 				return
 			}
@@ -113,7 +129,10 @@ func (p *Plugin) executeCommandList(args *model.CommandArgs) {
 	// Deduplicate entries
 	teams := make(map[string]struct{})
 	for _, message := range wecomeMessages {
-		teams[message.TeamName] = struct{}{}
+		teamNameSlice := strings.Split(message.TeamName, ",")
+		for _, tn := range teamNameSlice {
+			teams[tn] = struct{}{}
+		}
 	}
 
 	var str strings.Builder

server/hooks.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/mattermost/mattermost-server/v5/mlog"
@@ -18,8 +19,11 @@ func (p *Plugin) UserHasJoinedTeam(c *plugin.Context, teamMember *model.TeamMemb
 	}
 
 	for _, message := range p.getWelcomeMessages() {
-		if message.TeamName == data.Team.Name {
-			go p.processWelcomeMessage(*data, *message)
+		teamNameSlice := strings.Split(message.TeamName, ",")
+		for _, tn := range teamNameSlice {
+			if tn == data.Team.Name {
+				go p.processWelcomeMessage(*data, *message)
+			}
 		}
 	}
 }

server/http_hooks.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"net/http"
+	"strings"
 
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/plugin"
@@ -57,12 +58,15 @@ func (p *Plugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Req
 	switch r.URL.Path {
 	case "/addchannels":
 		for _, wm := range p.getWelcomeMessages() {
-			if data.Team.Name == wm.TeamName {
-				for _, ac := range wm.Actions {
-					if ac.ActionName == action.Context.Action {
-						p.processActionMessage(*data, action, *ac)
-						p.encodeEphemeralMessage(w, "")
-						return
+			teamNameSlice := strings.Split(wm.TeamName, ",")
+			for _, tn := range teamNameSlice {
+				if data.Team.Name == tn {
+					for _, ac := range wm.Actions {
+						if ac.ActionName == action.Context.Action {
+							p.processActionMessage(*data, action, *ac)
+							p.encodeEphemeralMessage(w, "")
+							return
+						}
 					}
 				}
 			}

server/welcomebot.go

@@ -57,7 +57,7 @@ func (p *Plugin) getSiteURL() string {
 	return *config.ServiceSettings.SiteURL
 }
 
-func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemplate, error) {
+func (p *Plugin) newSampleMessageTemplate(teamID string, userID string) (*MessageTemplate, error) {
 	data := &MessageTemplate{}
 	var err *model.AppError
 
@@ -66,14 +66,14 @@ func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemp
 		return nil, fmt.Errorf("failed to query user %s: %w", userID, err)
 	}
 
-	if data.Team, err = p.API.GetTeamByName(teamName); err != nil {
-		p.API.LogError("failed to query team", "team_name", teamName, "err", err)
-		return nil, fmt.Errorf("failed to query team %s: %w", teamName, err)
+	if data.Team, err = p.API.GetTeam(teamID); err != nil {
+		p.API.LogError("failed to query team", "team_id", teamID, "err", err)
+		return nil, fmt.Errorf("failed to query team %s: %w", teamID, err)
 	}
 
 	if data.Townsquare, err = p.API.GetChannelByName(data.Team.Id, "town-square", false); err != nil {
-		p.API.LogError("failed to query town-square", "team_name", teamName)
-		return nil, fmt.Errorf("failed to query town-square %s: %w", teamName, err)
+		p.API.LogError("failed to query town-square", "team_name", data.Team.Name)
+		return nil, fmt.Errorf("failed to query town-square %s: %w", data.Team.Name, err)
 	}
 
 	if data.DirectMessage, err = p.API.GetDirectChannel(data.User.Id, p.botUserID); err != nil {
@@ -86,8 +86,8 @@ func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemp
 	return data, nil
 }
 
-func (p *Plugin) previewWelcomeMessage(teamName string, args *model.CommandArgs, configMessage ConfigMessage) error {
-	messageTemplate, err := p.newSampleMessageTemplate(teamName, args.UserId)
+func (p *Plugin) previewWelcomeMessage(args *model.CommandArgs, configMessage ConfigMessage) error {
+	messageTemplate, err := p.newSampleMessageTemplate(args.TeamId, args.UserId)
 	if err != nil {
 		return err
 	}