Skip to content

Implemented workaround for issue #33 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinvalk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implemented workaround for issue #33 #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions rest/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ type Date struct {

// UnmarshalJSON parses datetime strings returned by the transip api
func (tt *Time) UnmarshalJSON(input []byte) error {
loc, err := time.LoadLocation("Europe/Amsterdam")
if err != nil {
return err
}
// don't parse on empty dates
if string(input) == `""` {
return nil
}

loc := time.FixedZone("CEST", 2*60*60)
newTime, err := time.ParseInLocation(`"2006-01-02 15:04:05"`, string(input), loc)
if err != nil {
return err
Expand All @@ -62,14 +60,12 @@ func (tt *Time) UnmarshalJSON(input []byte) error {

// UnmarshalJSON parses date strings returned by the transip api
func (td *Date) UnmarshalJSON(input []byte) error {
loc, err := time.LoadLocation("Europe/Amsterdam")
if err != nil {
return err
}
// don't parse on empty dates
if string(input) == `""` {
return nil
}

loc := time.FixedZone("CEST", 2*60*60)
newTime, err := time.ParseInLocation(`"2006-01-02"`, string(input), loc)
if err != nil {
return err
Expand Down