|
@@ -5,30 +5,19 @@
|
|
package gogs
|
|
package gogs
|
|
|
|
|
|
import (
|
|
import (
|
|
- "encoding/json"
|
|
|
|
"fmt"
|
|
"fmt"
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
type User struct {
|
|
type User struct {
|
|
ID int64 `json:"id"`
|
|
ID int64 `json:"id"`
|
|
- UserName string `json:"login"`
|
|
+ UserName string `json:"username"`
|
|
|
|
+ Login string `json:"login"`
|
|
FullName string `json:"full_name"`
|
|
FullName string `json:"full_name"`
|
|
Email string `json:"email"`
|
|
Email string `json:"email"`
|
|
AvatarUrl string `json:"avatar_url"`
|
|
AvatarUrl string `json:"avatar_url"`
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-func (u User) MarshalJSON() ([]byte, error) {
|
|
|
|
-
|
|
|
|
- type shadow User
|
|
|
|
- return json.Marshal(struct {
|
|
|
|
- shadow
|
|
|
|
-
|
|
|
|
- CompatUserName string `json:"username"`
|
|
|
|
- }{shadow(u), u.UserName})
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
func (c *Client) GetUserInfo(user string) (*User, error) {
|
|
func (c *Client) GetUserInfo(user string) (*User, error) {
|
|
u := new(User)
|
|
u := new(User)
|
|
err := c.getParsedResponse("GET", fmt.Sprintf("/users/%s", user), nil, nil, u)
|
|
err := c.getParsedResponse("GET", fmt.Sprintf("/users/%s", user), nil, nil, u)
|