experiments
/
cloudtube_fork
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into rei/hacky_embed

This commit is contained in:
Olivier 'reivilibre' 2022-09-28 18:33:10 +01:00
parent 6d1f91b2fa 61c8e205d8
commit facb959cb8
54 changed files with 897 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/channels.js
View File

@ -1,18 +1,28 @@
const {render} = require("pinski/plugins") const {render} = require("pinski/plugins")
const constants = require("../utils/constants")
const {fetchChannel} = require("../utils/youtube") const {fetchChannel} = require("../utils/youtube")
const {getUser} = require("../utils/getuser") const {getUser} = require("../utils/getuser")
const converters = require("../utils/converters") const converters = require("../utils/converters")
module.exports = [ module.exports = [
{ {
route: `/channel/(${constants.regex.ucid})`, methods: ["GET"], code: async ({req, fill, url}) => { route: `/(c|channel|user)/(.+)`, methods: ["GET"], code: async ({req, fill, url}) => {
const id = fill[0] const path = fill[0]
const id = fill[1]
const user = getUser(req) const user = getUser(req)
const settings = user.getSettingsOrDefaults() const settings = user.getSettingsOrDefaults()
const data = await fetchChannel(id, settings.instance) const data = await fetchChannel(path, id, settings.instance)
const subscribed = user.isSubscribed(id)
const instanceOrigin = settings.instance const instanceOrigin = settings.instance
// problem with the channel? fetchChannel has collected the necessary information for us.
// we can render a skeleton page, display the message, and provide the option to unsubscribe.
if (data.error) {
const statusCode = data.missing ? 410 : 500
const subscribed = user.isSubscribed(id)
return render(statusCode, "pug/channel-error.pug", {settings, data, subscribed, instanceOrigin})
}
// everything is fine
// normalise info, apply watched status // normalise info, apply watched status
if (!data.second__subCountText && data.subCount) { if (!data.second__subCountText && data.subCount) {
data.second__subCountText = converters.subscriberCountToText(data.subCount) data.second__subCountText = converters.subscriberCountToText(data.subCount)
@ -24,7 +34,8 @@ module.exports = [
video.watched = watchedVideos.includes(video.videoId) video.watched = watchedVideos.includes(video.videoId)
}) })
} }
return render(200, "pug/channel.pug", {url, data, subscribed, instanceOrigin}) const subscribed = user.isSubscribed(data.authorId)
return render(200, "pug/channel.pug", {settings, data, subscribed, instanceOrigin})
} }
} }
] ]

15
api/filters.js
View File

@ -9,8 +9,7 @@ const {Matcher, PatternCompileError} = require("../utils/matcher")
const filterMaxLength = 160 const filterMaxLength = 160
const regexpEnabledText = constants.server_setup.allow_regexp_filters ? "" : "not" const regexpEnabledText = constants.server_setup.allow_regexp_filters ? "" : "not"
function getCategories(req) { function getCategories(user) {
const user = getUser(req)
const filters = user.getFilters() const filters = user.getFilters()
// Sort filters into categories for display. Titles are already sorted. // Sort filters into categories for display. Titles are already sorted.
@ -39,7 +38,9 @@ function getCategories(req) {
module.exports = [ module.exports = [
{ {
route: "/filters", methods: ["GET"], code: async ({req, url}) => { route: "/filters", methods: ["GET"], code: async ({req, url}) => {
const categories = getCategories(req) const user = getUser(req)
const categories = getCategories(user)
const settings = user.getSettingsOrDefaults()
let referrer = url.searchParams.get("referrer") || null let referrer = url.searchParams.get("referrer") || null
let type = null let type = null
@ -54,7 +55,7 @@ module.exports = [
label = url.searchParams.get("label") label = url.searchParams.get("label")
} }
return render(200, "pug/filters.pug", {categories, type, contents, label, referrer, filterMaxLength, regexpEnabledText}) return render(200, "pug/filters.pug", {settings, categories, type, contents, label, referrer, filterMaxLength, regexpEnabledText})
} }
}, },
{ {
@ -100,8 +101,10 @@ module.exports = [
return true return true
}, state => { }, state => {
const {type, contents, label, compileError} = state const {type, contents, label, compileError} = state
const categories = getCategories(req) const user = getUser(req)
return render(400, "pug/filters.pug", {categories, type, contents, label, compileError, filterMaxLength, regexpEnabledText}) const categories = getCategories(user)
const settings = user.getSettingsOrDefaults()
return render(400, "pug/filters.pug", {settings, categories, type, contents, label, compileError, filterMaxLength, regexpEnabledText})
}) })
.last(state => { .last(state => {
const {type, contents, label} = state const {type, contents, label} = state

4
api/formapi.js
View File

@ -23,10 +23,9 @@ module.exports = [
const token = user.token const token = user.token
if (add) { if (add) {
await fetchChannel(ucid, settings.instance) await fetchChannel("channel", ucid, settings.instance)
db.prepare( db.prepare(
"INSERT INTO Subscriptions (token, ucid) VALUES (?, ?)" "INSERT INTO Subscriptions (token, ucid) VALUES (?, ?)"
+ " ON CONFLICT (token, ucid) DO UPDATE SET channel_missing = 0"
).run(token, ucid) ).run(token, ucid)
} else { } else {
db.prepare("DELETE FROM Subscriptions WHERE token = ? AND ucid = ?").run(token, ucid) db.prepare("DELETE FROM Subscriptions WHERE token = ? AND ucid = ?").run(token, ucid)
@ -41,7 +40,6 @@ module.exports = [
}), }),
content: "Success, redirecting..." content: "Success, redirecting..."
} }
return redirect(params.get("referrer"), 303)
} else { } else {
return { return {
statusCode: 200, statusCode: 200,

25
api/pages.js
View File

@ -1,16 +1,35 @@
const {render} = require("pinski/plugins") const {render} = require("pinski/plugins")
const {getUser} = require("../utils/getuser")
module.exports = [ module.exports = [
{ {
route: "/", methods: ["GET"], code: async ({req}) => { route: "/", methods: ["GET"], code: async ({req}) => {
const userAgent = req.headers["user-agent"] || "" const userAgent = req.headers["user-agent"] || ""
const mobile = userAgent.toLowerCase().includes("mobile") const mobile = userAgent.toLowerCase().includes("mobile")
return render(200, "pug/home.pug", {mobile}) const user = getUser(req)
const settings = user.getSettingsOrDefaults()
return render(200, "pug/home.pug", {settings, mobile})
} }
}, },
{ {
route: "/js-licenses", methods: ["GET"], code: async () => { route: "/(?:js-)?licenses", methods: ["GET"], code: async ({req}) => {
return render(200, "pug/js-licenses.pug") const user = getUser(req)
const settings = user.getSettingsOrDefaults()
return render(200, "pug/licenses.pug", {settings})
}
},
{
route: "/cant-think", methods: ["GET"], code: async ({req}) => {
const user = getUser(req)
const settings = user.getSettingsOrDefaults()
return render(200, "pug/cant-think.pug", {settings})
}
},
{
route: "/privacy", methods: ["GET"], code: async ({req}) => {
const user = getUser(req)
const settings = user.getSettingsOrDefaults()
return render(200, "pug/privacy.pug", {settings})
} }
} }
] ]

2
api/search.js
View File

@ -26,7 +26,7 @@ module.exports = [
const filters = user.getFilters() const filters = user.getFilters()
results = converters.applyVideoFilters(results, filters).videos results = converters.applyVideoFilters(results, filters).videos
return render(200, "pug/search.pug", {url, query, results, instanceOrigin}) return render(200, "pug/search.pug", {settings, url, query, results, instanceOrigin})
} }
} }
] ]

11
api/settings.js
View File

@ -7,6 +7,17 @@ const validate = require("../utils/validate")
const V = validate.V const V = validate.V
module.exports = [ module.exports = [
{
route: "/api/settings", methods: ["GET"], code: async ({req}) => {
const user = getUser(req)
const settings = user.getSettingsOrDefaults()
return {
statusCode: 200,
contentType: "application/json",
content: settings
}
}
},
{ {
route: "/settings", methods: ["GET"], code: async ({req}) => { route: "/settings", methods: ["GET"], code: async ({req}) => {
const user = getUser(req) const user = getUser(req)

4
api/subscriptions.js
View File

@ -11,12 +11,14 @@ module.exports = [
let hasSubscriptions = false let hasSubscriptions = false
let videos = [] let videos = []
let channels = [] let channels = []
let missingChannelCount = 0
let refreshed = null let refreshed = null
if (user.token) { if (user.token) {
// trigger a background refresh, needed if they came back from being inactive // trigger a background refresh, needed if they came back from being inactive
refresher.skipWaiting() refresher.skipWaiting()
// get channels // get channels
channels = db.prepare(`SELECT Channels.* FROM Channels INNER JOIN Subscriptions ON Channels.ucid = Subscriptions.ucid WHERE token = ? ORDER BY name`).all(user.token) channels = db.prepare(`SELECT Channels.* FROM Channels INNER JOIN Subscriptions ON Channels.ucid = Subscriptions.ucid WHERE token = ? ORDER BY name`).all(user.token)
missingChannelCount = channels.reduce((a, c) => a + c.missing, 0)
// get refreshed status // get refreshed status
refreshed = db.prepare(`SELECT min(refreshed) as min, max(refreshed) as max, count(refreshed) as count FROM Channels INNER JOIN Subscriptions ON Channels.ucid = Subscriptions.ucid WHERE token = ?`).get(user.token) refreshed = db.prepare(`SELECT min(refreshed) as min, max(refreshed) as max, count(refreshed) as count FROM Channels INNER JOIN Subscriptions ON Channels.ucid = Subscriptions.ucid WHERE token = ?`).get(user.token)
// get watched videos // get watched videos
@ -37,7 +39,7 @@ module.exports = [
} }
const settings = user.getSettingsOrDefaults() const settings = user.getSettingsOrDefaults()
const instanceOrigin = settings.instance const instanceOrigin = settings.instance
return render(200, "pug/subscriptions.pug", {url, settings, hasSubscriptions, videos, channels, refreshed, timeToPastText, instanceOrigin}) return render(200, "pug/subscriptions.pug", {url, settings, hasSubscriptions, videos, channels, missingChannelCount, refreshed, timeToPastText, instanceOrigin})
} }
} }
] ]

8
api/video.js
View File

@ -111,7 +111,7 @@ module.exports = [
// Check if playback is allowed // Check if playback is allowed
const videoTakedownInfo = db.prepare("SELECT id, org, url FROM TakedownVideos WHERE id = ?").get(id) const videoTakedownInfo = db.prepare("SELECT id, org, url FROM TakedownVideos WHERE id = ?").get(id)
if (videoTakedownInfo) { if (videoTakedownInfo) {
return render(451, "pug/takedown-video.pug", videoTakedownInfo) return render(451, "pug/takedown-video.pug", Object.assign({settings}, videoTakedownInfo))
} }
// Media fragment // Media fragment
@ -129,7 +129,7 @@ module.exports = [
// Work out how to fetch the video // Work out how to fetch the video
if (req.method === "GET") { if (req.method === "GET") {
if (settings.local) { // skip to the local fetching page, which will then POST video data in a moment if (settings.local) { // skip to the local fetching page, which will then POST video data in a moment
return render(200, "pug/local-video.pug", {id}) return render(200, "pug/local-video.pug", {settings, id})
} }
var instanceOrigin = settings.instance var instanceOrigin = settings.instance
var outURL = `${instanceOrigin}/api/v1/videos/${id}` var outURL = `${instanceOrigin}/api/v1/videos/${id}`
@ -153,7 +153,7 @@ module.exports = [
// automatically add the entry to the videos list, so it won't be fetched again // automatically add the entry to the videos list, so it won't be fetched again
const args = {id, ...channelTakedownInfo} const args = {id, ...channelTakedownInfo}
db.prepare("INSERT INTO TakedownVideos (id, org, url) VALUES (@id, @org, @url)").run(args) db.prepare("INSERT INTO TakedownVideos (id, org, url) VALUES (@id, @org, @url)").run(args)
return render(451, "pug/takedown-video.pug", channelTakedownInfo) return render(451, "pug/takedown-video.pug", Object.assign({settings}, channelTakedownInfo))
} }
// process stream list ordering // process stream list ordering
@ -225,7 +225,7 @@ module.exports = [
// Create appropriate formatted message // Create appropriate formatted message
const message = render(0, `pug/errors/${errorType}.pug`, locals).content const message = render(0, `pug/errors/${errorType}.pug`, locals).content
return render(500, "pug/video.pug", {video: {videoId: id}, error: true, message}) return render(500, "pug/video.pug", {video: {videoId: id}, error: true, message, settings})
} }
} }
} }

30
background/feed-update.js
View File

@ -15,8 +15,8 @@ const prepared = {
channel_refreshed_update: db.prepare( channel_refreshed_update: db.prepare(
"UPDATE Channels SET refreshed = ? WHERE ucid = ?" "UPDATE Channels SET refreshed = ? WHERE ucid = ?"
), ),
unsubscribe_all_from_channel: db.prepare( channel_mark_as_missing: db.prepare(
"UPDATE Subscriptions SET channel_missing = 1 WHERE ucid = ?" "UPDATE Channels SET missing = 1, missing_reason = ? WHERE ucid = ?"
) )
} }
@ -35,7 +35,7 @@ class RefreshQueue {
// get the next set of scheduled channels to refresh // get the next set of scheduled channels to refresh
const afterTime = Date.now() - constants.caching.seen_token_subscriptions_eligible const afterTime = Date.now() - constants.caching.seen_token_subscriptions_eligible
const channels = db.prepare( const channels = db.prepare(
"SELECT DISTINCT Subscriptions.ucid FROM SeenTokens INNER JOIN Subscriptions ON SeenTokens.token = Subscriptions.token AND SeenTokens.seen > ? WHERE Subscriptions.channel_missing = 0 ORDER BY SeenTokens.seen DESC" "SELECT DISTINCT Subscriptions.ucid FROM SeenTokens INNER JOIN Subscriptions ON SeenTokens.token = Subscriptions.token INNER JOIN Channels ON Channels.ucid = Subscriptions.ucid WHERE Channels.missing = 0 AND SeenTokens.seen > ? ORDER BY SeenTokens.seen DESC"
).pluck().all(afterTime) ).pluck().all(afterTime)
this.addLast(channels) this.addLast(channels)
this.lastLoadTime = Date.now() this.lastLoadTime = Date.now()
@ -72,11 +72,12 @@ class Refresher {
this.refreshQueue = new RefreshQueue() this.refreshQueue = new RefreshQueue()
this.state = this.sym.ACTIVE this.state = this.sym.ACTIVE
this.waitingTimeout = null this.waitingTimeout = null
this.lastFakeNotFoundTime = 0
this.next() this.next()
} }
refreshChannel(ucid) { refreshChannel(ucid) {
return fetch(`${constants.server_setup.local_instance_origin}/api/v1/channels/${ucid}/latest`).then(res => res.json()).then(root => { return fetch(`${constants.server_setup.local_instance_origin}/api/v1/channels/${ucid}/latest`).then(res => res.json()).then(/** @param {any} root */ root => {
if (Array.isArray(root)) { if (Array.isArray(root)) {
root.forEach(video => { root.forEach(video => {
// organise // organise
@ -89,11 +90,24 @@ class Refresher {
prepared.channel_refreshed_update.run(Date.now(), ucid) prepared.channel_refreshed_update.run(Date.now(), ucid)
// console.log(`updated ${root.length} videos for channel ${ucid}`) // console.log(`updated ${root.length} videos for channel ${ucid}`)
} else if (root.identifier === "PUBLISHED_DATES_NOT_PROVIDED") { } else if (root.identifier === "PUBLISHED_DATES_NOT_PROVIDED") {
return [] // nothing we can do. skip this iteration. // nothing we can do. skip this iteration.
} else if (root.identifier === "NOT_FOUND") { } else if (root.identifier === "NOT_FOUND") {
// the channel does not exist. we should unsubscribe all users so we don't try again. // YouTube sometimes returns not found for absolutely no reason.
// console.log(`channel ${ucid} does not exist, unsubscribing all users`) // There is no way to distinguish between a fake missing channel and a real missing channel without requesting the real endpoint.
prepared.unsubscribe_all_from_channel.run(ucid) // These fake missing channels often happen in bursts, which is why there is a cooldown.
const timeSinceLastFakeNotFound = Date.now() - this.lastFakeNotFoundTime
if (timeSinceLastFakeNotFound >= constants.caching.subscriptions_refesh_fake_not_found_cooldown) {
// We'll request the real endpoint to verify.
fetch(`${constants.server_setup.local_instance_origin}/api/v1/channels/${ucid}`).then(res => res.json()).then(/** @param {any} root */ root => {
if (root.error && (root.identifier === "NOT_FOUND" || root.identifier === "ACCOUNT_TERMINATED")) {
// The channel is really gone, and we should mark it as missing for everyone.
prepared.channel_mark_as_missing.run(root.error, ucid)
} else {
// The channel is not actually gone and YouTube is trolling us.
this.lastFakeNotFoundTime = Date.now()
}
})
} // else youtube is currently trolling us, skip this until later.
} else { } else {
throw new Error(root.error) throw new Error(root.error)
} }

0
html/static/images/arrow-down-wide.svg → html/static/images/arrow-down-wide-dark.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 225 B

1
html/static/images/arrow-down-wide-light.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="8" viewBox="0 0 5.821 2.117"><path d="M1.269.53l.767.793h.161L2.964.53h.211v.265L2.117 1.852 1.058.794V.529z" fill="#202020" paint-order="markers stroke fill"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 226 B

2
html/static/images/settings.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 6.615 6.615"><path d="M2.64 0s-.03.94-.424 1.215C1.823 1.49.885.894.885.894L.112 2.232.109 2.23l.003.002c.01.006.797.499.838.974.042.478-.944.992-.944.992l.77 1.34s.83-.442 1.265-.24c.435.204.387 1.314.387 1.314l1.546.003s.032-.94.425-1.215c.393-.275 1.331.321 1.331.321l.775-1.338s-.798-.496-.84-.974c-.041-.478.944-.993.944-.993l-.77-1.34s-.83.443-1.265.24C4.14 1.113 4.187.002 4.187.002zm.688 2.25a1.106 1.106 0 110 2.211 1.106 1.106 0 010-2.21z" fill="#c4c4c4" paint-order="fill markers stroke"/></svg> <svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 6.615 6.615"><title>Settings</title><path d="M2.64 0s-.03.94-.424 1.215C1.823 1.49.885.894.885.894L.112 2.232.109 2.23l.003.002c.01.006.797.499.838.974.042.478-.944.992-.944.992l.77 1.34s.83-.442 1.265-.24c.435.204.387 1.314.387 1.314l1.546.003s.032-.94.425-1.215c.393-.275 1.331.321 1.331.321l.775-1.338s-.798-.496-.84-.974c-.041-.478.944-.993.944-.993l-.77-1.34s-.83.443-1.265.24C4.14 1.113 4.187.002 4.187.002zm.688 2.25a1.106 1.106 0 110 2.211 1.106 1.106 0 010-2.21z" paint-order="fill markers stroke"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 611 B

2
html/static/images/subscriptions.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="25" viewBox="0 0 7.937 6.615"><path d="M2.373 0h3.191a.52.52 0 01.521.521H1.852A.52.52 0 012.373 0zm-.91.794h5.011c.371 0 .67.298.67.67v.123l-6.35-.016v-.108c0-.37.298-.67.67-.67zm-.405 1.058C.472 1.852 0 2.184 0 2.77v2.868c0 .586.472.977 1.058.977H6.88c.586 0 1.059-.39 1.059-.977V2.77c0-.586-.473-.918-1.059-.918zM5.3 4.017c.167.099.19.276.012.366l-2.098.985c-.131.077-.304-.002-.302-.19V3.29c0-.203.18-.333.34-.245z" fill="#c4c4c4" paint-order="fill markers stroke"/></svg> <svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" width="30" height="25" viewBox="0 0 7.937 6.615"><title>Subscriptions</title><path d="M2.373 0h3.191a.52.52 0 01.521.521H1.852A.52.52 0 012.373 0zm-.91.794h5.011c.371 0 .67.298.67.67v.123l-6.35-.016v-.108c0-.37.298-.67.67-.67zm-.405 1.058C.472 1.852 0 2.184 0 2.77v2.868c0 .586.472.977 1.058.977H6.88c.586 0 1.059-.39 1.059-.977V2.77c0-.586-.473-.918-1.059-.918zM5.3 4.017c.167.099.19.276.012.366l-2.098.985c-.131.077-.304-.002-.302-.19V3.29c0-.203.18-.333.34-.245z" paint-order="fill markers stroke"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 535 B

After

Width:  |  Height:  |  Size: 569 B

454
package-lock.json generated
View File

@ -5,22 +5,21 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@babel/helper-validator-identifier": { "@babel/helper-validator-identifier": {
"version": "7.12.11", "version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==" "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.12.13", "version": "7.16.6",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
"integrity": "sha512-z7n7ybOUzaRc3wwqLpAX8UFIXsrVXUJhtNGBwAnLz6d1KUapqyq7ad2La8gZ6CXhHmGAIL32cop8Tst4/PNWLw==" "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="
}, },
"@babel/types": { "@babel/types": {
"version": "7.12.13", "version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
"integrity": "sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==", "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
"requires": { "requires": {
"@babel/helper-validator-identifier": "^7.12.11", "@babel/helper-validator-identifier": "^7.15.7",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0" "to-fast-properties": "^2.0.0"
} }
}, },
@ -35,9 +34,9 @@
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
}, },
"anymatch": { "anymatch": {
"version": "3.1.1", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
"requires": { "requires": {
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"picomatch": "^2.0.4" "picomatch": "^2.0.4"
@ -49,9 +48,9 @@
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
}, },
"are-we-there-yet": { "are-we-there-yet": {
"version": "1.1.5", "version": "1.1.7",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
"requires": { "requires": {
"delegates": "^1.0.0", "delegates": "^1.0.0",
"readable-stream": "^2.0.6" "readable-stream": "^2.0.6"
@ -76,18 +75,18 @@
} }
}, },
"base64-js": { "base64-js": {
"version": "1.3.1", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
}, },
"better-sqlite3": { "better-sqlite3": {
"version": "7.1.0", "version": "7.4.5",
"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.1.0.tgz", "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.5.tgz",
"integrity": "sha512-FV/snQ8F/kyqhdxsevzbojVtMowDWOfe1A5N3lYu1KJwoho2t7JgITmdlSc7DkOh3Zq65I+ZyeNWXQrkLEDFTg==", "integrity": "sha512-mybC3dgrtJeHkIRGP36tST7wjBlIMgTRAXhhO4bMpPZ17EG23FZxZeFcwKWy6o8mV1SKQFnQNyeAZlQpGrgheQ==",
"requires": { "requires": {
"bindings": "^1.5.0", "bindings": "^1.5.0",
"prebuild-install": "^5.3.3", "prebuild-install": "^7.0.0",
"tar": "4.4.10" "tar": "^6.1.11"
} }
}, },
"binary-extensions": { "binary-extensions": {
@ -104,9 +103,9 @@
} }
}, },
"bl": { "bl": {
"version": "4.0.3", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
"integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
"requires": { "requires": {
"buffer": "^5.5.0", "buffer": "^5.5.0",
"inherits": "^2.0.4", "inherits": "^2.0.4",
@ -134,12 +133,12 @@
} }
}, },
"buffer": { "buffer": {
"version": "5.6.0", "version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
"requires": { "requires": {
"base64-js": "^1.0.2", "base64-js": "^1.3.1",
"ieee754": "^1.1.4" "ieee754": "^1.1.13"
} }
}, },
"call-bind": { "call-bind": {
@ -160,18 +159,18 @@
} }
}, },
"chokidar": { "chokidar": {
"version": "3.5.1", "version": "3.5.2",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
"integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
"requires": { "requires": {
"anymatch": "~3.1.1", "anymatch": "~3.1.2",
"braces": "~3.0.2", "braces": "~3.0.2",
"fsevents": "~2.3.1", "fsevents": "~2.3.2",
"glob-parent": "~5.1.0", "glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0", "is-binary-path": "~2.1.0",
"is-glob": "~4.0.1", "is-glob": "~4.0.1",
"normalize-path": "~3.0.0", "normalize-path": "~3.0.0",
"readdirp": "~3.5.0" "readdirp": "~3.6.0"
} }
}, },
"chownr": { "chownr": {
@ -204,16 +203,16 @@
"integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
}, },
"decompress-response": { "decompress-response": {
"version": "4.2.1", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
"requires": { "requires": {
"mimic-response": "^2.0.0" "mimic-response": "^3.1.0"
} }
}, },
"deep-extend": { "deep-extend": {
@ -227,9 +226,9 @@
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
}, },
"denque": { "denque": {
"version": "1.4.1", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
"integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="
}, },
"detect-libc": { "detect-libc": {
"version": "1.0.3", "version": "1.0.3",
@ -273,17 +272,17 @@
"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
}, },
"fs-minipass": { "fs-minipass": {
"version": "1.2.7", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
"requires": { "requires": {
"minipass": "^2.6.0" "minipass": "^3.0.0"
} }
}, },
"fsevents": { "fsevents": {
"version": "2.3.1", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"optional": true "optional": true
}, },
"function-bind": { "function-bind": {
@ -307,9 +306,9 @@
} }
}, },
"get-intrinsic": { "get-intrinsic": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
"integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
"requires": { "requires": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"has": "^1.0.3", "has": "^1.0.3",
@ -322,9 +321,9 @@
"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
}, },
"glob-parent": { "glob-parent": {
"version": "5.1.1", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"requires": { "requires": {
"is-glob": "^4.0.1" "is-glob": "^4.0.1"
} }
@ -338,9 +337,17 @@
} }
}, },
"has-symbols": { "has-symbols": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
},
"has-tostringtag": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
"requires": {
"has-symbols": "^1.0.2"
}
}, },
"has-unicode": { "has-unicode": {
"version": "2.0.1", "version": "2.0.1",
@ -348,9 +355,14 @@
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
}, },
"ieee754": { "ieee754": {
"version": "1.1.13", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
},
"immutable": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
"integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
}, },
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
@ -358,9 +370,9 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.8",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
}, },
"is-binary-path": { "is-binary-path": {
"version": "2.1.0", "version": "2.1.0",
@ -371,9 +383,9 @@
} }
}, },
"is-core-module": { "is-core-module": {
"version": "2.2.0", "version": "2.8.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
"integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
"requires": { "requires": {
"has": "^1.0.3" "has": "^1.0.3"
} }
@ -401,9 +413,9 @@
} }
}, },
"is-glob": { "is-glob": {
"version": "4.0.1", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
"requires": { "requires": {
"is-extglob": "^2.1.1" "is-extglob": "^2.1.1"
} }
@ -419,12 +431,12 @@
"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
}, },
"is-regex": { "is-regex": {
"version": "1.1.2", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
"integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
"requires": { "requires": {
"call-bind": "^1.0.2", "call-bind": "^1.0.2",
"has-symbols": "^1.0.1" "has-tostringtag": "^1.0.0"
} }
}, },
"isarray": { "isarray": {
@ -446,20 +458,23 @@
"promise": "^7.0.1" "promise": "^7.0.1"
} }
}, },
"lodash": { "lru-cache": {
"version": "4.17.20", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"requires": {
"yallist": "^4.0.0"
}
}, },
"mime": { "mime": {
"version": "2.5.0", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
"integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==" "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
}, },
"mimic-response": { "mimic-response": {
"version": "2.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
}, },
"minimist": { "minimist": {
"version": "1.2.5", "version": "1.2.5",
@ -467,20 +482,20 @@
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "3.1.6",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
"requires": { "requires": {
"safe-buffer": "^5.1.2", "yallist": "^4.0.0"
"yallist": "^3.0.0"
} }
}, },
"minizlib": { "minizlib": {
"version": "1.3.3", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
"requires": { "requires": {
"minipass": "^2.9.0" "minipass": "^3.0.0",
"yallist": "^4.0.0"
} }
}, },
"mixin-deep": { "mixin-deep": {
@ -489,12 +504,9 @@
"integrity": "sha512-imbHQNRglyaplMmjBLL3V5R6Bfq5oM+ivds3SKgc6oRtzErEnBUUc5No11Z2pilkUvl42gJvi285xTNswcKCMA==" "integrity": "sha512-imbHQNRglyaplMmjBLL3V5R6Bfq5oM+ivds3SKgc6oRtzErEnBUUc5No11Z2pilkUvl42gJvi285xTNswcKCMA=="
}, },
"mkdirp": { "mkdirp": {
"version": "0.5.5", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
"requires": {
"minimist": "^1.2.5"
}
}, },
"mkdirp-classic": { "mkdirp-classic": {
"version": "0.5.3", "version": "0.5.3",
@ -507,22 +519,20 @@
"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==" "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
}, },
"node-abi": { "node-abi": {
"version": "2.19.1", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz",
"integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==", "integrity": "sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw==",
"requires": { "requires": {
"semver": "^5.4.1" "semver": "^7.3.5"
} }
}, },
"node-fetch": { "node-fetch": {
"version": "2.6.0", "version": "2.6.6",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
}, "requires": {
"noop-logger": { "whatwg-url": "^5.0.0"
"version": "0.1.1", }
"resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
"integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
}, },
"normalize-path": { "normalize-path": {
"version": "3.0.0", "version": "3.0.0",
@ -559,45 +569,43 @@
} }
}, },
"path-parse": { "path-parse": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
}, },
"picomatch": { "picomatch": {
"version": "2.2.2", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
"integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
}, },
"pinski": { "pinski": {
"version": "git+https://git.sr.ht/~cadence/nodejs-pinski#210be3cfacbd93d44e104698a29abd39494a6271", "version": "git+https://git.sr.ht/~cadence/nodejs-pinski#e22095172a061a8271e28272e2e481d541ea6725",
"from": "git+https://git.sr.ht/~cadence/nodejs-pinski#210be3cfacbd93d44e104698a29abd39494a6271", "from": "git+https://git.sr.ht/~cadence/nodejs-pinski#e22095172a061a8271e28272e2e481d541ea6725",
"requires": { "requires": {
"mime": "^2.4.6", "mime": "^2.5.2",
"pug": "^3.0.0", "pug": "^3.0.2",
"sass": "^1.26.10", "sass": "^1.35.1",
"ws": "^7.3.1" "ws": "^7.4.6"
} }
}, },
"prebuild-install": { "prebuild-install": {
"version": "5.3.5", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.5.tgz", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.0.tgz",
"integrity": "sha512-YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw==", "integrity": "sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA==",
"requires": { "requires": {
"detect-libc": "^1.0.3", "detect-libc": "^1.0.3",
"expand-template": "^2.0.3", "expand-template": "^2.0.3",
"github-from-package": "0.0.0", "github-from-package": "0.0.0",
"minimist": "^1.2.3", "minimist": "^1.2.3",
"mkdirp": "^0.5.1", "mkdirp-classic": "^0.5.3",
"napi-build-utils": "^1.0.1", "napi-build-utils": "^1.0.1",
"node-abi": "^2.7.0", "node-abi": "^3.3.0",
"noop-logger": "^0.1.1",
"npmlog": "^4.0.1", "npmlog": "^4.0.1",
"pump": "^3.0.0", "pump": "^3.0.0",
"rc": "^1.2.7", "rc": "^1.2.7",
"simple-get": "^3.0.3", "simple-get": "^4.0.0",
"tar-fs": "^2.0.0", "tar-fs": "^2.0.0",
"tunnel-agent": "^0.6.0", "tunnel-agent": "^0.6.0"
"which-pm-runs": "^1.0.0"
} }
}, },
"process-nextick-args": { "process-nextick-args": {
@ -614,17 +622,17 @@
} }
}, },
"pug": { "pug": {
"version": "3.0.0", "version": "3.0.2",
"resolved": "https://registry.npmjs.org/pug/-/pug-3.0.0.tgz", "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz",
"integrity": "sha512-inmsJyFBSHZaiGLaguoFgJGViX0If6AcfcElimvwj9perqjDpUpw79UIEDZbWFmoGVidh08aoE+e8tVkjVJPCw==", "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==",
"requires": { "requires": {
"pug-code-gen": "^3.0.0", "pug-code-gen": "^3.0.2",
"pug-filters": "^4.0.0", "pug-filters": "^4.0.0",
"pug-lexer": "^5.0.0", "pug-lexer": "^5.0.1",
"pug-linker": "^4.0.0", "pug-linker": "^4.0.0",
"pug-load": "^3.0.0", "pug-load": "^3.0.0",
"pug-parser": "^6.0.0", "pug-parser": "^6.0.0",
"pug-runtime": "^3.0.0", "pug-runtime": "^3.0.1",
"pug-strip-comments": "^2.0.0" "pug-strip-comments": "^2.0.0"
} }
}, },
@ -639,9 +647,9 @@
} }
}, },
"pug-code-gen": { "pug-code-gen": {
"version": "3.0.1", "version": "3.0.2",
"resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.1.tgz", "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz",
"integrity": "sha512-xJIGvmXTQlkJllq6hqxxjRWcay2F9CU69TuAuiVZgHK0afOhG5txrQOcZyaPHBvSWCU/QQOqEp5XCH94rRZpBQ==", "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==",
"requires": { "requires": {
"constantinople": "^4.0.1", "constantinople": "^4.0.1",
"doctypes": "^1.1.0", "doctypes": "^1.1.0",
@ -671,9 +679,9 @@
} }
}, },
"pug-lexer": { "pug-lexer": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.0.tgz", "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz",
"integrity": "sha512-52xMk8nNpuyQ/M2wjZBN5gXQLIylaGkAoTk5Y1pBhVqaopaoj8Z0iVzpbFZAqitL4RHNVDZRnJDsqEYe99Ti0A==", "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==",
"requires": { "requires": {
"character-parser": "^2.2.0", "character-parser": "^2.2.0",
"is-expression": "^4.0.0", "is-expression": "^4.0.0",
@ -708,9 +716,9 @@
} }
}, },
"pug-runtime": { "pug-runtime": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.0.tgz", "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz",
"integrity": "sha512-GoEPcmQNnaTsePEdVA05bDpY+Op5VLHKayg08AQiqJBWU/yIaywEYv7TetC5dEQS3fzBBoyb2InDcZEg3mPTIA==" "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg=="
}, },
"pug-strip-comments": { "pug-strip-comments": {
"version": "2.0.0", "version": "2.0.0",
@ -760,19 +768,19 @@
} }
}, },
"readdirp": { "readdirp": {
"version": "3.5.0", "version": "3.6.0",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"requires": { "requires": {
"picomatch": "^2.2.1" "picomatch": "^2.2.1"
} }
}, },
"resolve": { "resolve": {
"version": "1.19.0", "version": "1.20.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
"requires": { "requires": {
"is-core-module": "^2.1.0", "is-core-module": "^2.2.0",
"path-parse": "^1.0.6" "path-parse": "^1.0.6"
} }
}, },
@ -782,17 +790,22 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"sass": { "sass": {
"version": "1.32.6", "version": "1.45.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz",
"integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==", "integrity": "sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==",
"requires": { "requires": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
"source-map-js": ">=0.6.2 <2.0.0"
} }
}, },
"semver": { "semver": {
"version": "5.7.1", "version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"requires": {
"lru-cache": "^6.0.0"
}
}, },
"set-blocking": { "set-blocking": {
"version": "2.0.0", "version": "2.0.0",
@ -800,9 +813,9 @@
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
}, },
"signal-exit": { "signal-exit": {
"version": "3.0.3", "version": "3.0.6",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
}, },
"simple-concat": { "simple-concat": {
"version": "1.0.1", "version": "1.0.1",
@ -810,15 +823,20 @@
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
}, },
"simple-get": { "simple-get": {
"version": "3.1.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz",
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==",
"requires": { "requires": {
"decompress-response": "^4.2.0", "decompress-response": "^6.0.0",
"once": "^1.3.1", "once": "^1.3.1",
"simple-concat": "^1.0.0" "simple-concat": "^1.0.0"
} }
}, },
"source-map-js": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
"integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA=="
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@ -851,36 +869,42 @@
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
}, },
"tar": { "tar": {
"version": "4.4.10", "version": "6.1.11",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
"integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
"requires": { "requires": {
"chownr": "^1.1.1", "chownr": "^2.0.0",
"fs-minipass": "^1.2.5", "fs-minipass": "^2.0.0",
"minipass": "^2.3.5", "minipass": "^3.0.0",
"minizlib": "^1.2.1", "minizlib": "^2.1.1",
"mkdirp": "^0.5.0", "mkdirp": "^1.0.3",
"safe-buffer": "^5.1.2", "yallist": "^4.0.0"
"yallist": "^3.0.3" },
"dependencies": {
"chownr": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
}
} }
}, },
"tar-fs": { "tar-fs": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
"integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==", "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
"requires": { "requires": {
"chownr": "^1.1.1", "chownr": "^1.1.1",
"mkdirp-classic": "^0.5.2", "mkdirp-classic": "^0.5.2",
"pump": "^3.0.0", "pump": "^3.0.0",
"tar-stream": "^2.0.0" "tar-stream": "^2.1.4"
} }
}, },
"tar-stream": { "tar-stream": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
"integrity": "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
"requires": { "requires": {
"bl": "^4.0.1", "bl": "^4.0.3",
"end-of-stream": "^1.4.1", "end-of-stream": "^1.4.1",
"fs-constants": "^1.0.0", "fs-constants": "^1.0.0",
"inherits": "^2.0.3", "inherits": "^2.0.3",
@ -917,6 +941,11 @@
"resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz",
"integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=" "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ="
}, },
"tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
},
"tunnel-agent": { "tunnel-agent": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@ -935,17 +964,26 @@
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
"integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=" "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk="
}, },
"which-pm-runs": { "webidl-conversions": {
"version": "1.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=" "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
},
"whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
}, },
"wide-align": { "wide-align": {
"version": "1.1.3", "version": "1.1.5",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
"requires": { "requires": {
"string-width": "^1.0.2 || 2" "string-width": "^1.0.2 || 2 || 3 || 4"
} }
}, },
"with": { "with": {
@ -965,14 +1003,14 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
}, },
"ws": { "ws": {
"version": "7.4.3", "version": "7.5.6",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
"integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==" "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
} }
} }
} }

8
package.json
View File

@ -10,11 +10,11 @@
"author": "", "author": "",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"better-sqlite3": "^7.1.0", "better-sqlite3": "^7.4.5",
"cookie": "^0.4.1", "cookie": "^0.4.1",
"denque": "^1.4.1", "denque": "^1.5.1",
"mixin-deep": "^2.0.1", "mixin-deep": "^2.0.1",
"node-fetch": "^2.6.0", "node-fetch": "^2.6.6",
"pinski": "git+https://git.sr.ht/~cadence/nodejs-pinski#210be3cfacbd93d44e104698a29abd39494a6271" "pinski": "git+https://git.sr.ht/~cadence/nodejs-pinski#e22095172a061a8271e28272e2e481d541ea6725"
} }
} }

6
pug/cant-think.pug
View File

@ -18,6 +18,7 @@ mixin leave(index, prefix="No more?", final)
a(href="/search?q=cats+being+cute") [BLISS] a(href="/search?q=cats+being+cute") [BLISS]
block content block content
include includes/video-list-item
main.cant-think-page main.cant-think-page
- let src = constants.server_setup.cant_think_narration_url - let src = constants.server_setup.cant_think_narration_url
if src if src
@ -71,3 +72,8 @@ block content
p You know what you must do. p You know what you must do.
p.ultimatum: a(href="#i-understand").border-look I know what I must do. p.ultimatum: a(href="#i-understand").border-look I know what I must do.
a#i-understand a#i-understand
p.the-end Well, looks like you reached the end of the content.#[br]You know what happens now.
h3 Recommended videos
+video_list_item("related-video", {videoId: "jKKCF_Bqtw4", title: "dopamine review", author: "Jreg", authorId: "UCGSGPehp0RWfca-kENgBJ9Q", viewCountText: "84,651 views", second__lengthText: "3:10"})
+video_list_item("related-video", {videoId: "gLYWLobR248", title: "I Watch My YouTube Videos At 2x Speed", author: "Jreg", authorId: "UCGSGPehp0RWfca-kENgBJ9Q", viewCountText: "125,625 views", second__lengthText: "2:24"})

27
pug/channel-error.pug Normal file
View File

@ -0,0 +1,27 @@
extends includes/layout
include includes/video-list-item
include includes/subscribe-button
block head
title= `${data.row ? data.row.name : "Deleted channel"} - CloudTube`
script(type="module" src=getStaticURL("html", "/static/js/channel.js"))
block content
main.channel-page
if data.row
.channel-data
.info
- const iconURL = data.row.icon_url
if iconURL
.logo
img(src=iconURL alt="").thumbnail-image
.about
h1.name= data.row.name
+subscribe_button(data.ucid, subscribed, `/channel/${data.ucid}`).subscribe-button.base-border-look
.channel-error
div= data.message
if data.missing && subscribed
.you-should-unsubscribe To remove this channel from your subscriptions list, click Unsubscribe.

11
pug/includes/layout.pug
View File

@ -3,7 +3,8 @@ html
head head
meta(charset="utf-8") meta(charset="utf-8")
meta(name="viewport" content="width=device-width, initial-scale=1") meta(name="viewport" content="width=device-width, initial-scale=1")
link(rel="stylesheet" type="text/css" href=getStaticURL("sass", "/main.sass")) - const theme = settings && ["dark", "light", "edgeless-light"][settings.theme] || "dark"
link(rel="stylesheet" type="text/css" href=getStaticURL("sass", `/${theme}.sass`))
script(type="module" src=getStaticURL("html", "/static/js/focus.js")) script(type="module" src=getStaticURL("html", "/static/js/focus.js"))
block head block head
@ -15,13 +16,9 @@ html
.links .links
a(href="/").link.home CloudTube a(href="/").link.home CloudTube
a(href="/subscriptions" title="Subscriptions").link.icon-link a(href="/subscriptions" title="Subscriptions").link.icon-link
svg(width=30 height=25) != icons.get("subscriptions")
image(href=getStaticURL("html", "/static/images/subscriptions.svg") alt="Subscriptions.").icon
title Subscriptions
a(href="/settings" title="Settings").link.icon-link a(href="/settings" title="Settings").link.icon-link
svg(width=25 height=25) != icons.get("settings")
image(href=getStaticURL("html", "/static/images/settings.svg") alt="Settings.").icon
title Settings
form(method="get" action="/search").search-form form(method="get" action="/search").search-form
input(type="text" placeholder="Search" aria-label="Search a video" name="q" autocomplete="off" value=query).search input(type="text" placeholder="Search" aria-label="Search a video" name="q" autocomplete="off" value=query).search

10
pug/settings.pug
View File

@ -36,6 +36,16 @@ block content
form(method="post" action="/settings") form(method="post" action="/settings")
+fieldset("Settings") +fieldset("Settings")
+select({
id: "theme",
label: "Theme",
options: [
{value: "0", text: "Standard dark"},
{value: "1", text: "Standard light"},
{value: "2", text: "Edgeless light"}
]
})
+input({ +input({
id: "instance", id: "instance",
label: "Instance", label: "Instance",

20
pug/subscriptions.pug
View File

@ -11,12 +11,24 @@ block content
if hasSubscriptions if hasSubscriptions
section section
details.channels-details details.channels-details
summary #{channels.length} subscriptions summary
| #{channels.length} subscriptions
if missingChannelCount === 1
= ` - ${missingChannelCount} channel is gone`
else if missingChannelCount > 1
= ` - ${missingChannelCount} channels are gone`
.channels-list .channels-list
for channel in channels for channel in channels
a(href=`/channel/${channel.ucid}`).channel-item a(href=`/channel/${channel.ucid}`).channel-item
img(src=channel.icon_url width=512 height=512 alt="").thumbnail img(src=channel.icon_url width=512 height=512 alt="").thumbnail
span.name= channel.name div
div.name= channel.name
if channel.missing
div.missing-reason
if channel.missing_reason
= channel.missing_reason
else
| This channel appears to be deleted or terminated. Click to check it.
if refreshed if refreshed
section section
@ -31,8 +43,8 @@ block content
if settings.save_history if settings.save_history
input(type="checkbox" id="watched-videos-display") input(type="checkbox" id="watched-videos-display")
.watched-videos-display-container .checkbox-hider__container
label(for="watched-videos-display").watched-videos-display-label Hide watched videos label(for="watched-videos-display").checkbox-hider__label Hide watched videos
each video in videos each video in videos
+video_list_item("subscriptions-video", video, instanceOrigin, {showMarkWatched: settings.save_history && !video.watched}) +video_list_item("subscriptions-video", video, instanceOrigin, {showMarkWatched: settings.save_history && !video.watched})

1
pug/video.pug
View File

@ -21,6 +21,7 @@ block content
noscript noscript
meta(http-equiv="refresh" content=`${video.lengthSeconds+5};url=/watch?v=${first.videoId}&continuous=1&session-watched=${sessionWatchedNext}`) meta(http-equiv="refresh" content=`${video.lengthSeconds+5};url=/watch?v=${first.videoId}&continuous=1&session-watched=${sessionWatchedNext}`)
.video-page(class={ .video-page(class={
"video-page--recommended-side": settings.recommended_mode === 0,
"video-page--recommended-below": settings.recommended_mode === 1, "video-page--recommended-below": settings.recommended_mode === 1,
"video-page--recommended-hidden": settings.recommended_mode === 2 "video-page--recommended-hidden": settings.recommended_mode === 2
}) })

9
sass/dark.sass Normal file
View File

@ -0,0 +1,9 @@
@use "themes/dark" as *
@use "includes/main" with ($_theme: $theme)
@use "theme-modules/edgeless" with ($_theme: $theme)
// navigation shadow
.main-nav
position: relative // needed for box shadow to overlap related videos section
box-shadow: 0px 0px 20px 5px rgba(0, 0, 0, 0.1)

4
sass/edgeless-light.sass Normal file
View File

@ -0,0 +1,4 @@
@use "themes/edgeless-light" as *
@use "includes/main" with ($_theme: $theme)
@use "theme-modules/edgeless" with ($_theme: $theme)

33
sass/includes/base.sass → sass/includes/_base.sass
View File

@ -1,8 +1,10 @@
@use "colors.sass" as c $_theme: () !default
@use "sass:map"
body body
background-color: c.$bg-dark background-color: map.get($_theme, "bg-2")
color: c.$fg-main color: map.get($_theme, "fg-main")
font-family: "Bariol", sans-serif font-family: "Bariol", sans-serif
font-size: 18px font-size: 18px
margin: 0 margin: 0
@ -13,13 +15,13 @@ body
flex-direction: column flex-direction: column
a a
color: c.$link color: map.get($_theme, "link")
pre, code pre, code
font-size: 0.88em font-size: 0.88em
code code
background: c.$bg-darker background: map.get($_theme, "bg-1")
padding: 3px 5px padding: 3px 5px
border-radius: 4px border-radius: 4px
@ -32,7 +34,7 @@ button
cursor: pointer cursor: pointer
::placeholder ::placeholder
color: #c4c4c4 color: map.get($_theme, "placeholder")
opacity: 1 opacity: 1
// focus section // focus section
@ -48,19 +50,20 @@ button
select:-moz-focusring select:-moz-focusring
color: transparent color: transparent
text-shadow: 0 0 0 c.$fg-bright text-shadow: 0 0 0 map.get($_theme, "fg-bright")
body.show-focus body.show-focus
a, select, button, input, video, summary a, select, button, input, video, summary
&:focus &:focus
outline: 2px dotted #ddd outline: 2px dotted map.get($_theme, "fg-main")
video video
background-color: black background-color: black
details details
background-color: c.$bg-accent-x background-color: map.get($_theme, "bg-3")
padding: 12px padding: 12px
border: 1px solid map.get($_theme, "edge-grey")
border-radius: 8px border-radius: 8px
summary summary
@ -68,20 +71,22 @@ details
line-height: 1 line-height: 1
margin-bottom: 0 margin-bottom: 0
user-select: none user-select: none
color: c.$fg-main color: map.get($_theme, "fg-main")
&[open] summary &[open] summary
margin-bottom: 16px padding-bottom: 12px
border-bottom: 1px solid map.get($_theme, "edge-grey")
margin-bottom: 8px
table table
background-color: c.$bg-darker background-color: map.get($_theme, "bg-1")
table, td, th table, td, th
border: 1px solid c.$edge-grey border: 1px solid map.get($_theme, "edge-grey")
border-collapse: collapse border-collapse: collapse
td, th td, th
padding: 4px 8px padding: 4px 8px
thead, tr:nth-child(even) thead, tr:nth-child(even)
background-color: c.$bg-darkest background-color: map.get($_theme, "bg-0")

26
sass/includes/buttons.sass → sass/includes/_buttons.sass
View File

@ -1,10 +1,12 @@
$_theme: () !default
@use "sass:selector" @use "sass:selector"
@use "colors.sass" as c @use "sass:map"
@mixin button-base @mixin button-base
-webkit-appearance: none -webkit-appearance: none
-moz-appearance: none -moz-appearance: none
color: c.$fg-bright color: map.get($_theme, "fg-bright")
border: none border: none
border-radius: 4px border-radius: 4px
padding: 8px padding: 8px
@ -14,7 +16,7 @@
@at-root #{selector.unify(&, "select")} @at-root #{selector.unify(&, "select")}
padding: 8px 27px 8px 8px padding: 8px 27px 8px 8px
background: url(/static/images/arrow-down-wide.svg) right 53% no-repeat c.$bg-accent-x background: map.get($_theme, "image-dropdown") right 53% no-repeat map.get($_theme, "bg-4")
@at-root #{selector.unify(&, "a")} @at-root #{selector.unify(&, "a")}
padding: 7px 8px padding: 7px 8px
@ -31,12 +33,12 @@
@mixin button-bg @mixin button-bg
@include button-base @include button-base
background-color: c.$bg-accent-x background-color: map.get($_theme, "bg-4")
@mixin border-button @mixin border-button
@include button-bg @include button-bg
border: 1px solid c.$edge-grey border: 1px solid map.get($_theme, "edge-grey")
@mixin button-size @mixin button-size
margin: 4px margin: 4px
@ -44,10 +46,10 @@
@mixin button-hover @mixin button-hover
&:hover &:hover
background-color: c.$bg-accent background-color: map.get($_theme, "bg-3")
&:active &:active
background-color: c.$bg-dark background-color: map.get($_theme, "bg-2")
.base-border-look .base-border-look
@include border-button @include border-button
@ -62,13 +64,13 @@
@include button-size @include button-size
-webkit-appearance: none -webkit-appearance: none
-moz-appearance: none -moz-appearance: none
color: c.$fg-bright color: map.get($_theme, "fg-bright")
text-decoration: none text-decoration: none
line-height: 1.25 line-height: 1.25
margin: 0 margin: 0
padding: 8px 20px padding: 8px 20px
background: c.$bg-accent background: map.get($_theme, "bg-3")
border: solid c.$bg-darker border: solid map.get($_theme, "edge-grey")
border-width: 1px 0px 0px border-width: 1px 0px 0px
text-align: left text-align: left
@ -76,7 +78,7 @@
border-width: 1px 0px 1px border-width: 1px 0px 1px
&:hover &:hover
background: c.$bg-accent-x background: map.get($_theme, "bg-4")
&:active &:active
background: c.$bg-darker background: map.get($_theme, "bg-1")

22
sass/includes/cant-think-page.sass → sass/includes/_cant-think-page.sass
View File

@ -1,5 +1,7 @@
$_theme: () !default
@use "sass:list" @use "sass:list"
@use "colors.sass" as c @use "sass:map"
.cant-think-page .cant-think-page
.main-nav .main-nav
@ -9,13 +11,14 @@
text-align: left text-align: left
max-width: 572px max-width: 572px
padding-top: 40px padding-top: 40px
margin-bottom: 12vh
border-radius: 0px 0px 16px 16px border-radius: 0px 0px 16px 16px
box-sizing: border-box box-sizing: border-box
.page-narration .page-narration
background-color: c.$bg-accent background-color: map.get($_theme, "bg-3")
border: 1px solid #aaa border: 1px solid map.get($_theme, "edge-grey")
color: #fff color: map.get($_theme, "fg-bright")
border-radius: 0 border-radius: 0
padding: 16px padding: 16px
margin: 40px auto 60px margin: 40px auto 60px
@ -28,7 +31,7 @@
.leave .leave
margin: 26px 32px !important margin: 26px 32px !important
color: #aaa color: map.get($_theme, "fg-dim")
$sizes: 14px 16px 21px 30px 72px $sizes: 14px 16px 21px 30px 72px
@each $size in $sizes @each $size in $sizes
@ -37,7 +40,7 @@
&.leave__final &.leave__final
font-weight: bold font-weight: bold
color: #f2f2f2 color: map.get($_theme, "fg-bright")
text-align: center text-align: center
.leave__actions .leave__actions
@ -54,6 +57,12 @@
.ultimatum .ultimatum
margin-top: 32px !important margin-top: 32px !important
.the-end
margin: 120px 0px 1em !important
.thumbnail__more
display: none
#i-understand #i-understand
display: flex display: flex
height: 20px height: 20px
@ -65,6 +74,7 @@
&:target &:target
position: fixed position: fixed
z-index: 1
top: 0 top: 0
bottom: 0 bottom: 0
left: 0 left: 0

30
sass/includes/channel-page.sass → sass/includes/_channel-page.sass
View File

@ -1,6 +1,8 @@
@use "colors.sass" as c $_theme: () !default
@use "video-list-item.sass" as *
@use "_dimensions.sass" as dimensions @use "sass:map"
@use "_dimensions" as dimensions
@use "video-list-item" as *
.channel-page .channel-page
padding: 40px 20px 20px padding: 40px 20px 20px
@ -17,7 +19,7 @@
align-self: flex-start align-self: flex-start
.channel-data .channel-data
background-color: c.$bg-darker background-color: map.get($_theme, "bg-1")
padding: 24px padding: 24px
margin: 12px 0px 24px margin: 12px 0px 24px
border-radius: 8px border-radius: 8px
@ -44,11 +46,11 @@
.name .name
font-size: 30px font-size: 30px
font-weight: normal font-weight: normal
color: c.$fg-bright color: map.get($_theme, "fg-bright")
margin: 0 margin: 0
.subscribers .subscribers
color: c.$fg-main color: map.get($_theme, "fg-main")
font-size: 18px font-size: 18px
.subscribe-form .subscribe-form
@ -61,7 +63,8 @@
line-height: 1 line-height: 1
border-radius: 8px border-radius: 8px
font-size: 22px font-size: 22px
background-color: c.$power-deep background-color: map.get($_theme, "power-deep")
color: map.get($_theme, "power-fg")
border: none border: none
.description .description
@ -71,6 +74,19 @@
.channel-video .channel-video
@include channel-video @include channel-video
.channel-error
background-color: map.get($_theme, "bg-1")
padding: 24px
margin: 12px 0px 24px
border-radius: 8px
border: 1px solid map.get($_theme, "edge-grey")
font-size: 20px
color: map.get($_theme, "fg-warning")
.you-should-unsubscribe
margin-top: 20px
color: map.get($_theme, "fg-main")
.about-description // class provided by youtube .about-description // class provided by youtube
pre pre
font-size: inherit font-size: inherit

20
sass/includes/filters-page.sass → sass/includes/_filters-page.sass
View File

@ -1,10 +1,12 @@
@use "colors.sass" as c $_theme: () !default
@use "sass:map"
@mixin filter-notice @mixin filter-notice
margin-top: 24px margin-top: 24px
padding: 12px padding: 12px
border-radius: 8px border-radius: 8px
background-color: c.$bg-darker background-color: map.get($_theme, "bg-1")
white-space: pre-line white-space: pre-line
.filters-page .filters-page
@ -20,23 +22,23 @@
.filter-confirmation-notice .filter-confirmation-notice
@include filter-notice @include filter-notice
color: c.$fg-warning color: map.get($_theme, "fg-warning")
.filter-compile-error .filter-compile-error
@include filter-notice @include filter-notice
&__header &__header
color: c.$fg-warning color: map.get($_theme, "fg-warning")
&__trace &__trace
background-color: c.$bg-darkest background-color: map.get($_theme, "bg-0")
padding: 6px padding: 6px
.save-filter .save-filter
margin-top: 12px margin-top: 12px
.border-look .border-look
background-color: c.$bg-darker background-color: map.get($_theme, "bg-1")
font-size: 22px font-size: 22px
padding: 7px 16px 8px padding: 7px 16px 8px
font-size: 24px font-size: 24px
@ -48,17 +50,17 @@
.filter .filter
display: flex display: flex
padding: 5px 0 padding: 5px 0
border-top: 1px solid c.$edge-grey border-top: 1px solid map.get($_theme, "edge-grey")
&:last-child &:last-child
border-bottom: 1px solid c.$edge-grey border-bottom: 1px solid map.get($_theme, "edge-grey")
&__details &__details
flex: 1 flex: 1
&__type &__type
font-size: 15px font-size: 15px
color: c.$fg-dim color: map.get($_theme, "fg-dim")
&__remove &__remove
flex-shrink: 0 flex-shrink: 0

7
sass/includes/footer.sass → sass/includes/_footer.sass
View File

@ -1,4 +1,6 @@
@use "./colors.sass" as c $_theme: () !default
@use "sass:map"
.footer__container .footer__container
flex: 1 flex: 1
@ -10,9 +12,10 @@
display: flex display: flex
flex-direction: column flex-direction: column
align-items: center align-items: center
background-color: c.$bg-darkest background-color: map.get($_theme, "bg-dim")
margin: 40px 0 0 margin: 40px 0 0
padding: 10px 10px 30px padding: 10px 10px 30px
border-top: 1px solid map.get($_theme, "edge-grey")
.footer__cols .footer__cols
display: flex display: flex

47
sass/includes/forms.sass → sass/includes/_forms.sass
View File

@ -1,7 +1,9 @@
@use "colors.sass" as c $_theme: () !default
@use "sass:map"
@mixin disabled @mixin disabled
background-color: c.$bg-dark background-color: map.get($_theme, "bg-2")
color: #808080 color: #808080
fieldset fieldset
@ -20,7 +22,7 @@ fieldset
font-size: 28px font-size: 28px
font-weight: bold font-weight: bold
padding: 0 padding: 0
border-bottom: 1px solid #333 border-bottom: 1px solid map.get($_theme, "edge-grey") // TODO: originally contrasted more
line-height: 1.56 line-height: 1.56
@media screen and (max-width: 400px) @media screen and (max-width: 400px)
@ -36,7 +38,7 @@ fieldset
position: relative position: relative
padding-bottom: 5px padding-bottom: 5px
margin-bottom: 5px margin-bottom: 5px
border-bottom: 1px solid #999 border-bottom: 1px solid map.get($_theme, "edge-grey")
@media screen and (max-width: 400px) @media screen and (max-width: 400px)
flex-direction: column flex-direction: column
@ -52,7 +54,7 @@ fieldset
&__label &__label
grid-area: label grid-area: label
padding: 8px 8px 8px 0px padding: 8px 8px 8px 0px
color: #fff color: map.get($_theme, "fg-main")
&__input &__input
grid-area: input grid-area: input
@ -63,7 +65,7 @@ fieldset
white-space: pre-line white-space: pre-line
margin: 12px 0px 18px margin: 12px 0px 18px
font-size: 16px font-size: 16px
color: #ccc color: map.get($_theme, "fg-dim")
line-height: 1.2 line-height: 1.2
// //
@ -79,7 +81,7 @@ fieldset
width: 16px width: 16px
height: 16px height: 16px
padding: 0px padding: 0px
border: 1px solid #666 border: 1px solid map.get($_theme, "edge-grey")
border-radius: 3px border-radius: 3px
margin-left: 8px margin-left: 8px
position: relative position: relative
@ -101,6 +103,20 @@ fieldset
@include acts-like-button @include acts-like-button
cursor: pointer cursor: pointer
.checkbox-hider__container
position: relative
display: grid // why does the default not work???
top: -42px
background: map.get($_theme, "bg-3")
line-height: 1
border: 1px solid map.get($_theme, "edge-grey")
border-radius: 8px
margin-bottom: -18px
.checkbox-hider__label
padding: 12px 0px 12px 32px
cursor: pointer
@mixin checkbox-hider($base) @mixin checkbox-hider($base)
##{$base} ##{$base}
position: relative position: relative
@ -110,18 +126,17 @@ fieldset
height: 42px height: 42px
margin: 0 margin: 0
/*
automatically add these styles too
this means that components based off this can either add the .checkbox-hider__container class, or they can add the .base-name-container class,
depending on which one is more reasonable in the moment
for example, .delete-confirm-container takes advantage of the @extend here.
.#{$base}-container .#{$base}-container
position: relative @extend .checkbox-hider__container
display: grid // why does the default not work???
top: -42px
background: c.$bg-accent-x
line-height: 1
border-radius: 8px
margin-bottom: -18px
.#{$base}-label .#{$base}-label
padding: 12px 0px 12px 32px @extend .checkbox-hider__label
cursor: pointer
@mixin single-button-form @mixin single-button-form
display: inline-block display: inline-block

8
sass/includes/home-page.sass → sass/includes/_home-page.sass
View File

@ -1,4 +1,6 @@
@use "colors.sass" as c $_theme: () !default
@use "sass:map"
.home-page .home-page
padding: 40px padding: 40px
@ -18,8 +20,8 @@
padding: 16px padding: 16px
border-radius: 4px border-radius: 4px
font-size: 20px font-size: 20px
background-color: c.$bg-darker background-color: map.get($_theme, "bg-1")
color: c.$fg-main color: map.get($_theme, "fg-main")
p p
margin: 0 32px margin: 0 32px

2
sass/includes/licenses-page.sass → sass/includes/_licenses-page.sass
View File

@ -1,3 +1,5 @@
$_theme: () !default
.js-licenses-page .js-licenses-page
max-width: 800px max-width: 800px
margin: 0 auto margin: 0 auto

32
sass/includes/_main.sass Normal file
View File

@ -0,0 +1,32 @@
$_theme: () !default
@use "sass:selector"
// preload second-level includes with the theme (there will be conflicts due to reconfiguration they are loaded individually)
// this isn't _exactly_ what @forward is supposed to be used for, but it's the best option here
@forward "video-list-item" show _ with ($_theme: $_theme)
@forward "forms" show _ with ($_theme: $_theme)
@forward "buttons" show _ with ($_theme: $_theme)
@use "base" with ($_theme: $_theme)
@use "video-page" with ($_theme: $_theme)
@use "search-page" with ($_theme: $_theme)
@use "home-page" with ($_theme: $_theme)
@use "channel-page" with ($_theme: $_theme)
@use "subscriptions-page" with ($_theme: $_theme)
@use "settings-page" with ($_theme: $_theme)
@use "cant-think-page" with ($_theme: $_theme)
@use "privacy-page" with ($_theme: $_theme)
@use "licenses-page" with ($_theme: $_theme)
@use "filters-page" with ($_theme: $_theme)
@use "takedown-page" with ($_theme: $_theme)
@use "nav" with ($_theme: $_theme)
@use "footer" with ($_theme: $_theme)
@font-face
font-family: "Bariol"
src: url(/static/fonts/bariol.woff?statichash=1)
.button-container
display: flex
flex-wrap: wrap

27
sass/includes/nav.sass → sass/includes/_nav.sass
View File

@ -1,12 +1,14 @@
@use "colors.sass" as c $_theme: () !default
@use "buttons.sass" as *
@use "_dimensions.sass" as dimensions @use "sass:map"
@use "buttons" as *
@use "_dimensions" as dimensions
.main-nav .main-nav
background-color: c.$bg-accent background-color: map.get($_theme, "bg-nav")
display: flex display: flex
padding: 8px padding: 8px
box-shadow: 0px 0px 20px 5px rgba(0, 0, 0, 0.1) border-bottom: 1px solid map.get($_theme, "edge-grey")
+dimensions.thin +dimensions.thin
display: block display: block
@ -30,10 +32,16 @@
font-weight: bold font-weight: bold
&, &:visited &, &:visited
color: #fff color: map.get($_theme, "fg-bright")
&:focus, &:hover &:focus, &:hover
background-color: c.$bg-accent-x background-color: map.get($_theme, "bg-4")
&.icon-link
color: map.get($_theme, "fg-dim")
&:hover, &:focus
color: map.get($_theme, "fg-bright")
.search-form .search-form
display: flex display: flex
@ -44,8 +52,7 @@
@include button-bg @include button-bg
padding: 10px padding: 10px
flex: 1 flex: 1
margin: 1px border: 1px solid map.get($_theme, "bg-nav")
&:hover, &:focus &:hover, &:focus
border: 1px solid c.$edge-grey border-color: map.get($_theme, "edge-grey")
margin: 0px

2
sass/includes/privacy-page.sass → sass/includes/_privacy-page.sass
View File

@ -1,3 +1,5 @@
$_theme: () !default
.privacy-page .privacy-page
max-width: 600px max-width: 600px
margin: 0 auto margin: 0 auto

6
sass/includes/search-page.sass → sass/includes/_search-page.sass
View File

@ -1,5 +1,7 @@
@use "video-list-item.sass" as * $_theme: () !default
@use "colors.sass" as c
@use "sass:map"
@use "video-list-item" as *
.search-page .search-page
padding: 40px 20px 20px padding: 40px 20px 20px

11
sass/includes/settings-page.sass → sass/includes/_settings-page.sass
View File

@ -1,5 +1,7 @@
@use "forms.sass" as forms $_theme: () !default
@use "colors.sass" as c
@use "sass:map"
@use "forms" as forms
.settings-page .settings-page
padding: 40px 20px 20px padding: 40px 20px 20px
@ -19,8 +21,9 @@
.more-settings .more-settings
margin-top: 24px margin-top: 24px
padding: 12px padding: 12px
border: 1px solid map.get($_theme, "edge-grey")
border-radius: 8px border-radius: 8px
background-color: c.$bg-accent-x background-color: map.get($_theme, "bg-3")
&__list &__list
margin: 0 margin: 0
@ -34,7 +37,7 @@
margin-top: 24px margin-top: 24px
.delete-confirm-container .delete-confirm-container
background: c.$bg-darker background: map.get($_theme, "bg-1")
margin-bottom: -36px margin-bottom: -36px
@include forms.checkbox-hider("delete-confirm") @include forms.checkbox-hider("delete-confirm")

14
sass/includes/subscriptions-page.sass → sass/includes/_subscriptions-page.sass
View File

@ -1,6 +1,8 @@
@use "colors.sass" as c $_theme: () !default
@use "video-list-item.sass" as *
@use "forms.sass" as forms @use "sass:map"
@use "forms" as forms
@use "video-list-item" as *
.subscriptions-page .subscriptions-page
padding: 40px 20px 20px padding: 40px 20px 20px
@ -33,7 +35,11 @@
.name .name
font-size: 22px font-size: 22px
color: c.$fg-main color: map.get($_theme, "fg-main")
.missing-reason
font-size: 16px
color: map.get($_theme, "fg-warning")
@include forms.checkbox-hider("watched-videos-display") @include forms.checkbox-hider("watched-videos-display")

16
sass/includes/_takedown-page.sass Normal file
View File

@ -0,0 +1,16 @@
$_theme: () !default
@use "sass:map"
.takedown-page
max-width: 700px
margin: 0 auto
.new-section
margin-top: 200px
.important-section
padding: 4px 20px
border: 1px solid map.get($_theme, "edge-grey")
color: map.get($_theme, "fg-bright")
background-color: map.get($_theme, "bg-1")

33
sass/includes/video-list-item.sass → sass/includes/_video-list-item.sass
View File

@ -1,5 +1,7 @@
@use "colors.sass" as c $_theme: () !default
@use "_dimensions.sass" as dimensions
@use "sass:map"
@use "_dimensions" as dimensions
// navigator hacks // navigator hacks
.thumbnail > .thumbnail__options-container .thumbnail > .thumbnail__options-container
@ -30,6 +32,7 @@
&__show-more &__show-more
display: block display: block
height: $more-size height: $more-size
color: #fff
line-height: 16px line-height: 16px
font-size: 25px font-size: 25px
text-align: center text-align: center
@ -52,7 +55,7 @@
&__options-list &__options-list
pointer-events: auto pointer-events: auto
display: grid display: grid
background-color: c.$bg-accent background-color: map.get($_theme, "bg-3")
padding: 8px 0px padding: 8px 0px
border-radius: 8px border-radius: 8px
box-shadow: 0 2px 6px 2px #000 box-shadow: 0 2px 6px 2px #000
@ -67,7 +70,7 @@
right: 0 right: 0
transform: translate(-6px, -1px) rotate(-45deg) transform: translate(-6px, -1px) rotate(-45deg)
clip-path: polygon(-5% -20%, 120% -20%, 120% 125%) clip-path: polygon(-5% -20%, 120% -20%, 120% 125%)
background-color: c.$bg-accent background-color: map.get($_theme, "bg-3")
box-shadow: 0px 0px 4px 0px #000 box-shadow: 0px 0px 4px 0px #000
pointer-events: none pointer-events: none
@ -80,7 +83,7 @@
margin-bottom: 12px margin-bottom: 12px
@at-root .video-list-item--watched#{&} @at-root .video-list-item--watched#{&}
background: c.$bg-darker background: map.get($_theme, "bg-dim")
padding: 4px 4px 0px padding: 4px 4px 0px
margin: -4px -4px 8px margin: -4px -4px 8px
@ -93,7 +96,7 @@
.thumbnail .thumbnail
position: relative position: relative
display: flex display: flex
background: c.$bg-darkest background: map.get($_theme, "bg-0")
&__link &__link
font-size: 0 // remove whitespace around the image font-size: 0 // remove whitespace around the image
@ -106,7 +109,7 @@
position: absolute position: absolute
bottom: 3px bottom: 3px
right: 3px right: 3px
color: c.$fg-bright color: #fff
font-size: 14px font-size: 14px
background: rgba(20, 20, 20, 0.85) background: rgba(20, 20, 20, 0.85)
line-height: 1 line-height: 1
@ -119,20 +122,20 @@
line-height: 1.2 line-height: 1.2
.title-link .title-link
color: c.$fg-main color: map.get($_theme, "fg-main")
text-decoration: none text-decoration: none
.author-line .author-line
margin-top: 4px margin-top: 4px
font-size: 15px font-size: 15px
color: c.$fg-dim color: map.get($_theme, "fg-dim")
.author .author
color: c.$fg-dim color: map.get($_theme, "fg-dim")
text-decoration: none text-decoration: none
&:hover, &:active &:hover, &:active
color: c.$fg-bright color: map.get($_theme, "fg-bright")
text-decoration: underline text-decoration: underline
@mixin recommendation-item @mixin recommendation-item
@ -176,15 +179,15 @@
.author-line .author-line
font-size: 15px font-size: 15px
color: c.$fg-main color: map.get($_theme, "fg-main")
.author .author
color: c.$fg-main color: map.get($_theme, "fg-main")
.description .description
margin-top: 16px margin-top: 16px
font-size: 15px font-size: 15px
color: c.$fg-dim color: map.get($_theme, "fg-dim")
+dimensions.thin +dimensions.thin
.description .description
@ -195,7 +198,7 @@
.description b .description b
font-weight: normal font-weight: normal
color: c.$fg-main color: map.get($_theme, "fg-main")
@mixin channel-video @mixin channel-video
@include large-item @include large-item

43
sass/includes/video-page.sass → sass/includes/_video-page.sass
View File

@ -1,11 +1,11 @@
@use "colors.sass" as c $_theme: () !default
@use "video-list-item.sass" as *
@use "sass:map"
@use "video-list-item" as *
.video-page .video-page
display: grid display: grid
grid-auto-flow: row grid-auto-flow: row
padding: 20px
grid-gap: 16px
@media screen and (min-width: 1000px) @media screen and (min-width: 1000px)
grid-template-columns: 1fr 400px grid-template-columns: 1fr 400px
@ -13,10 +13,25 @@
&--recommended-below, &--recommended-hidden &--recommended-below, &--recommended-hidden
grid-template-columns: none grid-template-columns: none
&--recommended-hidden .related-videos &--recommended-side
.related-videos
border-left: 1px solid map.get($_theme, "edge-grey")
padding-left: 12px
padding-right: 20px
background-color: map.get($_theme, "bg-4")
padding-top: 12px
&--recommended-below
.related-videos
padding: 20px
&--recommended-hidden
.related-videos
display: none display: none
.main-video-section .main-video-section
padding: 20px
.video-container .video-container
text-align: center text-align: center
@ -27,7 +42,7 @@
max-height: 80vh max-height: 80vh
.stream-notice .stream-notice
background: c.$bg-darkest background: map.get($_theme, "bg-0")
padding: 4px padding: 4px
.info .info
@ -45,15 +60,15 @@
margin: 0px 0px 4px margin: 0px 0px 4px
font-size: 30px font-size: 30px
font-weight: normal font-weight: normal
color: c.$fg-bright color: map.get($_theme, "fg-bright")
word-break: break-word word-break: break-word
.author-link .author-link
color: c.$fg-main color: map.get($_theme, "fg-main")
text-decoration: none text-decoration: none
&:hover, &:active &:hover, &:active
color: c.$fg-bright color: map.get($_theme, "fg-bright")
text-decoration: underline text-decoration: underline
.info-secondary .info-secondary
@ -75,7 +90,7 @@
margin: 16px 4px margin: 16px 4px
padding: 12px padding: 12px
border-radius: 4px border-radius: 4px
background-color: c.$bg-darkest background-color: map.get($_theme, "bg-0")
&__description &__description
margin-left: 12px margin-left: 12px
@ -85,7 +100,7 @@
&__script-warning &__script-warning
font-size: 15px font-size: 15px
color: c.$fg-warning color: map.get($_theme, "fg-warning")
&__buttons &__buttons
display: flex display: flex
@ -97,12 +112,12 @@
line-height: 1.4 line-height: 1.4
word-break: break-word word-break: break-word
margin: 16px 4px 4px 4px margin: 16px 4px 4px 4px
background-color: c.$bg-accent-area background-color: map.get($_theme, "bg-5")
padding: 12px padding: 12px
border-radius: 4px border-radius: 4px
--regular-background: #{c.$bg-accent-area} --regular-background: #{map.get($_theme, "bg-5")}
--highlight-background: #{c.$bg-darker} --highlight-background: #{map.get($_theme, "bg-1")}
.subscribe-form .subscribe-form
display: inline-block display: inline-block

17
sass/includes/colors.sass
View File

@ -1,17 +0,0 @@
$bg-darkest: #202123
$bg-darker: #303336
$bg-dark: #36393f
$bg-accent: #4f5359
$bg-accent-x: #3f4247
$bg-accent-area: #44474b
$fg-bright: #fff
$fg-main: #ddd
$fg-dim: #bbb
$fg-warning: #fdca6d
$edge-grey: #a0a0a0
$link: #8ac2f9
$power-deep: #c62727

14
sass/includes/takedown-page.sass
View File

@ -1,14 +0,0 @@
@use "colors.sass" as c
.takedown-page
max-width: 700px
margin: 0 auto
.new-section
margin-top: 200px
.important-section
padding: 4px 20px
border: 1px solid c.$edge-grey
color: c.$fg-bright
background-color: c.$bg-darker

2
sass/light.sass Normal file
View File

@ -0,0 +1,2 @@
@use "themes/light" as *
@use "includes/main" with ($_theme: $theme)

27
sass/theme-modules/_edgeless.sass Normal file
View File

@ -0,0 +1,27 @@
$_theme: () !default
@use "sass:map"
// remove separating edges
.main-nav, .footer__center, .video-page--recommended-side .related-videos
border: none
// no background change to recommended videos sidebar
.video-page--recommended-side .related-videos
background-color: map.get($_theme, "bg-2")
// navigation shadow
.main-nav
position: relative // needed for box shadow to overlap related videos section
box-shadow: 0px 0px 20px 5px rgba(0, 0, 0, 0.1)
// thumbnail dropdown menu dividers
.menu-look
border-color: map.get($_theme, "bg-0")
// details areas
details, .checkbox-hider__container, .more-settings
border: none
details[open] summary
border: none
margin-bottom: 4px

38
sass/themes/_dark.scss Normal file
View File

@ -0,0 +1,38 @@
// Defined in scss file instead of sass because indented syntax does not have multiline maps
// https://github.com/sass/sass/issues/216
@use "sass:map";
// This section is for colour shades
$theme: (
// darker
"bg-0": #252628,
"bg-1": #303336,
// regular
"bg-2": #36393f,
// lighter
"bg-3": #3f4247, // slightly
"bg-4": #44474b, // noticably
"bg-5": #4f5359, // brightly
"fg-bright": #fff,
"fg-main": #ddd,
"fg-dim": #bbb,
"fg-warning": #fdca6d,
"edge-grey": #a0a0a0,
"placeholder": #c4c4c4,
"link": #8ac2f9,
"power-deep": #c62727,
"power-fg": "#fff",
"image-dropdown": url(/static/images/arrow-down-wide-dark.svg)
);
// This section is for colour meanings
$theme: map.merge($theme, (
"bg-dim": map.get($theme, "bg-0"),
"bg-nav": map.get($theme, "bg-5"),
));

8
sass/themes/_edgeless-light.scss Normal file
View File

@ -0,0 +1,8 @@
// extend regular light theme to change a couple of shades
@use "light";
@use "sass:map";
// this section is for colour meanings
$theme: map.merge(light.$theme, (
"edge-grey": #c0c0c0,
));

38
sass/themes/_light.scss Normal file
View File

@ -0,0 +1,38 @@
// Defined in scss file instead of sass because indented syntax does not have multiline maps
// https://github.com/sass/sass/issues/216
@use "sass:map";
// this section is for colour shades
$theme: (
// lighter
"bg-0": #fff,
"bg-1": #fff,
// regular
"bg-2": #f2f2f2,
// darker
"bg-3": #e8e8e8, // slightly
"bg-4": #dadada, // noticably
"bg-5": #d0d0d0, // brightly
"fg-bright": #000,
"fg-main": #202020,
"fg-dim": #454545,
"fg-warning": #ce8600,
"edge-grey": #909090,
"placeholder": #636363,
"link": #0b51d4,
"power-deep": #c62727,
"power-fg": #fff,
"image-dropdown": url(/static/images/arrow-down-wide-light.svg)
);
// this section is for colour meanings
$theme: map.merge($theme, (
"bg-dim": map.get($theme, "bg-4"),
"bg-nav": map.get($theme, "bg-0")
));

12
server.js
View File

@ -1,9 +1,11 @@
const {Pinski} = require("pinski") const {Pinski} = require("pinski")
const {setInstance} = require("pinski/plugins") const {setInstance} = require("pinski/plugins")
const constants = require("./utils/constants") const constants = require("./utils/constants")
const iconLoader = require("./utils/icon-loader").icons
;(async () => { ;(async () => {
await require("./utils/upgradedb")() await require("./utils/upgradedb")()
const icons = await iconLoader
const server = new Pinski({ const server = new Pinski({
port: 10412, port: 10412,
@ -13,19 +15,19 @@ const constants = require("./utils/constants")
setInstance(server) setInstance(server)
server.pugDefaultLocals.constants = constants server.pugDefaultLocals.constants = constants
server.pugDefaultLocals.icons = icons
server.muteLogsStartingWith("/vi/") server.muteLogsStartingWith("/vi/")
server.muteLogsStartingWith("/favicon") server.muteLogsStartingWith("/favicon")
server.muteLogsStartingWith("/static") server.muteLogsStartingWith("/static")
server.addSassDir("sass", ["sass/includes"]) server.addSassDir("sass", ["sass/includes", "sass/themes", "sass/theme-modules"])
server.addRoute("/static/css/main.css", "sass/main.sass", "sass") server.addRoute("/static/css/dark.css", "sass/dark.sass", "sass")
server.addRoute("/static/css/light.css", "sass/light.sass", "sass")
server.addRoute("/static/css/edgeless-light.css", "sass/edgeless-light.sass", "sass")
server.addPugDir("pug", ["pug/includes"]) server.addPugDir("pug", ["pug/includes"])
server.addPugDir("pug/errors") server.addPugDir("pug/errors")
server.addRoute("/cant-think", "pug/cant-think.pug", "pug")
server.addRoute("/privacy", "pug/privacy.pug", "pug")
server.addRoute("/licenses", "pug/licenses.pug", "pug")
server.addStaticHashTableDir("html/static/js") server.addStaticHashTableDir("html/static/js")
server.addStaticHashTableDir("html/static/js/elemjs") server.addStaticHashTableDir("html/static/js/elemjs")

5
utils/constants.js
View File

@ -9,6 +9,10 @@ let constants = {
type: "string", type: "string",
default: "http://localhost:3000" default: "http://localhost:3000"
}, },
theme: {
type: "integer",
default: 0
},
save_history: { save_history: {
type: "boolean", type: "boolean",
default: false default: false
@ -46,6 +50,7 @@ let constants = {
csrf_time: 4*60*60*1000, csrf_time: 4*60*60*1000,
seen_token_subscriptions_eligible: 40*60*60*1000, seen_token_subscriptions_eligible: 40*60*60*1000,
subscriptions_refresh_loop_min: 5*60*1000, subscriptions_refresh_loop_min: 5*60*1000,
subscriptions_refesh_fake_not_found_cooldown: 10*60*1000,
}, },
// Pattern matching. // Pattern matching.

4
utils/getuser.js
View File

@ -54,7 +54,7 @@ class User {
getSubscriptions() { getSubscriptions() {
if (this.token) { if (this.token) {
return db.prepare("SELECT ucid FROM Subscriptions WHERE token = ? AND channel_missing = 0").pluck().all(this.token) return db.prepare("SELECT ucid FROM Subscriptions WHERE token = ?").pluck().all(this.token)
} else { } else {
return [] return []
} }
@ -62,7 +62,7 @@ class User {
isSubscribed(ucid) { isSubscribed(ucid) {
if (this.token) { if (this.token) {
return !!db.prepare("SELECT * FROM Subscriptions WHERE token = ? AND ucid = ? AND channel_missing = 0").get([this.token, ucid]) return !!db.prepare("SELECT * FROM Subscriptions WHERE token = ? AND ucid = ?").get([this.token, ucid])
} else { } else {
return false return false
} }

8
utils/icon-loader.js Normal file
View File

@ -0,0 +1,8 @@
const fs = require("fs").promises
const names = ["subscriptions", "settings"]
const icons = names.map(name => fs.readFile(`html/static/images/${name}.svg`, "utf8"))
module.exports.icons = Promise.all(icons).then(resolvedIcons => {
return new Map(names.map((name, index) => [name, resolvedIcons[index]]))
})

27
utils/upgradedb.js
View File

@ -70,6 +70,31 @@ const deltas = [
.run() .run()
db.prepare("CREATE TABLE TakedownChannels (ucid TEXT NOT NULL, org TEXT, url TEXT, PRIMARY KEY (ucid))") db.prepare("CREATE TABLE TakedownChannels (ucid TEXT NOT NULL, org TEXT, url TEXT, PRIMARY KEY (ucid))")
.run() .run()
},
// 11: Settings +theme
function() {
db.prepare("ALTER TABLE Settings ADD COLUMN theme INTEGER DEFAULT 0")
.run()
},
// 12: Channels +missing +missing_reason, Subscriptions -
// Better management for missing channels
// We totally discard the existing Subscriptions.channel_missing since it is unreliable.
function() {
db.prepare("ALTER TABLE Channels ADD COLUMN missing INTEGER NOT NULL DEFAULT 0")
.run()
db.prepare("ALTER TABLE Channels ADD COLUMN missing_reason TEXT")
.run()
// https://www.sqlite.org/lang_altertable.html#making_other_kinds_of_table_schema_changes
db.transaction(() => {
db.prepare("CREATE TABLE NEW_Subscriptions (token TEXT NOT NULL, ucid TEXT NOT NULL, PRIMARY KEY (token, ucid))")
.run()
db.prepare("INSERT INTO NEW_Subscriptions (token, ucid) SELECT token, ucid FROM Subscriptions")
.run()
db.prepare("DROP TABLE Subscriptions")
.run()
db.prepare("ALTER TABLE NEW_Subscriptions RENAME TO Subscriptions")
.run()
})()
} }
] ]
@ -82,7 +107,7 @@ async function createBackup(entry) {
/** /**
* @param {number} entry * @param {number} entry
* @param {boolean} log * @param {boolean} [log]
*/ */
function runDelta(entry, log) { function runDelta(entry, log) {
process.stdout.write(`Upgrading database to version ${entry}... `) process.stdout.write(`Upgrading database to version ${entry}... `)

58
utils/youtube.js
View File

@ -1,15 +1,59 @@
const {request} = require("./request") const {request} = require("./request")
const db = require("./db") const db = require("./db")
async function fetchChannel(ucid, instance) { async function fetchChannel(path, ucid, instance) {
if (!instance) throw new Error("No instance parameter provided") function updateGoodData(channel) {
// fetch
const channel = await request(`${instance}/api/v1/channels/${ucid}`).then(res => res.json())
// update database
const bestIcon = channel.authorThumbnails.slice(-1)[0] const bestIcon = channel.authorThumbnails.slice(-1)[0]
const iconURL = bestIcon ? bestIcon.url : null const iconURL = bestIcon ? bestIcon.url : null
db.prepare("REPLACE INTO Channels (ucid, name, icon_url) VALUES (?, ?, ?)").run([channel.authorId, channel.author, iconURL]) db.prepare("REPLACE INTO Channels (ucid, name, icon_url, missing, missing_reason) VALUES (?, ?, ?, 0, NULL)").run(channel.authorId, channel.author, iconURL)
// return }
function updateBadData(channel) {
if (channel.identifier === "NOT_FOUND" || channel.identifier === "ACCOUNT_TERMINATED") {
db.prepare("UPDATE Channels SET missing = 1, missing_reason = ? WHERE ucid = ?").run(channel.error, channel.authorId)
return {
missing: true,
message: channel.error
}
} else {
return {
missing: false,
message: channel.error
}
}
}
if (!instance) throw new Error("No instance parameter provided")
const row = db.prepare("SELECT * FROM Channels WHERE ucid = ?").get(ucid)
// handle the case where the channel has a known error
if (row && row.missing_reason) {
return {
error: true,
ucid,
row,
missing: true,
message: row.missing_reason
}
}
/** @type {any} */
const channel = await request(`${instance}/api/v1/channels/${ucid}?second__path=${path}`).then(res => res.json())
// handle the case where the channel has a newly discovered error
if (channel.error) {
const missingData = updateBadData(channel)
return {
error: true,
ucid,
row,
...missingData
}
}
// handle the case where the channel returns good data (this is the only remaining scenario)
updateGoodData(channel)
return channel return channel
} }