Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MM-83]: Restrict welcomebot from sending welcome messages & adding to channel if user is a bot #134

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[MM-83]: Restrict welcomebot from sending welcome messages & adding to channel if user is a bot #134

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6209b2
MM-387: restrict welcomebot from sending welcome messages & adding to…
raghavaggarwal2308 Apr 18, 2024
688c5ee
MM-387: Updated the logic for the functionality
raghavaggarwal2308 Apr 18, 2024
46e4a53
MM-387: Removed unused variable
raghavaggarwal2308 Apr 18, 2024
3611e2f
MM-387: review fixes
raghavaggarwal2308 Apr 19, 2024
0472206
[MM-414] Code refactoring
raghavaggarwal2308 Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions server/welcomebot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,22 @@ func (p *Plugin) processActionMessage(messageTemplate MessageTemplate, action *A
}

func (p *Plugin) joinChannel(action *Action, channelName string) {
if channel, err := p.API.GetChannelByName(action.Context.TeamID, channelName, false); err == nil {
if _, err := p.API.AddChannelMember(channel.Id, action.Context.UserID); err != nil {
p.API.LogError("Couldn't add user to the channel, continuing to next channel", "user_id", action.Context.UserID, "channel_id", channel.Id)
user, err := p.client.User.Get(action.Context.UserID)
if err != nil {
p.client.Log.Error("Couldn't get user details", "user_id", action.Context.UserID, "error", err.Error())
return
}
if user.IsBot {
p.client.Log.Info("Skipping adding this user to the channel since it is a bot.", "user_id", action.Context.UserID)
return
}

if channel, err := p.client.Channel.GetByName(action.Context.TeamID, channelName, false); err == nil {
if _, err = p.client.Channel.AddMember(channel.Id, action.Context.UserID); err != nil {
p.client.Log.Error("Couldn't add user to the channel, continuing to the next channel", "user_id", action.Context.UserID, "channel_id", channel.Id, "error", err.Error())
return
}
} else {
p.API.LogError("failed to get channel, continuing to the next channel", "channel_name", channelName, "user_id", action.Context.UserID)
p.client.Log.Error("Failed to get the channel, continuing to the next channel.", "channel_name", channelName, "user_id", action.Context.UserID, "error", err.Error())
}
}