summaryrefslogtreecommitdiffstats
path: root/app/channel.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-02-02 15:03:41 +0000
committerHarrison Healey <harrisonmhealey@gmail.com>2017-02-02 10:03:41 -0500
commit28e445c6e08d0aa931fcf0be0098dfd47aa87eb4 (patch)
tree3b995da5fb26e9fad364af2a8872527f8e5fa156 /app/channel.go
parente9d6287dc8fefc9ea6fa1c49743364218a188abd (diff)
downloadchat-28e445c6e08d0aa931fcf0be0098dfd47aa87eb4.tar.gz
chat-28e445c6e08d0aa931fcf0be0098dfd47aa87eb4.tar.bz2
chat-28e445c6e08d0aa931fcf0be0098dfd47aa87eb4.zip
PLT-5407: Bulk importing of User memberships. (#5273)
Diffstat (limited to 'app/channel.go')
-rw-r--r--app/channel.go12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/channel.go b/app/channel.go
index aba65143b..1f5d308bf 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -336,7 +336,7 @@ func DeleteChannel(channel *model.Channel, userId string) *model.AppError {
return nil
}
-func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelMember, *model.AppError) {
+func addUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelMember, *model.AppError) {
if channel.DeleteAt > 0 {
return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user_to_channel.deleted.app_error", nil, "")
}
@@ -380,6 +380,16 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM
InvalidateCacheForUser(user.Id)
InvalidateCacheForChannelMembers(channel.Id)
+ return newMember, nil
+}
+
+func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelMember, *model.AppError) {
+
+ newMember, err := addUserToChannel(user, channel)
+ if err != nil {
+ return nil, err
+ }
+
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_ADDED, "", channel.Id, "", nil)
message.Add("user_id", user.Id)
message.Add("team_id", channel.TeamId)