diff --git a/lib/convertv2.js b/lib/convertv2.js index cd69978..d6d6490 100644 --- a/lib/convertv2.js +++ b/lib/convertv2.js @@ -113,7 +113,6 @@ function metaForUser(user) { } } -// TODO make function async function itemsForFeed(opts,user,feed) { var items = feed.orderedItems; @@ -189,9 +188,10 @@ async function itemsForFeed(opts,user,feed) { hasCw:item.object.sensitive||false, cw:item.object.summary, content: item.object&&item.object.content?item.object.content:'',//TODO sanitize then render without entity escapes - atomHref:item.published?item.published.replace(/\W+/g,''):Math.random().toString().replace('.',''), + atomHref:item.published?item.published.replace(/\W+/g,''):Math.random().toString().replace('.',''),// used for IDs enclosures:enclosures, stringDate:item.published?getTimeDisplay(Date.parse(item.published)):'', + permalink:item.object.id?item.object.id:'#', author:{ uri:op.url,// link to author page avatar:op.icon&&op.icon.url?op.icon.url:'', @@ -202,7 +202,6 @@ async function itemsForFeed(opts,user,feed) { }) } -// TODO function getNextPage(opts,user,feed){ //based on feed.next // take feed.next, uriencode it, then take user url, then take options.mastofeedUrl diff --git a/lib/template.ejs b/lib/template.ejs index c49ce32..31f3b21 100644 --- a/lib/template.ejs +++ b/lib/template.ejs @@ -73,7 +73,9 @@
<% for (var i = 0; i < item.enclosures.length; i ++){ %> <% var e = item.enclosures[i] %> - <% if (e.type.indexOf('video') > -1){ %> + <% if (e.type.indexOf('audio') > -1) {%> +
<% } %> -
<%= item.stringDate %>
+
<%= item.stringDate %> <% }); %> <% if (nextPageLink) %> diff --git a/static/auto.css b/static/auto.css index 7d44ef3..3ca8760 100644 --- a/static/auto.css +++ b/static/auto.css @@ -65,11 +65,17 @@ a * { font-size: 0.9rem; } .date { - margin: 1rem 0 0 0; } + margin: 1rem 0 0 0; + text-decoration: none; } + +.date:hover { + text-decoration: underline; } + +.item-title { + margin-bottom: 0.7rem; } .author { - display: flex; - margin: 1rem 0; } + display: flex; } .author-info { margin: 0 1rem; @@ -220,10 +226,14 @@ body { color: #9baec8; font-size: 0.9rem; } .date { - margin: 1rem 0 0 0; } + margin: 1rem 0 0 0; + text-decoration: none; } + .date:hover { + text-decoration: underline; } + .item-title { + margin-bottom: 0.7rem; } .author { - display: flex; - margin: 1rem 0; } + display: flex; } .author-info { margin: 0 1rem; display: flex; diff --git a/static/dark.css b/static/dark.css index f70a6ca..fae4104 100644 --- a/static/dark.css +++ b/static/dark.css @@ -65,11 +65,17 @@ a * { font-size: 0.9rem; } .date { - margin: 1rem 0 0 0; } + margin: 1rem 0 0 0; + text-decoration: none; } + +.date:hover { + text-decoration: underline; } + +.item-title { + margin-bottom: 0.7rem; } .author { - display: flex; - margin: 1rem 0; } + display: flex; } .author-info { margin: 0 1rem; diff --git a/static/light.css b/static/light.css index a30a36a..854d6f1 100644 --- a/static/light.css +++ b/static/light.css @@ -65,11 +65,17 @@ a * { font-size: 0.9rem; } .date { - margin: 1rem 0 0 0; } + margin: 1rem 0 0 0; + text-decoration: none; } + +.date:hover { + text-decoration: underline; } + +.item-title { + margin-bottom: 0.7rem; } .author { - display: flex; - margin: 1rem 0; } + display: flex; } .author-info { margin: 0 1rem; diff --git a/stylesrc/base.scss b/stylesrc/base.scss index a90af1f..d9ffa7f 100644 --- a/stylesrc/base.scss +++ b/stylesrc/base.scss @@ -88,11 +88,17 @@ a * { } .date{ margin: 1rem 0 0 0; + text-decoration: none; +} +.date:hover{ + text-decoration: underline; +} +.item-title{ + margin-bottom:0.7rem; } .author { display: flex; - margin: 1rem 0; } .author-info {