diff options
| -rw-r--r-- | api/command_invite_people.go | 78 | ||||
| -rw-r--r-- | api/command_invite_people_test.go | 31 | ||||
| -rw-r--r-- | api/team.go | 8 | ||||
| -rw-r--r-- | i18n/en.json | 28 |
4 files changed, 141 insertions, 4 deletions
diff --git a/api/command_invite_people.go b/api/command_invite_people.go new file mode 100644 index 000000000..4aa1d82f8 --- /dev/null +++ b/api/command_invite_people.go @@ -0,0 +1,78 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api + +import ( + "strings" + + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" +) + +type InvitePeopleProvider struct { +} + +const ( + CMD_INVITE_PEOPLE = "invite_people" +) + +func init() { + RegisterCommandProvider(&InvitePeopleProvider{}) +} + +func (me *InvitePeopleProvider) GetTrigger() string { + return CMD_INVITE_PEOPLE +} + +func (me *InvitePeopleProvider) GetCommand(c *Context) *model.Command { + return &model.Command{ + Trigger: CMD_INVITE_PEOPLE, + AutoComplete: true, + AutoCompleteDesc: c.T("api.command.invite_people.desc"), + AutoCompleteHint: c.T("api.command.invite_people.hint"), + DisplayName: c.T("api.command.invite_people.name"), + } +} + +func (me *InvitePeopleProvider) DoCommand(c *Context, channelId string, message string) *model.CommandResponse { + if !utils.Cfg.EmailSettings.SendEmailNotifications { + return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command.invite_people.email_off")} + } + + tchan := Srv.Store.Team().Get(c.TeamId) + uchan := Srv.Store.User().Get(c.Session.UserId) + + emailList := strings.Fields(message) + + for i := len(emailList) - 1; i >= 0; i-- { + emailList[i] = strings.Trim(emailList[i], ",") + if !strings.Contains(emailList[i], "@") { + emailList = append(emailList[:i], emailList[i+1:]...) + } + } + + if len(emailList) == 0 { + return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command.invite_people.no_email")} + } + + var team *model.Team + if result := <-tchan; result.Err != nil { + c.Err = result.Err + return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command.invite_people.fail")} + } else { + team = result.Data.(*model.Team) + } + + var user *model.User + if result := <-uchan; result.Err != nil { + c.Err = result.Err + return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command.invite_people.fail")} + } else { + user = result.Data.(*model.User) + } + + go InviteMembers(c, team, user, emailList) + + return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: c.T("api.command.invite_people.sent")} +} diff --git a/api/command_invite_people_test.go b/api/command_invite_people_test.go new file mode 100644 index 000000000..3efc87e60 --- /dev/null +++ b/api/command_invite_people_test.go @@ -0,0 +1,31 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api + +import ( + "testing" + + "github.com/mattermost/platform/model" +) + +func TestInvitePeopleCommand(t *testing.T) { + th := Setup().InitBasic() + Client := th.BasicClient + channel := th.BasicChannel + + r1 := Client.Must(Client.Command(channel.Id, "/invite_people test@example.com", false)).Data.(*model.CommandResponse) + if r1 == nil { + t.Fatal("Command failed to execute") + } + + r2 := Client.Must(Client.Command(channel.Id, "/invite_people test1@example.com test2@example.com", false)).Data.(*model.CommandResponse) + if r2 == nil { + t.Fatal("Command failed to execute") + } + + r3 := Client.Must(Client.Command(channel.Id, "/invite_people", false)).Data.(*model.CommandResponse) + if r3 == nil { + t.Fatal("Command failed to execute") + } +} diff --git a/api/team.go b/api/team.go index f65feb5dc..8eb7c4fef 100644 --- a/api/team.go +++ b/api/team.go @@ -39,7 +39,7 @@ func InitTeam() { BaseRoutes.NeedTeam.Handle("/add_user_to_team", ApiUserRequired(addUserToTeam)).Methods("POST") - // These should be moved to the global admain console + // These should be moved to the global admin console BaseRoutes.NeedTeam.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST") BaseRoutes.Teams.Handle("/add_user_to_team_from_invite", ApiUserRequired(addUserToTeamFromInvite)).Methods("POST") } @@ -399,12 +399,12 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { user = result.Data.(*model.User) } - ia := make([]string, len(invites.Invites)) + emailList := make([]string, len(invites.Invites)) for _, invite := range invites.Invites { - ia = append(ia, invite["email"]) + emailList = append(emailList, invite["email"]) } - InviteMembers(c, team, user, ia) + InviteMembers(c, team, user, emailList) w.Write([]byte(invites.ToJson())) } diff --git a/i18n/en.json b/i18n/en.json index d3f2d22eb..3666abd44 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -340,6 +340,34 @@ "translation": "No command trigger found" }, { + "id": "api.command.invite_people.desc", + "translation": "Send an email invite to your Mattermost team" + }, + { + "id": "api.command.invite_people.email_off", + "translation": "Email has not been configured, no invite(s) sent" + }, + { + "id": "api.command.invite_people.fail", + "translation": "Encountered an error sending email invite(s)" + }, + { + "id": "api.command.invite_people.hint", + "translation": "[name@domain.com ...]" + }, + { + "id": "api.command.invite_people.name", + "translation": "invite_people" + }, + { + "id": "api.command.invite_people.no_email", + "translation": "Please specify one or more valid email addresses" + }, + { + "id": "api.command.invite_people.sent", + "translation": "Email invite(s) sent" + }, + { "id": "api.command.init.debug", "translation": "Initializing command api routes" }, |