Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mm-65] Allows users to add multiple teams to the messages using team-a,team-b in the messages #82

Merged
merged 8 commits into from
Aug 31, 2021
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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**: - **TeamName**: The teams for which the Welcome Bot sends a message. 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 the case of multiple teams, use comma separated fields. For example `"my-team, my-team-2"` to display the same messages for both `my-team` and `my-team-2`
maisnamrajusingh marked this conversation as resolved.
Show resolved Hide resolved
- **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.
Expand Down Expand Up @@ -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, management",
"DelayInSeconds": 5,
"Message": [
"### Welcome {{.UserDisplayName}} to the Staff {{.Team.DisplayName}} team!",
Expand Down
16 changes: 10 additions & 6 deletions server/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,17 @@ func (p *Plugin) validateCommand(action string, parameters []string) string {
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 {
p.postCommandResponse(args, "error occurred while processing greeting for team `%s`: `%s`", teamName, err)
return
var teamNamesArr = strings.Split(message.TeamName, ",")
for _, name := range teamNamesArr {
tn := strings.Trim(name, "\t")
maisnamrajusingh marked this conversation as resolved.
Show resolved Hide resolved
if tn == teamName {
p.postCommandResponse(args, "%s", teamName)
if err := p.previewWelcomeMessage(teamName, args, *message); err != nil {
p.postCommandResponse(args, "error occurred while processing greeting for team `%s`: `%s`", teamName, err)
return
}
found = true
}

found = true
}
}

Expand Down