summaryrefslogtreecommitdiffstats
path: root/api/channel.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-20 11:31:52 -0500
committerenahum <nahumhbl@gmail.com>2017-02-20 13:31:52 -0300
commitdd4d8440eac2e4b64bfb6b449cc0668b78ecba50 (patch)
tree2529e2561e0fd7216c85f7ea68bee390474c7426 /api/channel.go
parentbecbe935c2c411745aa1d940d32ddfe6c04b7252 (diff)
downloadchat-dd4d8440eac2e4b64bfb6b449cc0668b78ecba50.tar.gz
chat-dd4d8440eac2e4b64bfb6b449cc0668b78ecba50.tar.bz2
chat-dd4d8440eac2e4b64bfb6b449cc0668b78ecba50.zip
Implement a few channel member endpoints for APIv4 (#5444)
* Implement POST /channels/members/{user_id}/view endpoint for APIv4 * Implement PUT /channels/{channel_id}/members/{user_id}/roles endpoint for APIv4 * Implement DELETE /channels/{channel_id}/members/{user_id} endpoint for APIv4
Diffstat (limited to 'api/channel.go')
-rw-r--r--api/channel.go17
1 files changed, 2 insertions, 15 deletions
diff --git a/api/channel.go b/api/channel.go
index a5d42f151..6eda72dd9 100644
--- a/api/channel.go
+++ b/api/channel.go
@@ -649,25 +649,12 @@ func removeMember(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- if _, err = app.GetChannelMember(channel.Id, c.Session.UserId); err != nil {
- c.Err = err
- return
- }
-
if err = app.RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel); err != nil {
- c.Err = model.NewLocAppError("removeMember", "api.channel.remove_member.unable.app_error", nil, err.Message)
- return
- }
-
- c.LogAudit("name=" + channel.Name + " user_id=" + userIdToRemove)
-
- var user *model.User
- if user, err = app.GetUser(userIdToRemove); err != nil {
c.Err = err
return
}
- go app.PostRemoveFromChannelMessage(c.Session.UserId, user, channel)
+ c.LogAudit("name=" + channel.Name + " user_id=" + userIdToRemove)
result := make(map[string]string)
result["channel_id"] = channel.Id
@@ -753,7 +740,7 @@ func autocompleteChannels(c *Context, w http.ResponseWriter, r *http.Request) {
func viewChannel(c *Context, w http.ResponseWriter, r *http.Request) {
view := model.ChannelViewFromJson(r.Body)
- if err := app.ViewChannel(view, c.TeamId, c.Session.UserId, !c.Session.IsMobileApp()); err != nil {
+ if err := app.ViewChannel(view, c.Session.UserId, !c.Session.IsMobileApp()); err != nil {
c.Err = err
return
}