From 0077b072565178e5467f2d60624fa1bc24c1b94a Mon Sep 17 00:00:00 2001
From: Lucas Heuvelmann <l.heuvelmann@elearning-manufaktur.com>
Date: Sat, 24 Feb 2018 15:42:22 +0100
Subject: [PATCH 1/2] Add config option to hide the thumbnails

The thumbnails, e.g. of the Youtube spout bloat the layout of the single
items while collapsed. This allows the user to hide the thumbnails via a
config option.
---
 NEWS.md                         | 5 +++++
 defaults.ini                    | 1 +
 spouts/twitter/usertimeline.php | 2 +-
 templates/item.phtml            | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ca4785722c..58a8f13d54 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,9 @@
 # selfoss news
+## 2.19 – unreleased
+### New features
+- Thumbnails can be disabled ([#897](https://github.com/SSilence/selfoss/pull/897))
+
+
 ## 2.18 – 2018-03-05
 ### New features
 - Full-text RSS spout is now able to extract content from PDFs ([#897](https://github.com/SSilence/selfoss/pull/897))
diff --git a/defaults.ini b/defaults.ini
index 7dba4b8b7f..ea7a46a92b 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -40,3 +40,4 @@ env_prefix=selfoss_
 camo_domain=
 camo_key=
 scroll_to_article_header=1
+show_thumbnails=1
diff --git a/spouts/twitter/usertimeline.php b/spouts/twitter/usertimeline.php
index 3f905ec513..acb1ca3302 100644
--- a/spouts/twitter/usertimeline.php
+++ b/spouts/twitter/usertimeline.php
@@ -257,7 +257,7 @@ public function getContent() {
                 $item = $item->retweeted_status;
             }
 
-            if (isset($item->extended_entities) && isset($item->extended_entities->media) && count($item->extended_entities->media) > 1) {
+            if (isset($item->extended_entities) && isset($item->extended_entities->media) && count($item->extended_entities->media) > 0) {
                 foreach ($item->extended_entities->media as $media) {
                     if ($media->type === 'photo') {
                         $result .= '<p><a href="' . $media->media_url_https . ':large"><img src="' . $media->media_url_https . ':small" alt=""></a></p>' . PHP_EOL;
diff --git a/templates/item.phtml b/templates/item.phtml
index f5e310ef93..e36be917aa 100644
--- a/templates/item.phtml
+++ b/templates/item.phtml
@@ -57,7 +57,7 @@
     <a href="<?= $this->item['link']; ?>" class="entry-link"></a>
 
     <!-- thumbnail -->
-    <?php if (isset($this->item['thumbnail']) && strlen(trim($this->item['thumbnail'])) > 0) : ?>
+    <?php if (\F3::get('show_thumbnails') && isset($this->item['thumbnail']) && strlen(trim($this->item['thumbnail'])) > 0) : ?>
     <div class="entry-thumbnail">
         <a href="<?= \helpers\Anonymizer::anonymize($this->item['link']); ?>" target="_blank" rel="noopener noreferrer">
             <img src="<?= 'thumbnails/' . $this->item['thumbnail']; ?>" alt="<?= htmLawed(htmlspecialchars_decode($this->item['title']), ['deny_attribute' => '*', 'elements' => '-*']); ?>" />

From 1246ce749cdfc963bf6d5f5b8e8ba1e9c9c3289c Mon Sep 17 00:00:00 2001
From: Lucas Heuvelmann <l.heuvelmann@elearning-manufaktur.com>
Date: Sat, 24 Feb 2018 16:25:11 +0100
Subject: [PATCH 2/2] Add documentation for new config show_thumbnails

---
 _docs/website/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_docs/website/index.html b/_docs/website/index.html
index 6beb6bd949..37fdd6485d 100644
--- a/_docs/website/index.html
+++ b/_docs/website/index.html
@@ -330,6 +330,10 @@ <h2 id="configuration_params">Configuration</h2>
                         <td class="documentation-first-column">camo_key</td>
                         <td>Camo domain used to proxify images (optional). See <a href="https://github.com/atmos/camo">atmos/camo</a> for more details</td>
                     </tr>
+                    <tr>
+                        <td class="documentation-first-column">show_thumbnails</td>
+                        <td>If set to false, thumbnails are not shown in the collapsed view. Defaults to true.</td>
+                    </tr>
                 </table>
             </div>