Fix IntNullable and BoolNullable

araddon · Oct 24, 2012 · e4d5066 · e4d5066
1 parent 69c2eb7
commit e4d5066
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/jsonencode.go b/jsonencode.go
@@ -173,12 +173,15 @@ func (i *Int64Nullable) UnmarshalJSON(data []byte) error {
 
 type IntNullable int
 
-func (i IntNullable) UnmarshalJSON(data []byte) error {
-	if len(data) > 0 && string(data) != "null" {
-		if in, err := strconv.ParseInt(string(data), 10, 32); err == nil {
-			i = IntNullable(in)
-		}
+func (i *IntNullable) UnmarshalJSON(data []byte) error {
+	if len(data) == 0 || string(data) == "null" {
+		return nil
+	}
 
+	if in, err := strconv.ParseInt(string(data), 10, 32); err != nil {
+		return err
+	} else {
+		*i = IntNullable(in)
 	}
 	return nil
 }
@@ -197,13 +200,15 @@ func (s *StringNullable) UnmarshalJSON(data []byte) error {
 
 type BoolNullable bool
 
-func (b BoolNullable) UnmarshalJSON(data []byte) error {
-	ds := string(data)
-	if len(data) > 0 {
-		//ParseBool(str string) (value bool, err error)
-		if bo, err := strconv.ParseBool(ds); err == nil {
-			b = BoolNullable(bo)
-		}
+func (b *BoolNullable) UnmarshalJSON(data []byte) error {
+	if len(data) == 0 || string(data) == "null" {
+		return nil
+	}
+
+	if bo, err := strconv.ParseBool(string(data)); err != nil {
+		return err
+	} else {
+		*b = BoolNullable(bo)
 	}
 	return nil
 }
diff --git a/twittertypes.go b/twittertypes.go
@@ -15,7 +15,7 @@ type User struct {
 	Description                  StringNullable `json:"description"`
 	FavouritesCount              int            `json:"favourites_count"`
 	Followerscount               int            `json:"followers_count"`
-	Following                    BoolNullable   // "following":null,
+	Following                    *BoolNullable   // "following":null,
 	Friendscount                 int            `json:"friends_count"`
 	Geo_enabled                  bool
 	Lang                         string
@@ -34,9 +34,9 @@ type User struct {
 	Statuses_Count               int `json:"statuses_count"`
 	Time_zone                    StringNullable
 	Url                          StringNullable // "url":null
-	Utc_offset                   IntNullable    // "utc_offset":null,
+	Utc_offset                   *IntNullable    // "utc_offset":null,
 	Verified                     bool
-	ShowAllInlineMedia           BoolNullable `json:"show_all_inline_media"`
+	ShowAllInlineMedia           *BoolNullable `json:"show_all_inline_media"`
 	//"default_profile":false,
 	//"follow_request_sent":null,
 	//"is_translator":false,
@@ -58,11 +58,11 @@ type Tweet struct {
 	Id_str                  string
 	Created_at              string
 	Retweet_Count           int32
-	Retweeted               BoolNullable
-	Possibly_Sensitive      BoolNullable
+	Retweeted               *BoolNullable
+	Possibly_Sensitive      *BoolNullable
 	User                    *User
 	RawBytes                []byte
-	Truncated               BoolNullable
+	Truncated               *BoolNullable
 	//Geo                     string   // deprecated
 	//Place                  // "place":null,
 	//RetweetedStatus         Tweet `json:"retweeted_status"`