diff --git a/pkg/controller/employee/list.go b/pkg/controller/employee/list.go index 4a0cb004f..049eec8dd 100644 --- a/pkg/controller/employee/list.go +++ b/pkg/controller/employee/list.go @@ -1,7 +1,7 @@ package employee import ( - errors "errors" + "errors" "gorm.io/gorm" "github.com/dwarvesf/fortress-api/pkg/model" @@ -94,7 +94,6 @@ func (r *controller) ListByDiscordRequest(discordID, email, key string, userInfo if err != nil { return nil, err } - if len(dt) <= 0 { in.Keyword = key } else { diff --git a/pkg/service/discord/discord.go b/pkg/service/discord/discord.go index 12e1cc992..affc2b1d3 100644 --- a/pkg/service/discord/discord.go +++ b/pkg/service/discord/discord.go @@ -184,30 +184,19 @@ func (d *discordClient) GetMemberByName(discordName string) ([]*discordgo.Member } func (d *discordClient) GetMemberByUsername(username string) (*discordgo.Member, error) { - if len(username) == 0 { + if username == "" { return nil, nil } - discordNameParts := strings.Split(username, "#") - - guildMembers, err := d.SearchMember(discordNameParts[0]) + guildMembers, err := d.SearchMember(username) if err != nil { return nil, err } var discordMember *discordgo.Member for _, m := range guildMembers { - if len(discordNameParts) == 1 { - if m.User.Username == discordNameParts[0] { - discordMember = m - } - break - } - if len(discordNameParts) > 1 { - if m.User.Username == discordNameParts[0] && m.User.Discriminator == discordNameParts[1] { - discordMember = m - } - break + if m.User.Username == username { + discordMember = m } }