Skip to content

Commit

Permalink
fix: user profile
Browse files Browse the repository at this point in the history
  • Loading branch information
namnhce committed Oct 13, 2023
1 parent 8e017e4 commit f65e05a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
3 changes: 1 addition & 2 deletions pkg/controller/employee/list.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package employee

import (
errors "errors"
"errors"
"gorm.io/gorm"

"github.com/dwarvesf/fortress-api/pkg/model"
Expand Down Expand Up @@ -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 {
Expand Down
19 changes: 4 additions & 15 deletions pkg/service/discord/discord.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down

0 comments on commit f65e05a

Please sign in to comment.