diff options
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/api/channel.go b/api/channel.go index 6eda72dd9..2604cc5ce 100644 --- a/api/channel.go +++ b/api/channel.go @@ -25,6 +25,7 @@ func InitChannel() { BaseRoutes.Channels.Handle("/create", ApiUserRequired(createChannel)).Methods("POST") BaseRoutes.Channels.Handle("/view", ApiUserRequired(viewChannel)).Methods("POST") BaseRoutes.Channels.Handle("/create_direct", ApiUserRequired(createDirectChannel)).Methods("POST") + BaseRoutes.Channels.Handle("/create_group", ApiUserRequired(createGroupChannel)).Methods("POST") BaseRoutes.Channels.Handle("/update", ApiUserRequired(updateChannel)).Methods("POST") BaseRoutes.Channels.Handle("/update_header", ApiUserRequired(updateChannelHeader)).Methods("POST") BaseRoutes.Channels.Handle("/update_purpose", ApiUserRequired(updateChannelPurpose)).Methods("POST") @@ -98,6 +99,38 @@ func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) { } } +func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) { + if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_CREATE_GROUP_CHANNEL) { + c.SetPermissionError(model.PERMISSION_CREATE_GROUP_CHANNEL) + return + } + + userIds := model.ArrayFromJson(r.Body) + if len(userIds) == 0 { + c.SetInvalidParam("createGroupChannel", "user_ids") + return + } + + found := false + for _, id := range userIds { + if id == c.Session.UserId { + found = true + break + } + } + + if !found { + userIds = append(userIds, c.Session.UserId) + } + + if sc, err := app.CreateGroupChannel(userIds); err != nil { + c.Err = err + return + } else { + w.Write([]byte(sc.ToJson())) + } +} + func CanManageChannel(c *Context, channel *model.Channel) bool { if channel.Type == model.CHANNEL_OPEN && !app.SessionHasPermissionToChannel(c.Session, channel.Id, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES) { c.SetPermissionError(model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES) @@ -457,7 +490,7 @@ func getChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - if channel.TeamId != c.TeamId && channel.Type != model.CHANNEL_DIRECT { + if channel.TeamId != c.TeamId && !channel.IsGroupOrDirect() { c.Err = model.NewLocAppError("getChannel", "api.channel.get_channel.wrong_team.app_error", map[string]interface{}{"ChannelId": id, "TeamId": c.TeamId}, "") return } @@ -493,7 +526,7 @@ func getChannelByName(c *Context, w http.ResponseWriter, r *http.Request) { return } - if channel.TeamId != c.TeamId && channel.Type != model.CHANNEL_DIRECT { + if channel.TeamId != c.TeamId && !channel.IsGroupOrDirect() { c.Err = model.NewLocAppError("getChannel", "api.channel.get_channel.wrong_team.app_error", map[string]interface{}{"ChannelName": channelName, "TeamId": c.TeamId}, "") return } |