-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
34 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,81 @@ | ||
| package traq | ||
|
|
||
| import ( | ||
| //"context" | ||
| "context" | ||
| // "encoding/json" | ||
| // "fmt" | ||
| // "net/http" | ||
| // "net/url" | ||
| // "strconv" | ||
|
|
||
| "github.com/gofrs/uuid" | ||
| "github.com/traPtitech/go-traq" | ||
| "golang.org/x/oauth2" | ||
| ) | ||
|
|
||
|
|
||
|
|
||
| func (repo *TraQRepository) GetUser(token *oauth2.Token, userID uuid.UUID) (*traq.User, error) { | ||
| traqconf := traq.NewConfiguration() | ||
| conf := TraQDefaultConfig | ||
| traqconf.HTTPClient = conf.Client(context.Background(),token) | ||
| traqconf.HTTPClient = conf.Client(context.Background(), token) | ||
| apiClient := traq.NewAPIClient(traqconf) | ||
| userDtail,_,err := apiClient.UserApi.GetUser(context.Background(),userID.String()).Execute() | ||
| if err!=nil{ | ||
| // fmt.Println("GetUserError") | ||
| return nil,err | ||
| userDtail, _, err := apiClient.UserApi.GetUser(context.Background(), userID.String()).Execute() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| user := convertUserdetailToUser(userDtail) | ||
| // fmt.Println("GetUserDetailSuccess") | ||
| return user, err | ||
| } | ||
|
|
||
| func (repo *TraQRepository) GetUsers(token *oauth2.Token, includeSuspended bool) ([]*traq.User, error) { | ||
| traqconf := traq.NewConfiguration() | ||
| conf := TraQDefaultConfig | ||
| traqconf.HTTPClient = conf.Client(context.Background(),token) | ||
| traqconf.HTTPClient = conf.Client(context.Background(), token) | ||
| apiClient := traq.NewAPIClient(traqconf) | ||
| users,_,err := apiClient.UserApi.GetUsers(context.Background()).IncludeSuspended(includeSuspended).Execute() | ||
| if err!=nil{ | ||
| // fmt.Println("GetUsersError") | ||
| return nil,err | ||
| users, _, err := apiClient.UserApi.GetUsers(context.Background()).IncludeSuspended(includeSuspended).Execute() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| res_users := convertUsersToUsers(users) | ||
| // fmt.Println("GetUsersSuccess") | ||
| // fmt.Println(res_users) | ||
| return res_users, err | ||
| } | ||
|
|
||
|
|
||
| func (repo *TraQRepository) GetUserMe(token *oauth2.Token) (*traq.User, error) { | ||
| traqconf := traq.NewConfiguration() | ||
| conf :=TraQDefaultConfig | ||
| traqconf.HTTPClient=conf.Client(context.Background(),token) | ||
| conf := TraQDefaultConfig | ||
| traqconf.HTTPClient = conf.Client(context.Background(), token) | ||
| client := traq.NewAPIClient(traqconf) | ||
|
|
||
| data,_,err:= client.MeApi.GetMe(context.Background()).Execute() | ||
| if err != nil{ | ||
| return nil,err | ||
| data, _, err := client.MeApi.GetMe(context.Background()).Execute() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| user := convertMyUserdetailToUser(data) | ||
| // fmt.Println("GetUserMeSuccess") | ||
| return user, err | ||
| } | ||
|
|
||
| func convertMyUserdetailToUser (userdetail *traq.MyUserDetail) *traq.User{ | ||
| func convertMyUserdetailToUser(userdetail *traq.MyUserDetail) *traq.User { | ||
| user := new(traq.User) | ||
| user.Id=userdetail.Id | ||
| user.Name=userdetail.Name | ||
| user.DisplayName=userdetail.DisplayName | ||
| user.IconFileId=userdetail.IconFileId | ||
| user.Bot=userdetail.Bot | ||
| user.State=userdetail.State | ||
| user.UpdatedAt=userdetail.UpdatedAt | ||
| user.Id = userdetail.Id | ||
| user.Name = userdetail.Name | ||
| user.DisplayName = userdetail.DisplayName | ||
| user.IconFileId = userdetail.IconFileId | ||
| user.Bot = userdetail.Bot | ||
| user.State = userdetail.State | ||
| user.UpdatedAt = userdetail.UpdatedAt | ||
| return user | ||
| } | ||
|
|
||
| func convertUserdetailToUser (userdetail *traq.UserDetail) *traq.User{ | ||
| func convertUserdetailToUser(userdetail *traq.UserDetail) *traq.User { | ||
| user := new(traq.User) | ||
| user.Id=userdetail.Id | ||
| user.Name=userdetail.Name | ||
| user.DisplayName=userdetail.DisplayName | ||
| user.IconFileId=userdetail.IconFileId | ||
| user.Bot=userdetail.Bot | ||
| user.State=userdetail.State | ||
| user.UpdatedAt=userdetail.UpdatedAt | ||
| user.Id = userdetail.Id | ||
| user.Name = userdetail.Name | ||
| user.DisplayName = userdetail.DisplayName | ||
| user.IconFileId = userdetail.IconFileId | ||
| user.Bot = userdetail.Bot | ||
| user.State = userdetail.State | ||
| user.UpdatedAt = userdetail.UpdatedAt | ||
| return user | ||
| } | ||
| func convertUsersToUsers(users []traq.User) []*traq.User{ | ||
| new_users:=make([]*traq.User,len(users)) | ||
| for i,_user := range users{ | ||
| user:=_user | ||
| func convertUsersToUsers(users []traq.User) []*traq.User { | ||
| new_users := make([]*traq.User, len(users)) | ||
| for i, _user := range users { | ||
| user := _user | ||
| new_users[i] = &user | ||
| } | ||
| return new_users | ||
| } | ||
| } |