From 36c63bc1828456bf3417ff9eb5187cfcb776b3b2 Mon Sep 17 00:00:00 2001 From: cel Date: Wed, 22 Aug 2018 11:47:40 -0700 Subject: [PATCH] Consolidate serve functions --- index.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/index.js b/index.js index c1f05f0..9441ae2 100644 --- a/index.js +++ b/index.js @@ -81,6 +81,9 @@ exports.init = function (sbot, config) { var m = urlIdRegex.exec(req.url) + if (m[4] === '/robots.txt') return serveRobots(req, res, conf) + if (req.url.startsWith('/static/')) return serveStatic(req, res, m[4]) + if (req.url.startsWith('/emoji/')) return serveEmoji(req, res, m[4]) if (req.url.startsWith('/user-feed/')) return serveUserFeed(req, res, m[4]) else if (req.url.startsWith('/channel/')) return serveChannel(req, res, m[4]) else if (req.url.startsWith('/.well-known/acme-challenge')) return serveAcmeChallenge(req, res) @@ -94,8 +97,8 @@ exports.init = function (sbot, config) { case '%': return serveId(req, res, m[1], m[3], m[5]) case '@': return serveFeed(req, res, m[1], m[3], m[5]) case '&': return serveBlob(req, res, sbot, m[1]) - default: return servePath(req, res, m[4], conf) } + return respond(res, 404, 'Not found') } function serveFeed(req, res, feedId, ext) { @@ -496,18 +499,6 @@ function ctype(name) { } } -function servePath(req, res, url, conf) { - switch (url) { - case '/robots.txt': return serveRobots(req, res, conf) - } - var m = /^(\/?[^\/]*)(\/.*)?$/.exec(url) - switch (m[1]) { - case '/static': return serveStatic(req, res, m[2]) - case '/emoji': return serveEmoji(req, res, m[2]) - } - return respond(res, 404, 'Not found') -} - function ifModified(req, lastMod) { var ifModSince = req.headers['if-modified-since'] if (!ifModSince) return false