From 98114944fc325ece658c40bf4eba125238c47bd5 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 3 Dec 2018 14:45:19 -0500 Subject: vendor: update github.com/gogs/go-gogs-client Bring fixes for #5538 --- vendor/github.com/gogs/go-gogs-client/user.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'vendor/github.com/gogs/go-gogs-client/user.go') diff --git a/vendor/github.com/gogs/go-gogs-client/user.go b/vendor/github.com/gogs/go-gogs-client/user.go index 3879b1a6..bbe0ca9f 100644 --- a/vendor/github.com/gogs/go-gogs-client/user.go +++ b/vendor/github.com/gogs/go-gogs-client/user.go @@ -5,30 +5,19 @@ package gogs import ( - "encoding/json" "fmt" ) // User represents a API user. type User struct { ID int64 `json:"id"` - UserName string `json:"login"` + UserName string `json:"username"` // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility + Login string `json:"login"` FullName string `json:"full_name"` Email string `json:"email"` AvatarUrl string `json:"avatar_url"` } -// MarshalJSON implements the json.Marshaler interface for User -func (u User) MarshalJSON() ([]byte, error) { - // Re-declaring User to avoid recursion - type shadow User - return json.Marshal(struct { - shadow - // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility - CompatUserName string `json:"username"` - }{shadow(u), u.UserName}) -} - func (c *Client) GetUserInfo(user string) (*User, error) { u := new(User) err := c.getParsedResponse("GET", fmt.Sprintf("/users/%s", user), nil, nil, u) -- cgit v1.2.3