From 28f9539551dc8c26b411ef0f182f023d3a2b005c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 26 Dec 2018 14:35:59 +0100
Subject: [PATCH] [tumblr] change default values for post types and inline
 media

---
 docs/configuration.rst         | 4 ++--
 docs/gallery-dl.conf           | 4 ++--
 gallery_dl/extractor/tumblr.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 1c5a620c..0ec15634 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -725,7 +725,7 @@ extractor.tumblr.inline
 -----------------------
 =========== =====
 Type        ``bool``
-Default     ``false``
+Default     ``true``
 Description Search posts for inline images and videos.
 =========== =====
 
@@ -746,7 +746,7 @@ extractor.tumblr.posts
 ----------------------
 =========== =====
 Type        ``string`` or ``list`` of ``strings``
-Default     ``"photo"``
+Default     ``"all"``
 Example     ``"video,audio,link"`` or ``["video", "audio", "link"]``
 Description A (comma-separated) list of post types to extract images, etc. from.
 
diff --git a/docs/gallery-dl.conf b/docs/gallery-dl.conf
index 127e20bb..02f25a64 100644
--- a/docs/gallery-dl.conf
+++ b/docs/gallery-dl.conf
@@ -105,8 +105,8 @@
         {
             "avatar": false,
             "external": false,
-            "inline": false,
-            "posts": "photo",
+            "inline": true,
+            "posts": "all",
             "reblogs": true
         },
         "twitter":
diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py
index 97090d35..e11c8a09 100644
--- a/gallery_dl/extractor/tumblr.py
+++ b/gallery_dl/extractor/tumblr.py
@@ -53,7 +53,7 @@ class TumblrExtractor(Extractor):
 
         self.types = self._setup_posttypes()
         self.avatar = self.config("avatar", False)
-        self.inline = self.config("inline", False)
+        self.inline = self.config("inline", True)
         self.reblogs = self.config("reblogs", True)
         self.external = self.config("external", False)
 
@@ -131,7 +131,7 @@ class TumblrExtractor(Extractor):
         """Return an iterable containing all relevant posts"""
 
     def _setup_posttypes(self):
-        types = self.config("posts", ("photo",))
+        types = self.config("posts", "all")
 
         if types == "all":
             return POST_TYPES