From a49962b8de73833aedc033fcce1ec5ff1c3ca5b2 Mon Sep 17 00:00:00 2001
From: oemel09 <github@oemel09.de>
Date: Thu, 8 Apr 2021 16:48:29 +0200
Subject: [PATCH] Moves validation into template

---
 modules/default/newsfeed/newsfeed.js  |  2 +-
 modules/default/newsfeed/newsfeed.njk | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 3881e0d6..441984f4 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -135,7 +135,7 @@ Module.register("newsfeed", {
 			sourceTitle: item.sourceTitle,
 			publishDate: moment(new Date(item.pubdate)).fromNow(),
 			title: item.title,
-			description: this.isShowingDescription ? item.description : null
+			description: item.description
 		};
 	},
 
diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk
index dc9ccad6..3544cd79 100644
--- a/modules/default/newsfeed/newsfeed.njk
+++ b/modules/default/newsfeed/newsfeed.njk
@@ -13,13 +13,15 @@
         <div class="newsfeed-title bright medium light{{ ' no-wrap' if not config.wrapTitle }}">
             {{ title }}
         </div>
-        <div class="newsfeed-desc small light{{ ' no-wrap' if not config.wrapDescription }}">
-            {% if config.truncDescription %}
-                {{ description | truncate(config.lengthDescription) }}
-            {% else %}
-                {{ description }}
-            {% endif %}
-        </div>
+        {% if (config.showDescription) %}
+            <div class="newsfeed-desc small light{{ ' no-wrap' if not config.wrapDescription }}">
+                {% if config.truncDescription %}
+                    {{ description | truncate(config.lengthDescription) }}
+                {% else %}
+                    {{ description }}
+                {% endif %}
+            </div>
+        {% endif %}
     </div>
 {% elseif error %}
     <div class="small dimmed">