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

Fixes /welcomebot preview teamname command not working. #74

Merged
merged 4 commits into from
Aug 19, 2021
Merged

Fixes /welcomebot preview teamname command not working. #74

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7411ca6
/welcomebot preview <teamname> working now
maisnamrajusingh Jun 10, 2021
b3bd45d
/welcomebot preview <teamname> working now
maisnamrajusingh Jun 10, 2021
5fad913
fixed lint inssue
maisnamrajusingh Jun 10, 2021
0d6e6a5
fixed issue with the preview command
maisnamrajusingh Jul 28, 2021
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
2 changes: 1 addition & 1 deletion server/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (p *Plugin) executeCommandPreview(teamName string, args *model.CommandArgs)
found := false
for _, message := range p.getWelcomeMessages() {
if message.TeamName == teamName {
if err := p.previewWelcomeMessage(teamName, args, *message); err != nil {
if err := p.previewWelcomeMessage(args, *message); err != nil {
hanzei marked this conversation as resolved.
Show resolved Hide resolved
p.postCommandResponse(args, "error occurred while processing greeting for team `%s`: `%s`", teamName, err)
return
}
Expand Down
16 changes: 8 additions & 8 deletions server/welcomebot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (p *Plugin) getSiteURL() string {
return *config.ServiceSettings.SiteURL
}

func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemplate, error) {
func (p *Plugin) newSampleMessageTemplate(teamID string, userID string) (*MessageTemplate, error) {
data := &MessageTemplate{}
var err *model.AppError

Expand All @@ -66,14 +66,14 @@ func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemp
return nil, fmt.Errorf("failed to query user %s: %w", userID, err)
}

if data.Team, err = p.API.GetTeamByName(teamName); err != nil {
p.API.LogError("failed to query team", "team_name", teamName, "err", err)
return nil, fmt.Errorf("failed to query team %s: %w", teamName, err)
if data.Team, err = p.API.GetTeam(teamID); err != nil {
p.API.LogError("failed to query team", "team_id", teamID, "err", err)
return nil, fmt.Errorf("failed to query team %s: %w", teamID, err)
}

if data.Townsquare, err = p.API.GetChannelByName(data.Team.Id, "town-square", false); err != nil {
p.API.LogError("failed to query town-square", "team_name", teamName)
return nil, fmt.Errorf("failed to query town-square %s: %w", teamName, err)
p.API.LogError("failed to query town-square", "team_name", data.Team.Name)
return nil, fmt.Errorf("failed to query town-square %s: %w", data.Team.Name, err)
}

if data.DirectMessage, err = p.API.GetDirectChannel(data.User.Id, p.botUserID); err != nil {
Expand All @@ -86,8 +86,8 @@ func (p *Plugin) newSampleMessageTemplate(teamName, userID string) (*MessageTemp
return data, nil
}

func (p *Plugin) previewWelcomeMessage(teamName string, args *model.CommandArgs, configMessage ConfigMessage) error {
messageTemplate, err := p.newSampleMessageTemplate(teamName, args.UserId)
func (p *Plugin) previewWelcomeMessage(args *model.CommandArgs, configMessage ConfigMessage) error {
messageTemplate, err := p.newSampleMessageTemplate(args.TeamId, args.UserId)
if err != nil {
return err
}
Expand Down