Salastil/nitter
1
0
Fork 0
Code Activity

Support preference overrides using URL params

Browse Source 
Fixes #186
This commit is contained in:
Zed
2026-02-09 21:54:57 +01:00
parent db36f75519
commit b85e8c5d7d
20 changed files with 70 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/embed.nim
+1 -1
View File
@@ -19,7 +19,7 @@ proc createEmbedRouter*(cfg: Config) =
get "/@user/status/@id/embed":
let
tweet = await getGraphTweetResult(@"id")
prefs = cookiePrefs()
prefs = requestPrefs()
path = getPath()
if tweet == nil:
src/routes/list.nim
+2 -2
View File
@@ -36,7 +36,7 @@ proc createListRouter*(cfg: Config) =
get "/i/lists/@id/?":
cond '.' notin @"id"
let
prefs = cookiePrefs()
prefs = requestPrefs()
list = await getCachedList(id=(@"id"))
timeline = await getGraphListTweets(list.id, getCursor())
vnode = renderTimelineTweets(timeline, prefs, request.path)
@@ -45,7 +45,7 @@ proc createListRouter*(cfg: Config) =
get "/i/lists/@id/members":
cond '.' notin @"id"
let
prefs = cookiePrefs()
prefs = requestPrefs()
list = await getCachedList(id=(@"id"))
members = await getGraphListMembers(list, getCursor())
respList(list, members, list.title, renderTimelineUsers(members, prefs, request.path))
src/routes/media.nim
+1 -1
View File
@@ -143,6 +143,6 @@ proc createMediaRouter*(cfg: Config) =
if ".m3u8" in url:
let vid = await safeFetch(url)
content = proxifyVideo(vid, cookiePref(proxyVideos))
content = proxifyVideo(vid, requestPrefs().proxyVideos)
resp content, m3u8Mime
src/routes/preferences.nim
+1 -1
View File
@@ -19,7 +19,7 @@ proc createPrefRouter*(cfg: Config) =
router preferences:
get "/settings":
let
prefs = cookiePrefs()
prefs = requestPrefs()
prefsCode = encodePrefs(prefs)
prefsUrl = getUrlPrefix(cfg) & "/?prefs=" & prefsCode
html = renderPreferences(prefs, refPath(), findThemes(cfg.staticDir), prefsUrl)
src/routes/resolver.nim
+2 -2
View File
@@ -18,8 +18,8 @@ proc createResolverRouter*(cfg: Config) =
router resolver:
get "/cards/@card/@id":
let url = "https://cards.twitter.com/cards/$1/$2" % [@"card", @"id"]
respResolved(await resolve(url, cookiePrefs()), "card")
respResolved(await resolve(url, requestPrefs()), "card")
get "/t.co/@url":
let url = "https://t.co/" & @"url"
respResolved(await resolve(url, cookiePrefs()), "t.co")
respResolved(await resolve(url, requestPrefs()), "t.co")
src/routes/router_utils.nim
+13 -19
View File
@@ -1,24 +1,21 @@
# SPDX-License-Identifier: AGPL-3.0-only
import strutils, sequtils, uri, tables, json, base64
import strutils, sequtils, uri, tables, json
from jester import Request, cookies
import ../views/general
import ".."/[utils, prefs, types]
export utils, prefs, types, uri, base64
export utils, prefs, types, uri
template savePref*(pref, value: string; req: Request; expire=false) =
if not expire or pref in cookies(req):
setCookie(pref, value, daysForward(when expire: -10 else: 360),
httpOnly=true, secure=cfg.useHttps, sameSite=None, path="/")
template cookiePrefs*(): untyped {.dirty.} =
getPrefs(cookies(request))
template cookiePref*(pref): untyped {.dirty.} =
getPref(cookies(request), pref)
template requestPrefs*(): untyped {.dirty.} =
getPrefs(cookies(request), params(request))
template showError*(error: string; cfg: Config): string =
renderMain(renderError(error), request, cfg, cookiePrefs(), "Error")
renderMain(renderError(error), request, cfg, requestPrefs(), "Error")
template getPath*(): untyped {.dirty.} =
$(parseUri(request.path) ? filterParams(request.params))
@@ -40,17 +37,14 @@ proc getNames*(name: string): seq[string] =
template applyUrlPrefs*() {.dirty.} =
if @"prefs".len > 0:
try:
let decoded = decode(@"prefs")
var params = initTable[string, string]()
for pair in decoded.split('&'):
let kv = pair.split('=', maxsplit=1)
if kv.len == 2:
params[kv[0]] = kv[1]
elif kv.len == 1 and kv[0].len > 0:
params[kv[0]] = ""
genApplyPrefs(params, request)
except: discard
var prefParams = initTable[string, string]()
for pair in @"prefs".split(','):
let kv = pair.split('=', maxsplit=1)
if kv.len == 2:
prefParams[kv[0]] = kv[1]
elif kv.len == 1 and kv[0].len > 0:
prefParams[kv[0]] = ""
genApplyPrefs(prefParams, request)
# Rebuild URL without prefs param
var params: seq[(string, string)]
src/routes/rss.nim
+12 -7
View File
@@ -15,7 +15,7 @@ proc redisKey*(page, name, cursor: string): string =
if cursor.len > 0:
result &= ":" & cursor
proc timelineRss*(req: Request; cfg: Config; query: Query): Future[Rss] {.async.} =
proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs): Future[Rss] {.async.} =
var profile: Profile
let
name = req.params.getOrDefault("name")
@@ -39,7 +39,7 @@ proc timelineRss*(req: Request; cfg: Config; query: Query): Future[Rss] {.async.
return Rss(feed: profile.user.username, cursor: "suspended")
if profile.user.fullname.len > 0:
let rss = renderTimelineRss(profile, cfg, multi=(names.len > 1))
let rss = renderTimelineRss(profile, cfg, prefs, multi=(names.len > 1))
return Rss(feed: rss, cursor: profile.tweets.bottom)
template respRss*(rss, page) =
@@ -64,7 +64,9 @@ proc createRssRouter*(cfg: Config) =
if @"q".len > 200:
resp Http400, showError("Search input too long.", cfg)
let query = initQuery(params(request))
let
prefs = requestPrefs()
query = initQuery(params(request))
if query.kind != tweets:
resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg)
@@ -78,7 +80,7 @@ proc createRssRouter*(cfg: Config) =
let tweets = await getGraphTweetSearch(query, cursor)
rss.cursor = tweets.bottom
rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg)
rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg, prefs)
await cacheRss(key, rss)
respRss(rss, "Search")
@@ -87,6 +89,7 @@ proc createRssRouter*(cfg: Config) =
cond cfg.enableRss
cond '.' notin @"name"
let
prefs = requestPrefs()
name = @"name"
key = redisKey("twitter", name, getCursor())
@@ -94,7 +97,7 @@ proc createRssRouter*(cfg: Config) =
if rss.cursor.len > 0:
respRss(rss, "User")
rss = await timelineRss(request, cfg, Query(fromUser: @[name]))
rss = await timelineRss(request, cfg, Query(fromUser: @[name]), prefs)
await cacheRss(key, rss)
respRss(rss, "User")
@@ -104,6 +107,7 @@ proc createRssRouter*(cfg: Config) =
cond '.' notin @"name"
cond @"tab" in ["with_replies", "media", "search"]
let
prefs = requestPrefs()
name = @"name"
tab = @"tab"
query =
@@ -122,7 +126,7 @@ proc createRssRouter*(cfg: Config) =
if rss.cursor.len > 0:
respRss(rss, "User")
rss = await timelineRss(request, cfg, query)
rss = await timelineRss(request, cfg, query, prefs)
await cacheRss(key, rss)
respRss(rss, "User")
@@ -147,6 +151,7 @@ proc createRssRouter*(cfg: Config) =
get "/i/lists/@id/rss":
cond cfg.enableRss
let
prefs = requestPrefs()
id = @"id"
cursor = getCursor()
key = redisKey("lists", id, cursor)
@@ -159,7 +164,7 @@ proc createRssRouter*(cfg: Config) =
list = await getCachedList(id=id)
timeline = await getGraphListTweets(list.id, cursor)
rss.cursor = timeline.bottom
rss.feed = renderListRss(timeline.content, list, cfg)
rss.feed = renderListRss(timeline.content, list, cfg, prefs)
await cacheRss(key, rss)
respRss(rss, "List")
src/routes/search.nim
+1 -1
View File
@@ -19,7 +19,7 @@ proc createSearchRouter*(cfg: Config) =
resp Http400, showError("Search input too long.", cfg)
let
prefs = cookiePrefs()
prefs = requestPrefs()
query = initQuery(params(request))
title = "Search" & (if q.len > 0: " (" & q & ")" else: "")
src/routes/status.nim
+1 -1
View File
@@ -21,7 +21,7 @@ proc createStatusRouter*(cfg: Config) =
if id.len > 19 or id.any(c => not c.isDigit):
resp Http404, showError("Invalid tweet ID", cfg)
let prefs = cookiePrefs()
let prefs = requestPrefs()
# used for the infinite scroll feature
if @"scroll".len > 0:
src/routes/timeline.nim
+1 -1
View File
@@ -117,7 +117,7 @@ proc createTimelineRouter*(cfg: Config) =
cond @"name".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9', '_', ','})
cond @"tab" in ["with_replies", "media", "search", ""]
let
prefs = cookiePrefs()
prefs = requestPrefs()
after = getCursor()
names = getNames(@"name")
src/routes/unsupported.nim
+1 -1
View File
@@ -10,7 +10,7 @@ export feature
proc createUnsupportedRouter*(cfg: Config) =
router unsupported:
template feature {.dirty.} =
resp renderMain(renderFeature(), request, cfg, cookiePrefs())
resp renderMain(renderFeature(), request, cfg, requestPrefs())
get "/about/feature": feature()
get "/login/?@i?": feature()