Cache some semi-static data

jsconfig.json

@@ -1,6 +1,7 @@
 {
 	"compilerOptions": {
 		"target": "esnext",
+		"module": "esnext",
 		"checkJs": true,
 		"moduleResolution": "node",
 		"allowSyntheticDefaultImports": true

src/site/api/feed.js

@@ -2,7 +2,7 @@ const constants = require("../../lib/constants")
 const {Feed} = require("feed")
 const {getFeedSetup} = require("../../lib/utils/feed")
 const {fetchUser, userRequestCache} = require("../../lib/collectors")
-const {render} = require("pinski/plugins")
+const {render, getStaticURL} = require("pinski/plugins")
 const {pugCache} = require("../passthrough")
 const {compile} = require("pug")
 
@@ -80,7 +80,8 @@ module.exports = [
 								"Retry-After": userRequestCache.getTtl("user/"+fill[0], 1000)
 							},
 							content: pugCache.get("pug/blocked.pug").web({
-								expiresMinutes: userRequestCache.getTtl("user/"+fill[0], 1000*60)
+								expiresMinutes: userRequestCache.getTtl("user/"+fill[0], 1000*60),
+								getStaticURL
 							})
 						}
 					} else if (error === constants.symbols.extractor_results.AGE_RESTRICTED) {

src/site/api/routes.js

@@ -1,7 +1,7 @@
 const constants = require("../../lib/constants")
 const switcher = require("../../lib/utils/torswitcher")
 const {fetchUser, getOrFetchShortcode, userRequestCache, history} = require("../../lib/collectors")
-const {render, redirect} = require("pinski/plugins")
+const {render, redirect, getStaticURL} = require("pinski/plugins")
 const {pugCache} = require("../passthrough")
 
 /** @param {import("../../lib/structures/TimelineEntry")} post */
@@ -86,7 +86,8 @@ module.exports = [
 							"Retry-After": userRequestCache.getTtl("user/"+fill[0], 1000)
 						},
 						content: pugCache.get("pug/blocked.pug").web({
-							expiresMinutes: userRequestCache.getTtl("user/"+fill[0], 1000*60)
+							expiresMinutes: userRequestCache.getTtl("user/"+fill[0], 1000*60),
+							getStaticURL
 						})
 					}
 				} else if (error === constants.symbols.extractor_results.AGE_RESTRICTED) {

src/site/pug/includes/head.pug

@@ -1,5 +1,5 @@
 meta(charset="utf-8")
-link(rel="stylesheet" type="text/css" href="/static/css/main.css")
+link(rel="stylesheet" type="text/css" href=getStaticURL("sass", "main.sass"))
 meta(name="viewport" content="width=device-width, initial-scale=1")
 link(rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png")
 link(rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png")

src/site/pug/post.pug

@@ -7,7 +7,7 @@ html
 	head
 		title= title
 		include includes/head
-		script(type="module" src="/static/js/post_overlay.js")
+		script(type="module" src=getStaticURL("html", "/static/js/post_overlay.js"))
 		meta(property="og:url" content=`${website_origin}/p/${post.data.shortcode}`)
 		meta(property="og:type" content="article")
 		- let firstEntry = post.children[0]

src/site/pug/user.pug

@@ -15,8 +15,8 @@ html
 		else
 			title= `@${user.data.username} | Bibliogram`
 		include includes/head
-		script(src="/static/js/pagination.js" type="module")
+		script(src=getStaticURL("html", "/static/js/pagination.js") type="module")
-		script(src="/static/js/post_overlay.js" type="module")
+		script(src=getStaticURL("html", "/static/js/post_overlay.js") type="module")
 		meta(property="og:url" content=`${constants.website_origin}/u/${user.data.username}`)
 		meta(property="og:type" content="profile")
 		meta(property="og:title" content=(user.data.full_name || user.data.username))

src/site/server.js

@@ -24,6 +24,7 @@ subdirs("pug", async (err, dirs) => {
 	pinski.addRoute("/static/css/main.css", "sass/main.sass", "sass")
 	pinski.addPugDir("pug", dirs)
 	pinski.addSassDir("sass")
+	pinski.addStaticHashTableDir("html/static/js")
 	pinski.muteLogsStartingWith("/imageproxy")
 	pinski.muteLogsStartingWith("/videoproxy")
 	pinski.muteLogsStartingWith("/static")