Handle timezone information during DateTime parsing (#46) (#49)

* Handle timezone information during DateTime parsing (#46)

* adjusting asserts to be UTC

* updating TibiadataDatetimeV3 with correct format

* adding loading of Europe/Berlin timezone and changing time parsing to include that location

* cleaning

Co-authored-by: kamilon <kennedybushnell@kamilon.com>

Author: tobiasehlert

go.mod

@@ -26,7 +26,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/ugorji/go/codec v1.2.6 // indirect
 	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
 	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect

go.sum

@@ -61,10 +61,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
-github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

src/TibiaCharactersCharacterV3_test.go

@@ -34,7 +34,7 @@ func TestNumber1(t *testing.T) {
 	assert.Nil(characterJson.Characters.Character.Houses)
 	assert.Equal("Jokerz", characterJson.Characters.Character.Guild.GuildName)
 	assert.Equal("Trial of the ", characterJson.Characters.Character.Guild.Rank)
-	assert.Equal("2022-01-05T22:23:32Z", characterJson.Characters.Character.LastLogin)
+	assert.Equal("2022-01-05T21:23:32Z", characterJson.Characters.Character.LastLogin)
 	assert.Equal("Premium Account", characterJson.Characters.Character.AccountStatus)
 	assert.Empty(characterJson.Characters.Character.Comment)
 }
@@ -69,7 +69,7 @@ func TestNumber2(t *testing.T) {
 	assert.Equal("2022-01-16", characterJson.Characters.Character.Houses[0].Paid)
 	assert.Equal("Magnus Magister of the ", characterJson.Characters.Character.Guild.Rank)
 	assert.Equal("Lionheart Society", characterJson.Characters.Character.Guild.GuildName)
-	assert.Equal("2022-01-06T22:38:44Z", characterJson.Characters.Character.LastLogin)
+	assert.Equal("2022-01-06T21:38:44Z", characterJson.Characters.Character.LastLogin)
 	assert.Equal("Testa de Ferro do Lejonhjartat ;)", characterJson.Characters.Character.Comment)
 	assert.Equal("Premium Account", characterJson.Characters.Character.AccountStatus)
 
@@ -104,7 +104,7 @@ func TestNumber3(t *testing.T) {
 	assert := assert.New(t)
 
 	assert.Equal("Borttagna Gubben", characterJson.Characters.Character.Name)
-	assert.Equal("2022-03-08T01:09:13Z", characterJson.Characters.Character.DeletionDate)
+	assert.Equal("2022-03-08T00:09:13Z", characterJson.Characters.Character.DeletionDate)
 	assert.Equal("", characterJson.Characters.Character.LastLogin)
 	assert.Equal("Free Account", characterJson.Characters.Character.AccountStatus)
 }

src/TibiaDataUtils.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"log"
+	"time"
+
+	"golang.org/x/text/unicode/norm"
+)
+
+// TibiadataDatetimeV3 func
+func TibiadataDatetimeV3(date string) string {
+	//TODO: Normalization needs to happen above this layer
+	date = norm.NFKC.String(date)
+
+	var (
+		returnDate time.Time
+		err        error
+	)
+
+	// If statement to determine if date string is filled or empty
+	if date == "" {
+		// The string that should be returned is the current timestamp
+		returnDate = time.Now()
+	} else {
+		// timezone use in html: CET/CEST
+		loc, _ := time.LoadLocation("Europe/Berlin")
+
+		// format used in datetime on html: Jan 02 2007, 19:20:30 CET
+		formatting := "Jan 02 2006, 15:04:05 MST"
+
+		// parsing html in time with location set in loc
+		returnDate, err = time.ParseInLocation(formatting, date, loc)
+
+		// parsing html in tiem without loc
+		//returnDate, err = time.Parse("Jan 02 2006, 15:04:05 MST", date)
+
+		if err != nil {
+			log.Println(err)
+		}
+	}
+
+	// Return of formatted date and time string to functions..
+	return returnDate.UTC().Format(time.RFC3339)
+}

src/TibiaDataUtils_test.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTibiaCETDateFormat(t *testing.T) {
+	assert.Equal(t, "2021-12-24T08:52:16Z", TibiadataDatetimeV3("Dec 24 2021, 09:52:16 CET"))
+}
+
+func TestTibiaCESTDateFormat(t *testing.T) {
+	assert.Equal(t, "2021-12-24T07:52:16Z", TibiadataDatetimeV3("Dec 24 2021, 09:52:16 CEST"))
+}
+
+func TestTibiaUTCDateFormat(t *testing.T) {
+	assert.Equal(t, "2021-12-24T09:52:16Z", TibiadataDatetimeV3("Dec 24 2021, 09:52:16 UTC"))
+}

src/webserver.go

@@ -417,55 +417,6 @@ func TibiadataQueryEscapeStringV3(data string) string {
 	return url.QueryEscape(data)
 }
 
-var datetimeRegex = regexp.MustCompile(`(.*).([0-9][0-9]).([0-9][0-9][0-9][0-9]),.([0-9][0-9]:[0-9][0-9]:[0-9][0-9]).(.*)`)
-
-// TibiadataDatetimeV3 func
-func TibiadataDatetimeV3(date string) string {
-	var returnDate string
-
-	// If statement to determine if date string is filled or empty
-	if date == "" {
-		// The string that should be returned is the current timestamp
-		returnDate = time.Now().UTC().Format(time.RFC3339)
-	} else {
-		// Converting: Jan 02 2007, 19:20:30 CET -> RFC1123 -> RFC3339
-
-		// regex to exact values..
-		subma1 := datetimeRegex.FindAllStringSubmatch(date, -1)
-
-		if len(subma1) > 0 {
-			// Adding fake-Sun for valid RFC1123 convertion..
-			dateDate, err := time.Parse(time.RFC1123, "Sun, "+subma1[0][2]+" "+subma1[0][1]+" "+subma1[0][3]+" "+subma1[0][4]+" "+subma1[0][5])
-			if err != nil {
-				// log.Fatal(err)
-				log.Println(err)
-			}
-
-			// Set data to return
-			returnDate = dateDate.UTC().Format(time.RFC3339)
-
-		} else {
-			// Format not defined yet..
-			log.Println("Incoming date: " + date)
-			log.Println("UNKNOWN FORMAT YET!")
-
-			// Parse the given string to be formatted correct later
-			dateDate, err := time.Parse(time.RFC3339, string(date))
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			// Set data to return
-			returnDate = dateDate.UTC().Format(time.RFC3339)
-
-		}
-	}
-
-	// Return of formatted date and time string to functions..
-	return returnDate
-
-}
-
 var dateRegex = regexp.MustCompile(`([a-zA-Z]{3}).*([0-9]{2}).*([0-9]{4})`)
 
 // TibiadataDateV3 func