2 files changed, 39 insertions, 9 deletions

diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html
index 1b7ab8e9..d959d6be 100644
--- a/tpl/dailyrss.html
+++ b/tpl/dailyrss.html
@@ -1,8 +1,16 @@
-{loop="links"}
-        <h3><a href="{$value.url}">{$value.title}</a></h3>
-        <small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
-        {$value.url}</small><br>
-        {if="$value.thumbnail"}{$value.thumbnail}{/if}<br>
-        {if="$value.description"}{$value.formatedDescription}{/if}
-        <br><br><hr>
-{/loop}
\ No newline at end of file
+<item>
+    <title>{$title} - {function="strftime('%A %e %B %Y', $daydate)"}</title>
+    <guid>{$absurl}</guid>
+    <link>{$absurl}</link>
+    <pubDate>{$rfc822date}</pubDate>
+    <description><![CDATA[
+        {loop="links"}
+                <h3><a href="{$value.url}">{$value.title}</a></h3>
+                <small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
+                {$value.url}</small><br>
+                {if="$value.thumbnail"}{$value.thumbnail}{/if}<br>
+                {if="$value.description"}{$value.formatedDescription}{/if}
+                <br><br><hr>
+        {/loop}
+    ]]></description>
+</item>
\ No newline at end of file
diff --git a/tpl/editlink.html b/tpl/editlink.html
index a32748ab..3733ca21 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -42,7 +42,7 @@
 {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"}
 <script>
     $ = Awesomplete.$;
-    new Awesomplete($('input[data-multiple]'), {
+    awesomplete = new Awesomplete($('input[data-multiple]'), {
         filter: function(text, input) {
             return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]);
         },
@@ -52,6 +52,28 @@
         },
         minChars: 1
     });
+
+    /**
+     * Remove already selected items from autocompletion list.
+     * HTML list is never updated, so removing a tag will add it back to awesomplete.
+     *
+     * FIXME: This a workaround waiting for awesomplete to handle this.
+     *  https://github.com/LeaVerou/awesomplete/issues/16749
+     */
+    var input = document.querySelector('#lf_tags');
+    input.addEventListener('input', function()
+    {
+        proposedTags = input.getAttribute('data-list').replace(/,/g, '').split(' ');
+        reg = /(\w+) /g;
+        while((match = reg.exec(input.value)) !== null) {
+            id = proposedTags.indexOf(match[1]);
+            if(id != -1 ) {
+                proposedTags.splice(id, 1);
+            }
+        }
+
+        awesomplete.list = proposedTags;
+    });
 </script>
 {/if}
 </body>