From 513cdb2c479246bcfaa7e7874c9ae6a5d526ea96 Mon Sep 17 00:00:00 2001
From: Linus <jonw8s@yahoo.com>
Date: Sun, 18 Oct 2015 13:22:24 -0700
Subject: [PATCH 1/6] Allow VideoPost to return the actual video_url

The VideoPost class is missing the definition and return of the field video_url. This adds this field as a valid return for this class.
---
 src/main/java/com/tumblr/jumblr/types/VideoPost.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/tumblr/jumblr/types/VideoPost.java b/src/main/java/com/tumblr/jumblr/types/VideoPost.java
index f37186d..05677fe 100644
--- a/src/main/java/com/tumblr/jumblr/types/VideoPost.java
+++ b/src/main/java/com/tumblr/jumblr/types/VideoPost.java
@@ -12,7 +12,7 @@ public class VideoPost extends Post {
 
     private List<Video> player;
     private String caption;
-    private String embed, permalink_url;
+    private String embed, permalink_url, video_url;
     private File data;
     private String thumbnail_url;
     private int thumbnail_width;
@@ -25,6 +25,13 @@ public String getPermalinkUrl() {
         return permalink_url;
     }
 
+    /**
+     * Get the direct URL for this video
+     */
+    public String getVideoUrl() {
+        return video_url;
+    }
+
     /**
      * Get the thumbnail URL for the video
      * @return possibly null URL

From 188bb6b2a0d728ce9dcf73b5f47dddd2bfd33bd4 Mon Sep 17 00:00:00 2001
From: Linus <jonw8s@yahoo.com>
Date: Fri, 6 Nov 2015 15:10:16 -0800
Subject: [PATCH 2/6] Return number of Draft and Queued Posts for a blog

Tumblr returns the total number of Draft Posts and the total number Queued posts for a blog, but they were not accessible through Jumblr. This requires an app to step through all the Drafts and Queued posts to "count" them; very much a waste of resources. Since Tumblr returns these values already, these changes allow the application to access the counts without having to "count them".
---
 .../java/com/tumblr/jumblr/types/Blog.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/tumblr/jumblr/types/Blog.java b/src/main/java/com/tumblr/jumblr/types/Blog.java
index 43c28e5..a0b203f 100644
--- a/src/main/java/com/tumblr/jumblr/types/Blog.java
+++ b/src/main/java/com/tumblr/jumblr/types/Blog.java
@@ -12,7 +12,7 @@ public class Blog extends Resource {
     private String name;
     private String title;
     private String description;
-    private int posts, likes, followers;
+    private int posts, likes, followers, drafts, queue;
     private Long updated;
     private boolean ask, ask_anon;
 
@@ -56,6 +56,22 @@ public Integer getLikeCount() {
         return this.likes;
     }
 
+    /**
+     * Get the number of drafts for this blog
+     * @return int the number of drafts
+     */
+    public Integer getDraftCount() {
+        return this.drafts;
+    }
+
+    /**
+     * Get the number of Queued Posts for this blog
+     * @return int the number of Queued Posts
+     */
+    public Integer getQueuedCount() {
+        return this.queue;
+    }
+
     /**
      * Get the time of the most recent post (in seconds since epoch)
      * @return Long of time
@@ -211,4 +227,4 @@ public void setName(String name) {
         this.name = name;
     }
 
-}
\ No newline at end of file
+}

From ffd45a8c5027053dde72eaafb574e7114b9407a0 Mon Sep 17 00:00:00 2001
From: Linus <jonw8s@yahoo.com>
Date: Fri, 6 Nov 2015 15:43:37 -0800
Subject: [PATCH 3/6] Update Blog.java

---
 .../java/com/tumblr/jumblr/types/Blog.java     | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/main/java/com/tumblr/jumblr/types/Blog.java b/src/main/java/com/tumblr/jumblr/types/Blog.java
index a0b203f..ec04c95 100644
--- a/src/main/java/com/tumblr/jumblr/types/Blog.java
+++ b/src/main/java/com/tumblr/jumblr/types/Blog.java
@@ -12,7 +12,7 @@ public class Blog extends Resource {
     private String name;
     private String title;
     private String description;
-    private int posts, likes, followers, drafts, queue;
+    private int posts, likes, followers;
     private Long updated;
     private boolean ask, ask_anon;
 
@@ -56,22 +56,6 @@ public Integer getLikeCount() {
         return this.likes;
     }
 
-    /**
-     * Get the number of drafts for this blog
-     * @return int the number of drafts
-     */
-    public Integer getDraftCount() {
-        return this.drafts;
-    }
-
-    /**
-     * Get the number of Queued Posts for this blog
-     * @return int the number of Queued Posts
-     */
-    public Integer getQueuedCount() {
-        return this.queue;
-    }
-
     /**
      * Get the time of the most recent post (in seconds since epoch)
      * @return Long of time

From d473719f6ba0ec57488a2ea8e85387a8bd945d9b Mon Sep 17 00:00:00 2001
From: Linus <jonw8s@yahoo.com>
Date: Fri, 6 Nov 2015 15:50:17 -0800
Subject: [PATCH 4/6] Return number of Draft and Queued Posts for a blog

While the Tumblr interface returns the Total Number of Draft Posts and the total number of Queued Posts for a blog, the Jumblr interface did not include them. Thus calling applications were forced to "count" them directly instead; a resource wasting process. This change returns these two counts in the Blog class.
---
 .../java/com/tumblr/jumblr/types/Blog.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/tumblr/jumblr/types/Blog.java b/src/main/java/com/tumblr/jumblr/types/Blog.java
index 43c28e5..a0b203f 100644
--- a/src/main/java/com/tumblr/jumblr/types/Blog.java
+++ b/src/main/java/com/tumblr/jumblr/types/Blog.java
@@ -12,7 +12,7 @@ public class Blog extends Resource {
     private String name;
     private String title;
     private String description;
-    private int posts, likes, followers;
+    private int posts, likes, followers, drafts, queue;
     private Long updated;
     private boolean ask, ask_anon;
 
@@ -56,6 +56,22 @@ public Integer getLikeCount() {
         return this.likes;
     }
 
+    /**
+     * Get the number of drafts for this blog
+     * @return int the number of drafts
+     */
+    public Integer getDraftCount() {
+        return this.drafts;
+    }
+
+    /**
+     * Get the number of Queued Posts for this blog
+     * @return int the number of Queued Posts
+     */
+    public Integer getQueuedCount() {
+        return this.queue;
+    }
+
     /**
      * Get the time of the most recent post (in seconds since epoch)
      * @return Long of time
@@ -211,4 +227,4 @@ public void setName(String name) {
         this.name = name;
     }
 
-}
\ No newline at end of file
+}

From 659b0b6de25ee7f2fd346ca37fc02bb5fd6a1657 Mon Sep 17 00:00:00 2001
From: Linus <jonw8s@yahoo.com>
Date: Fri, 6 Nov 2015 16:00:51 -0800
Subject: [PATCH 5/6] Updated for Draft & Queued counts

Updated testReaders to look for new draft and queued counts
---
 src/test/java/com/tumblr/jumblr/types/BlogTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/tumblr/jumblr/types/BlogTest.java b/src/test/java/com/tumblr/jumblr/types/BlogTest.java
index 03b394a..35fcbce 100644
--- a/src/test/java/com/tumblr/jumblr/types/BlogTest.java
+++ b/src/test/java/com/tumblr/jumblr/types/BlogTest.java
@@ -21,7 +21,7 @@ public class BlogTest extends TypeTest {
     Blog blog;
 
     private String name = "name.com", title = "title", description = "desc";
-    private Integer posts = 10, likes = 11, followers = 10;
+    private Integer posts = 10, likes = 11, followers = 10, drafts = 9, queue = 8;
     private Long updated = 123456L;
     private Boolean ask = false, ask_anon = true;
 
@@ -37,6 +37,8 @@ public void setup() throws IOException {
         flat.put("ask", ask);
         flat.put("ask_anon", ask_anon);
         flat.put("followers", followers);
+        flat.put("drafts", drafts);
+        flat.put("queue", queue);
 
         Gson gson = new Gson();
         blog = gson.fromJson(flatSerialize(flat), Blog.class);
@@ -62,6 +64,8 @@ public void testReaders() {
         assertEquals(title, blog.getTitle());
         assertEquals(name, blog.getName());
         assertEquals(followers, blog.getFollowersCount());
+        assertEquals(drafts, blog.getDraftCount());
+        assertEquals(queue, blog.getQueuedCount());
     }
 
     @Test

From 3aefa52134d4fa4e814e3a8d72b629d81d8e45ca Mon Sep 17 00:00:00 2001
From: Linus <jonw8s@yahoo.com>
Date: Tue, 12 Jan 2016 17:38:52 -0800
Subject: [PATCH 6/6] Allows setting of the Source Title and Source URL

Added the setter for the source_title and source_url as well as adding them to the the detail() map.
This allows posters to set these values when posting new posts. While these values are not required,
Tumblr does encourage them when posting items that are not your own creations ;)
---
 .../java/com/tumblr/jumblr/types/Post.java     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/com/tumblr/jumblr/types/Post.java b/src/main/java/com/tumblr/jumblr/types/Post.java
index cb12b15..93894a3 100644
--- a/src/main/java/com/tumblr/jumblr/types/Post.java
+++ b/src/main/java/com/tumblr/jumblr/types/Post.java
@@ -375,6 +375,22 @@ public void setDate(Date date) {
         setDate(df.format(date));
     }
 
+    /**
+     * Set the source title for this post
+     * @param string source title
+     */
+    public void setSourceTitle(String title) {
+        this.source_title = title;
+    }
+
+    /**
+     * Set the source URL for this post
+     * @param string value of the source URL
+     */
+    public void setSourceUrl(String urlString) {
+        this.source_url = urlString;
+    }
+
     /**
      * Set the state for this post
      * @param state the state
@@ -430,6 +446,8 @@ protected Map<String, Object> detail() {
         map.put("slug", slug);
         map.put("date", date);
         map.put("type", getType().getValue());
+        map.put("source_url", source_url);
+        map.put("source_title", source_title);
         return map;
     }