grimneko/bibliogram
1
0
Fork 0
Code Releases Activity

Basic error checking

Browse Source
This commit is contained in:
Cadence Fish
2020-01-27 19:03:28 +13:00
parent c2ac1b2259
commit 9f5fa84f9a
9 changed files with 156 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/site/api/feed.js
View File

@@ -3,14 +3,25 @@ const {fetchUser} = require("../../lib/collectors")
const {render} = require("pinski/plugins")
module.exports = [
{route: `/u/(${constants.external.username_regex})/rss.xml`, methods: ["GET"], code: async ({url, fill}) => {
const user = await fetchUser(fill[0])
const content = await user.timeline.fetchFeed()
const xml = content.xml()
return {
statusCode: 200,
contentType: "application/rss+xml", // see https://stackoverflow.com/questions/595616/what-is-the-correct-mime-type-to-use-for-an-rss-feed
content: xml
}
{route: `/u/(${constants.external.username_regex})/rss.xml`, methods: ["GET"], code: ({fill}) => {
return fetchUser(fill[0]).then(async user => {
const content = await user.timeline.fetchFeed()
const xml = content.xml()
return {
statusCode: 200,
contentType: "application/rss+xml", // see https://stackoverflow.com/questions/595616/what-is-the-correct-mime-type-to-use-for-an-rss-feed
content: xml
}
}).catch(error => {
if (error === constants.symbols.NOT_FOUND) {
return render(404, "pug/friendlyerror.pug", {
statusCode: 404,
title: "Not found",
message: "This user doesn't exist."
})
} else {
throw error
}
})
}}
]

81
src/site/api/routes.js
View File

@@ -4,39 +4,72 @@ const {render} = require("pinski/plugins")
module.exports = [
{
route: `/u/(${constants.external.username_regex})`, methods: ["GET"], code: async ({url, fill}) => {
route: `/u/(${constants.external.username_regex})`, methods: ["GET"], code: ({url, fill}) => {
const params = url.searchParams
const user = await fetchUser(fill[0])
const page = +params.get("page")
if (typeof page === "number" && !isNaN(page) && page >= 1) {
await user.timeline.fetchUpToPage(page - 1)
}
return render(200, "pug/user.pug", {url, user})
return fetchUser(fill[0]).then(async user => {
const page = +params.get("page")
if (typeof page === "number" && !isNaN(page) && page >= 1) {
await user.timeline.fetchUpToPage(page - 1)
}
return render(200, "pug/user.pug", {url, user})
}).catch(error => {
if (error === constants.symbols.NOT_FOUND) {
return render(404, "pug/friendlyerror.pug", {
statusCode: 404,
title: "Not found",
message: "This user doesn't exist."
})
} else {
throw error
}
})
}
},
{
route: `/fragment/user/(${constants.external.username_regex})/(\\d+)`, methods: ["GET"], code: async ({url, fill}) => {
const user = await fetchUser(fill[0])
const pageNumber = +fill[1]
const pageIndex = pageNumber - 1
await user.timeline.fetchUpToPage(pageIndex)
if (user.timeline.pages[pageIndex]) {
return render(200, "pug/fragments/timeline_page.pug", {page: user.timeline.pages[pageIndex], pageIndex, user, url})
} else {
return {
statusCode: 400,
contentType: "text/html",
content: "That page does not exist"
return fetchUser(fill[0]).then(async user => {
const pageNumber = +fill[1]
const pageIndex = pageNumber - 1
await user.timeline.fetchUpToPage(pageIndex)
if (user.timeline.pages[pageIndex]) {
return render(200, "pug/fragments/timeline_page.pug", {page: user.timeline.pages[pageIndex], pageIndex, user, url})
} else {
return {
statusCode: 400,
contentType: "text/html",
content: "That page does not exist"
}
}
}
}).catch(error => {
if (error === constants.symbols.NOT_FOUND) {
return render(404, "pug/friendlyerror.pug", {
statusCode: 404,
title: "Not found",
message: "This user doesn't exist."
})
} else {
throw error
}
})
}
},
{
route: `/p/(${constants.external.shortcode_regex})`, methods: ["GET"], code: async ({fill}) => {
const post = await getOrFetchShortcode(fill[0])
await post.fetchChildren()
await post.fetchExtendedOwnerP() // parallel await is okay since intermediate fetch result is cached
return render(200, "pug/post.pug", {post})
route: `/p/(${constants.external.shortcode_regex})`, methods: ["GET"], code: ({fill}) => {
return getOrFetchShortcode(fill[0]).then(async post => {
await post.fetchChildren()
await post.fetchExtendedOwnerP() // parallel await is okay since intermediate fetch result is cached
return render(200, "pug/post.pug", {post})
}).catch(error => {
if (error === constants.symbols.NOT_FOUND) {
return render(404, "pug/friendlyerror.pug", {
statusCode: 404,
title: "Not found",
message: "Somehow, you reached a post that doesn't exist."
})
} else {
throw error
}
})
}
}
]

1
src/site/html/static/js/pagination.js
View File

@@ -36,7 +36,6 @@ class NextPage extends FreezeWidth {
fetch(`/fragment/user/${this.element.getAttribute("data-username")}/${this.nextPageNumber}`).then(res => res.text()).then(text => {
q("#next-page-container").remove()
this.observer.disconnect()
q("#timeline").insertAdjacentHTML("beforeend", text)
addNextPageControl()
})

18
src/site/pug/friendlyerror.pug Normal file
View File

@@ -0,0 +1,18 @@
//- Needs title, message, statusCode
include includes/timeline_page.pug
include includes/next_page_button.pug
- const numberFormat = new Intl.NumberFormat().format
doctype html
html
head
meta(charset="utf-8")
meta(name="viewport" content="width=device-width, initial-scale=1")
title= `${title} | Bibliogram`
link(rel="stylesheet" type="text/css" href="/static/css/main.css")
body.error-page
h1.code= statusCode
p.message= message
a(href="javascript:history.back()").back ← Go back?

29
src/site/sass/main.sass
View File

@@ -242,3 +242,32 @@ body
&:not(:last-child)
margin-bottom: 10px
.error-page
min-height: 100vh
background: #191919
padding: 10px
text-align: center
display: flex
flex-direction: column
justify-content: center
align-items: center
.code, .message, .back-link
line-height: 1.2
margin: 0px
color: white
.code
font-size: 80px
color: #fff
margin-bottom: 25px
.message
font-size: 35px
color: #ccc
margin-bottom: 15vh
.back
color: #4a93d2
font-size: 25px