From e6ead57b6cc6d03dd21fa1cd8fecf3985318718f Mon Sep 17 00:00:00 2001
From: fenwick67 <dfharwell@gmail.com>
Date: Fri, 2 Aug 2019 11:57:13 -0400
Subject: [PATCH] Make error pages prettier

---
 index.js           |  7 ++++---
 lib/convertv2.js   |  2 +-
 lib/errorPage.js   | 33 +++++++++++++++++++++++++++++++++
 lib/template.ejs   |  4 ++--
 static/dark.css    |  2 ++
 static/light.css   |  2 ++
 stylesrc/base.scss |  3 +++
 7 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 lib/errorPage.js

diff --git a/index.js b/index.js
index fd53e03..bc9c6ef 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,7 @@ var convertv2 = require('./lib/convertv2');
 var serveStatic = require('serve-static');
 var request = require('request');
 var cors = require('cors');
+var errorPage = require('./lib/errorPage');
 var log = console.log;
 
 var app = Express();
@@ -42,7 +43,7 @@ app.get('/api/feed',cors(),function(req,res){
 	var feedUrl = req.query.url;
 	if (!feedUrl){
 		res.status(400);
-		res.send('You need to specify a feed URL');
+		res.send(errorPage(400,'You need to specify a feed URL'));
 		return;
 	}
 
@@ -69,7 +70,7 @@ app.get('/apiv2/feed',cors(),function(req,res){
 	var userUrl = req.query.userurl;
 	if (!userUrl){
 		res.status(400);
-		res.send('You need to specify a user URL');
+		res.send(errorPage(400,'You need to specify a user URL'));
 		return;
 	}
 
@@ -117,7 +118,7 @@ app.get('/apiv2/feed',cors(),function(req,res){
 		res.send(data);
 	}).catch((er)=>{
 		res.status(500);
-		res.send('Error fetching or parsing your feed.');
+		res.send(errorPage(500));
 		// TODO log the error
 		console.error(er,er.stack);
 	})
diff --git a/lib/convertv2.js b/lib/convertv2.js
index 4e1ed1b..8ade232 100644
--- a/lib/convertv2.js
+++ b/lib/convertv2.js
@@ -102,7 +102,7 @@ function metaForUser(user) {
     return {
         avatar: user.icon && user.icon.url?user.icon.url:null,
         headerImage:user.image && user.image.url?user.image.url:null,
-        title: user.preferredUsername||null,
+        title: user.name||user.preferredUsername||null,
         description: user.summary||null
     }
 }
diff --git a/lib/errorPage.js b/lib/errorPage.js
new file mode 100644
index 0000000..3e6d0cb
--- /dev/null
+++ b/lib/errorPage.js
@@ -0,0 +1,33 @@
+var ejs = require('ejs');
+var fs = require('fs');
+var template = ejs.compile(fs.readFileSync('./lib/template.ejs', 'utf8'));
+
+
+module.exports = function(code,message){
+
+
+    var msg;
+
+    if (code == 500 && !message){
+        msg = '<p>Sorry, we are having trouble fetching posts for this user. Please try again later.</p><br><p>If the issue persists, <a href="https://github.com/fenwick67/mastofeed/issues">please open an issue on GitHub</a> or message fenwick67@octodon.social</p>'
+    }else{
+        msg = message;
+    }
+
+
+    var options = {
+        opts:{
+            header:true
+        },
+        meta:{
+            title:code.toString(),
+            description:msg,
+            link:'#'
+        },
+        items:[],
+        nextPageLink:null,
+        isIndex:true
+    }
+
+    return template(options);
+}
\ No newline at end of file
diff --git a/lib/template.ejs b/lib/template.ejs
index dd20448..a86b163 100644
--- a/lib/template.ejs
+++ b/lib/template.ejs
@@ -28,10 +28,10 @@
             <% } %>
           </a>
           <div class="description header-right">
-            <a target="_top" href="<%= meta.link %>">
+            <a class="header-title" target="_top" href="<%= meta.link %>">
               <%= meta.title %>
             </a>
-            <br>
+            <br><br>
             <%- meta.description %>
           </div>
         </div>
diff --git a/static/dark.css b/static/dark.css
index 81b4579..2ddd047 100644
--- a/static/dark.css
+++ b/static/dark.css
@@ -41,6 +41,8 @@ a * {
     font-size: 0.9rem;
     padding: 0.9rem;
     background: rgba(40, 44, 55, 0.85); }
+  .header .header-title {
+    font-size: 1.3rem; }
 
 .item {
   padding: 1rem;
diff --git a/static/light.css b/static/light.css
index 32ff7a8..8cd6669 100644
--- a/static/light.css
+++ b/static/light.css
@@ -41,6 +41,8 @@ a * {
     font-size: 0.9rem;
     padding: 0.9rem;
     background: rgba(255, 255, 255, 0.85); }
+  .header .header-title {
+    font-size: 1.3rem; }
 
 .item {
   padding: 1rem;
diff --git a/stylesrc/base.scss b/stylesrc/base.scss
index b0ec4dc..b823b43 100644
--- a/stylesrc/base.scss
+++ b/stylesrc/base.scss
@@ -57,6 +57,9 @@ a * {
     padding:0.9rem;
     background:transparentize($bg,0.15);
   }
+  .header-title{
+    font-size:1.3rem;
+  }
 }
 
 .item {