summaryrefslogtreecommitdiffstats
path: root/app/channel.go
diff options
context:
space:
mode:
Diffstat (limited to 'app/channel.go')
-rw-r--r--app/channel.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/channel.go b/app/channel.go
index 17fa02ad3..0d9cb5a94 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -490,7 +490,11 @@ func AddChannelMember(userId string, channel *model.Channel, userRequestorId str
return nil, err
}
- go PostAddToChannelMessage(userRequestor, user, channel)
+ if userId == userRequestorId {
+ postJoinChannelMessage(user, channel)
+ } else {
+ go PostAddToChannelMessage(userRequestor, user, channel)
+ }
UpdateChannelLastViewedAt([]string{channel.Id}, userRequestor.Id)
@@ -961,7 +965,11 @@ func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel
return err
}
- go PostRemoveFromChannelMessage(removerUserId, user, channel)
+ if userIdToRemove == removerUserId {
+ postLeaveChannelMessage(user, channel)
+ } else {
+ go PostRemoveFromChannelMessage(removerUserId, user, channel)
+ }
return nil
}