From 651a8f315b87ec08cfcd4cc0a4f2d1c909e467fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org>
Date: Fri, 10 Nov 2017 10:50:25 +0100
Subject: [PATCH] Strip query params from displayed link URLs

Looks to chaotic otherwise.
---
 .../plugins/announcements/static/js/announcements.js | 12 ++++++++++++
 .../announcements/templates/announcements.jinja2     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/plugins/announcements/static/js/announcements.js b/src/octoprint/plugins/announcements/static/js/announcements.js
index dd31096e..ee34b32c 100644
--- a/src/octoprint/plugins/announcements/static/js/announcements.js
+++ b/src/octoprint/plugins/announcements/static/js/announcements.js
@@ -54,6 +54,18 @@ $(function() {
             return !data.forced;
         };
 
+        self.cleanedLink = function(data) {
+            // Strips any query parameters from the link and returns it
+            var link = data.link;
+            if (!link) return link;
+
+            var queryPos = link.indexOf("?");
+            if (queryPos !== -1) {
+                link = link.substr(0, queryPos);
+            }
+            return link;
+        };
+
         self.markRead = function(channel, until) {
             if (!self.loginState.isAdmin()) return;
 
diff --git a/src/octoprint/plugins/announcements/templates/announcements.jinja2 b/src/octoprint/plugins/announcements/templates/announcements.jinja2
index 0560c8eb..524e8850 100644
--- a/src/octoprint/plugins/announcements/templates/announcements.jinja2
+++ b/src/octoprint/plugins/announcements/templates/announcements.jinja2
@@ -27,7 +27,7 @@
                             <h3><a data-bind="text: $data.title, attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a> <small data-bind="text: formatTimeAgo($data.published), attr: {title: formatDate($data.published)}"></small></h3>
                             <div class="content" data-bind="html: $data.summary"></div>
                             <div class="actions">
-                                <span class="articlelink"><small><a data-bind="text: $data.link, attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a></small></span>
+                                <span class="articlelink"><small><a data-bind="text: $root.cleanedLink($data), attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a></small></span>
                                 <span class="markread"><small><a href="javascript:void(0)" data-bind="click: function() { $root.markRead($parent.key, $data.published) }"><i class="fa fa-eye"></i> {{ _('Mark as last read') }}</a></small></span>
                             </div>
                         </article>