3 files changed, 9 insertions, 3 deletions
diff --git a/src/data/Tweet.java b/src/data/Tweet.java
index 04b5f2c..320adbb 100644
--- a/src/data/Tweet.java
+++ b/src/data/Tweet.java
@@ -1,5 +1,6 @@
 package data;
 
+import org.joda.time.DateTime;
 
 /**
  * Represents the tweet object as returned by the twitter API.
@@ -10,7 +11,7 @@ public class Tweet {
     public String lang;
     @ValidatingJsonDeserializer.Nullable
     public long in_reply_to_user_id;
-    public String created_at;
+    public DateTime created_at;
     public long favorite_count;
     @ValidatingJsonDeserializer.Nullable
     @ValidatingJsonDeserializer.Validator
diff --git a/src/data/TwitterJsonDeserializer.java b/src/data/TwitterJsonDeserializer.java
index 47506d0..29ff87d 100644
--- a/src/data/TwitterJsonDeserializer.java
+++ b/src/data/TwitterJsonDeserializer.java
@@ -1,6 +1,8 @@
 package data;
 
+import utils.TwitterDateAdapter;
 import com.google.gson.GsonBuilder;
+import org.joda.time.DateTime;
 
 /**
  * Deserializer for Twitter objects.
@@ -15,7 +17,8 @@ public class TwitterJsonDeserializer extends ValidatingJsonDeserializer {
     }
 
     private static GsonBuilder getBaseGsonBuilder() {
-        return new GsonBuilder();
+        return new GsonBuilder()
+                .registerTypeAdapter(DateTime.class, new TwitterDateAdapter());
     }
 
     public static GsonBuilder getGsonBuilder() {
diff --git a/src/data/User.java b/src/data/User.java
index 91b5e07..61de759 100644
--- a/src/data/User.java
+++ b/src/data/User.java
@@ -1,5 +1,7 @@
 package data;
 
+import org.joda.time.DateTime;
+
 /**
  * Represents the user object from the Twitter API as contained in a tweet.
  */
@@ -14,7 +16,7 @@ public class User {
     public long friends_count;
     public String location;
     public String screen_name;
-    public String created_at;
+    public DateTime created_at;
     @ValidatingJsonDeserializer.Nullable
     @ValidatingJsonDeserializer.Validator
     public Entities entities;