diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-12-20 09:27:29 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-12-20 09:27:29 -0500 |
| commit | 1f67c91fcec746aeeb34b9c39b7df328d5f6a4a0 (patch) | |
| tree | 5e89cf3867369e75d89dd95069c458be75c0d51c /api/channel.go | |
| parent | bf3fec604fc4ad0fd53d38490c18d872bccd629d (diff) | |
| download | chat-1f67c91fcec746aeeb34b9c39b7df328d5f6a4a0.tar.gz chat-1f67c91fcec746aeeb34b9c39b7df328d5f6a4a0.tar.bz2 chat-1f67c91fcec746aeeb34b9c39b7df328d5f6a4a0.zip | |
Prevent accidental removal of user from town square (#4842)
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/api/channel.go b/api/channel.go index e4786c616..dcc4ed563 100644 --- a/api/channel.go +++ b/api/channel.go @@ -1003,23 +1003,22 @@ func getChannel(c *Context, w http.ResponseWriter, r *http.Request) { func getChannelByName(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) - channelname := params["channel_name"] + channelName := params["channel_name"] - cchan := Srv.Store.Channel().GetByName(c.TeamId, channelname) + cchan := Srv.Store.Channel().GetByName(c.TeamId, channelName) if cresult := <-cchan; cresult.Err != nil { c.Err = cresult.Err return } else { - data := &model.Channel{} - data = cresult.Data.(*model.Channel) + data := cresult.Data.(*model.Channel) if !HasPermissionToChannelContext(c, data.Id, model.PERMISSION_READ_CHANNEL) { return } if data.TeamId != c.TeamId && data.Type != model.CHANNEL_DIRECT { - c.Err = model.NewLocAppError("getChannel", "api.channel.get_channel.wrong_team.app_error", map[string]interface{}{"ChannelName": channelname, "TeamId": c.TeamId}, "") + c.Err = model.NewLocAppError("getChannel", "api.channel.get_channel.wrong_team.app_error", map[string]interface{}{"ChannelName": channelName, "TeamId": c.TeamId}, "") return } @@ -1207,7 +1206,11 @@ func removeMember(c *Context, w http.ResponseWriter, r *http.Request) { func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel *model.Channel) *model.AppError { if channel.DeleteAt > 0 { - return model.NewLocAppError("updateChannel", "api.channel.remove_user_from_channel.deleted.app_error", nil, "") + return model.NewLocAppError("RemoveUserFromChannel", "api.channel.remove_user_from_channel.deleted.app_error", nil, "") + } + + if channel.Name == model.DEFAULT_CHANNEL { + return model.NewLocAppError("RemoveUserFromChannel", "api.channel.remove.default.app_error", map[string]interface{}{"Channel": model.DEFAULT_CHANNEL}, "") } if cmresult := <-Srv.Store.Channel().RemoveMember(channel.Id, userIdToRemove); cmresult.Err != nil { |