Refactor hostname to be a runtime option

Add a `hostname` field under Server in your conf file, see the
updated nitter.conf in the repo for an example. The compile-time
option (-d:hostname) is no longer used.
This commit is contained in:
Zed
2019-10-21 05:19:00 +02:00
parent 3218cc4069
commit de62eedea5
19 changed files with 91 additions and 85 deletions

View File

@@ -8,46 +8,46 @@ import ../views/general
include "../views/rss.nimf"
proc showRss*(name: string; query: Query): Future[string] {.async.} =
proc showRss*(name, hostname: string; query: Query): Future[string] {.async.} =
let (profile, timeline, _) = await fetchSingleTimeline(name, "", getAgent(), query)
if timeline != nil:
return renderTimelineRss(timeline, profile)
return renderTimelineRss(timeline, profile, hostname)
template respRss*(rss: typed) =
if rss.len == 0:
halt Http404, showError("User \"" & @"name" & "\" not found", cfg.title)
halt Http404, showError("User \"" & @"name" & "\" not found", cfg)
resp rss, "application/rss+xml;charset=utf-8"
proc createRssRouter*(cfg: Config) =
router rss:
get "/search/rss":
if @"q".len > 200:
resp Http400, showError("Search input too long.", cfg.title)
resp Http400, showError("Search input too long.", cfg)
let query = initQuery(params(request))
if query.kind != tweets:
resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg.title)
resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg)
let tweets = await getSearch[Tweet](query, "", getAgent())
respRss(renderSearchRss(tweets.content, query.text, genQueryUrl(query)))
respRss(renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg.hostname))
get "/@name/rss":
cond '.' notin @"name"
respRss(await showRss(@"name", Query()))
respRss(await showRss(@"name", cfg.hostname, Query()))
get "/@name/with_replies/rss":
cond '.' notin @"name"
respRss(await showRss(@"name", getReplyQuery(@"name")))
respRss(await showRss(@"name", cfg.hostname, getReplyQuery(@"name")))
get "/@name/media/rss":
cond '.' notin @"name"
respRss(await showRss(@"name", getMediaQuery(@"name")))
respRss(await showRss(@"name", cfg.hostname, getMediaQuery(@"name")))
get "/@name/search/rss":
cond '.' notin @"name"
respRss(await showRss(@"name", initQuery(params(request), name=(@"name"))))
respRss(await showRss(@"name", cfg.hostname, initQuery(params(request), name=(@"name"))))
get "/@name/lists/@list/rss":
cond '.' notin @"name"
let list = await getListTimeline(@"name", @"list", getAgent(), "")
respRss(renderListRss(list.content, @"name", @"list"))
respRss(renderListRss(list.content, @"name", @"list", cfg.hostname))