kuu7o/nitter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor hostname to be a runtime option

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/list.nim
View File

@@ -8,10 +8,10 @@ import ../views/[general, timeline, list]
template respList*(list, timeline: typed) =
if list.minId.len == 0:
halt Http404, showError("List \"" & @"list" & "\" not found", cfg.title)
halt Http404, showError("List \"" & @"list" & "\" not found", cfg)
let html = renderList(timeline, list.query, @"name", @"list")
let rss = "/$1/lists/$2/rss" % [@"name", @"list"]
resp renderMain(html, request, cfg.title, rss=rss)
resp renderMain(html, request, cfg, rss=rss)
proc createListRouter*(cfg: Config) =
router list:

2
src/routes/media.nim
View File

@@ -68,7 +68,7 @@ proc createMediaRouter*(cfg: Config) =
let prefs = cookiePrefs()
if getHmac(url) != @"sig":
resp showError("Failed to verify signature", cfg.title)
resp showError("Failed to verify signature", cfg)
let client = newAsyncHttpClient()
var content = await client.getContent(url)

4
src/routes/preferences.nim
View File

@@ -15,7 +15,7 @@ proc createPrefRouter*(cfg: Config) =
get "/settings":
let html = renderPreferences(cookiePrefs(), refPath())
resp renderMain(html, request, cfg.title, "Preferences")
resp renderMain(html, request, cfg, "Preferences")
get "/settings/@i?":
redirect("/settings")
@@ -28,7 +28,7 @@ proc createPrefRouter*(cfg: Config) =
post "/resetprefs":
var prefs = cookiePrefs()
resetPrefs(prefs)
resetPrefs(prefs, cfg.hostname)
savePrefs()
redirect($(parseUri("/settings") ? filterParams(request.params)))

2
src/routes/router_utils.nim
View File

@@ -2,7 +2,7 @@ import ../utils, ../prefs
export utils, prefs
template cookiePrefs*(): untyped {.dirty.} =
getPrefs(request.cookies.getOrDefault("preferences"))
getPrefs(request.cookies.getOrDefault("preferences"), cfg.hostname)
template getPath*(): untyped {.dirty.} =
$(parseUri(request.path) ? filterParams(request.params))

22
src/routes/rss.nim
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))

10
src/routes/search.nim
View File

@@ -12,7 +12,7 @@ proc createSearchRouter*(cfg: Config) =
router search:
get "/search/?":
if @"q".len > 200:
resp Http400, showError("Search input too long.", cfg.title)
resp Http400, showError("Search input too long.", cfg)
let prefs = cookiePrefs()
let query = initQuery(params(request))
@@ -22,14 +22,14 @@ proc createSearchRouter*(cfg: Config) =
if "," in @"q":
redirect("/" & @"q")
let users = await getSearch[Profile](query, @"max_position", getAgent())
resp renderMain(renderUserSearch(users, prefs), request, cfg.title)
resp renderMain(renderUserSearch(users, prefs), request, cfg)
of tweets:
let tweets = await getSearch[Tweet](query, @"max_position", getAgent())
let rss = "/search/rss?" & genQueryUrl(query)
resp renderMain(renderTweetSearch(tweets, prefs, getPath()), request,
cfg.title, rss=rss)
resp renderMain(renderTweetSearch(tweets, prefs, getPath()),
request, cfg, rss=rss)
else:
halt Http404, showError("Invalid search", cfg.title)
halt Http404, showError("Invalid search", cfg)
get "/hashtag/@hash":
redirect("/search?q=" & encodeUrl("#" & @"hash"))

8
src/routes/status.nim
View File

@@ -22,7 +22,7 @@ proc createStatusRouter*(cfg: Config) =
var error = "Tweet not found"
if conversation != nil and conversation.tweet.tombstone.len > 0:
error = conversation.tweet.tombstone
halt Http404, showError(error, cfg.title)
halt Http404, showError(error, cfg)
let
title = pageTitle(conversation.tweet.profile)
@@ -32,15 +32,15 @@ proc createStatusRouter*(cfg: Config) =
if conversation.tweet.video.isSome():
let thumb = get(conversation.tweet.video).thumb
let vidUrl = getVideoEmbed(conversation.tweet.id)
resp renderMain(html, request, cfg.title, title, desc, images = @[thumb],
resp renderMain(html, request, cfg, title, desc, images = @[thumb],
`type`="video", video=vidUrl)
elif conversation.tweet.gif.isSome():
let thumb = get(conversation.tweet.gif).thumb
let vidUrl = getVideoEmbed(conversation.tweet.id)
resp renderMain(html, request, cfg.title, title, desc, images = @[thumb],
resp renderMain(html, request, cfg, title, desc, images = @[thumb],
`type`="video", video=vidUrl)
else:
resp renderMain(html, request, cfg.title, title, desc,
resp renderMain(html, request, cfg, title, desc,
images=conversation.tweet.photos, `type`="photo")
get "/@name/status/@id/photo/@i":

16
src/routes/timeline.nim
View File

@@ -51,7 +51,7 @@ proc get*(req: Request; key: string): string =
if key in params(req): params(req)[key]
else: ""
proc showTimeline*(request: Request; query: Query; title, rss: string): Future[string] {.async.} =
proc showTimeline*(request: Request; query: Query; cfg: Config; rss: string): Future[string] {.async.} =
let
agent = getAgent()
prefs = cookiePrefs()
@@ -63,16 +63,16 @@ proc showTimeline*(request: Request; query: Query; title, rss: string): Future[s
let (p, t, r) = await fetchSingleTimeline(names[0], after, agent, query)
if p.username.len == 0: return
let pHtml = renderProfile(p, t, r, prefs, getPath())
return renderMain(pHtml, request, title, pageTitle(p), pageDesc(p), rss=rss)
return renderMain(pHtml, request, cfg, pageTitle(p), pageDesc(p), rss=rss)
else:
let
timeline = await fetchMultiTimeline(names, after, agent, query)
html = renderTweetSearch(timeline, prefs, getPath())
return renderMain(html, request, title, "Multi")
return renderMain(html, request, cfg, "Multi")
template respTimeline*(timeline: typed) =
if timeline.len == 0:
halt Http404, showError("User \"" & @"name" & "\" not found", cfg.title)
halt Http404, showError("User \"" & @"name" & "\" not found", cfg)
resp timeline
proc createTimelineRouter*(cfg: Config) =
@@ -82,20 +82,20 @@ proc createTimelineRouter*(cfg: Config) =
get "/@name/?":
cond '.' notin @"name"
let rss = "/$1/rss" % @"name"
respTimeline(await showTimeline(request, Query(), cfg.title, rss))
respTimeline(await showTimeline(request, Query(), cfg, rss))
get "/@name/with_replies":
cond '.' notin @"name"
let rss = "/$1/with_replies/rss" % @"name"
respTimeline(await showTimeline(request, getReplyQuery(@"name"), cfg.title, rss))
respTimeline(await showTimeline(request, getReplyQuery(@"name"), cfg, rss))
get "/@name/media":
cond '.' notin @"name"
let rss = "/$1/media/rss" % @"name"
respTimeline(await showTimeline(request, getMediaQuery(@"name"), cfg.title, rss))
respTimeline(await showTimeline(request, getMediaQuery(@"name"), cfg, rss))
get "/@name/search":
cond '.' notin @"name"
let query = initQuery(params(request), name=(@"name"))
let rss = "/$1/search/rss?$2" % [@"name", genQueryUrl(query)]
respTimeline(await showTimeline(request, query, cfg.title, rss))
respTimeline(await showTimeline(request, query, cfg, rss))

8
src/routes/unsupported.nim
View File

@@ -7,14 +7,14 @@ import ../views/[general, about]
proc createUnsupportedRouter*(cfg: Config) =
router unsupported:
get "/about/feature":
resp renderMain(renderFeature(), request, cfg.title)
resp renderMain(renderFeature(), request, cfg)
get "/intent/?@i?":
resp renderMain(renderFeature(), request, cfg.title)
resp renderMain(renderFeature(), request, cfg)
get "/login/?@i?":
resp renderMain(renderFeature(), request, cfg.title)
resp renderMain(renderFeature(), request, cfg)
get "/i/@i?/?@j?":
cond @"i" != "status"
resp renderMain(renderFeature(), request, cfg.title)
resp renderMain(renderFeature(), request, cfg)