Qualify QueryKind.media to fix Nim 2.0.x build

Fixes #1422
This commit is contained in:
Zed 2026-07-09 11:32:31 +02:00
commit 8394b044ef
6 changed files with 12 additions and 12 deletions

View file

@ -34,7 +34,7 @@ proc initQuery*(pms: Table[string, string]; name=""): Query =
proc getMediaQuery*(name: string): Query = proc getMediaQuery*(name: string): Query =
Query( Query(
kind: media, kind: QueryKind.media,
filters: @["twimg", "native_video"], filters: @["twimg", "native_video"],
fromUser: @[name], fromUser: @[name],
sep: "OR" sep: "OR"
@ -64,7 +64,7 @@ proc genQueryParam*(query: Query; maxId=""): string =
else: else:
param &= ")" param &= ")"
if query.fromUser.len > 0 and query.kind in {posts, media}: if query.fromUser.len > 0 and query.kind in {posts, QueryKind.media}:
param &= " (filter:self_threads OR -filter:replies)" param &= " (filter:self_threads OR -filter:replies)"
if "nativeretweets" notin query.excludes: if "nativeretweets" notin query.excludes:
@ -106,7 +106,7 @@ proc genQueryUrl*(query: Query): string =
# media doubles as the profile media tab, where f isn't part of the URL scheme # media doubles as the profile media tab, where f isn't part of the URL scheme
if query.kind in {tweets, users, lists, top} or if query.kind in {tweets, users, lists, top} or
(query.kind == media and query.fromUser.len == 0): (query.kind == QueryKind.media and query.fromUser.len == 0):
params.add &"f={query.kind}" params.add &"f={query.kind}"
if query.text.len > 0: if query.text.len > 0:
params.add "q=" & encodeUrl(query.text) params.add "q=" & encodeUrl(query.text)

View file

@ -68,7 +68,7 @@ proc createRssRouter*(cfg: Config) =
let let
prefs = requestPrefs() prefs = requestPrefs()
query = initQuery(params(request)) query = initQuery(params(request))
if query.kind notin {tweets, top, media}: if query.kind notin {QueryKind.tweets, QueryKind.top, QueryKind.media}:
resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg) resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg)
let let

View file

@ -53,7 +53,7 @@ proc fetchProfile*(after: string; query: Query; skipRail=false): Future[Profile]
let let
rail = rail =
skipIf(skipRail or query.kind == media, @[]): skipIf(skipRail or query.kind == QueryKind.media, @[]):
getCachedPhotoRail(userId) getCachedPhotoRail(userId)
user = getCachedUser(name) user = getCachedUser(name)

View file

@ -115,7 +115,7 @@ proc renderProtected*(username: string): VNode =
proc renderProfile*(profile: var Profile; prefs: Prefs; path: string): VNode = proc renderProfile*(profile: var Profile; prefs: Prefs; path: string): VNode =
profile.tweets.query.fromUser = @[profile.user.username] profile.tweets.query.fromUser = @[profile.user.username]
let let
isGalleryView = profile.tweets.query.kind == media and isGalleryView = profile.tweets.query.kind == QueryKind.media and
profile.tweets.query.view == "gallery" profile.tweets.query.view == "gallery"
viewClass = if isGalleryView: " media-only" else: "" viewClass = if isGalleryView: " media-only" else: ""

View file

@ -120,7 +120,7 @@ proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string;
pinned=none(Tweet)): VNode = pinned=none(Tweet)): VNode =
let query = results.query let query = results.query
let containerClass = let containerClass =
if query.fromUser.len == 0 and query.kind == media and if query.fromUser.len == 0 and query.kind == QueryKind.media and
query.view == "gallery": "timeline-container media-only" query.view == "gallery": "timeline-container media-only"
else: "timeline-container" else: "timeline-container"
buildHtml(tdiv(class=containerClass)): buildHtml(tdiv(class=containerClass)):
@ -129,18 +129,18 @@ proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string;
text query.fromUser.join(" | ") text query.fromUser.join(" | ")
if query.fromUser.len > 0: if query.fromUser.len > 0:
if query.kind != media or query.view != "gallery": if query.kind != QueryKind.media or query.view != "gallery":
renderProfileTabs(query, query.fromUser.join(",")) renderProfileTabs(query, query.fromUser.join(","))
if query.kind == media and query.fromUser.len == 1: if query.kind == QueryKind.media and query.fromUser.len == 1:
renderMediaViewTabs(query) renderMediaViewTabs(query)
if query.fromUser.len == 0 or query.kind == tweets: if query.fromUser.len == 0 or query.kind == QueryKind.tweets:
tdiv(class="timeline-header"): tdiv(class="timeline-header"):
renderSearchPanel(query) renderSearchPanel(query)
if query.fromUser.len == 0: if query.fromUser.len == 0:
renderSearchTabs(query) renderSearchTabs(query)
if query.kind == media: if query.kind == QueryKind.media:
renderMediaViewTabs(query) renderMediaViewTabs(query)
renderTimelineTweets(results, prefs, path, pinned) renderTimelineTweets(results, prefs, path, pinned)

View file

@ -6,7 +6,7 @@ import ".."/[types, query, formatters]
import tweet, renderutils import tweet, renderutils
proc timelineViewClass(query: Query): string = proc timelineViewClass(query: Query): string =
if query.kind != media: if query.kind != QueryKind.media:
return "timeline" return "timeline"
case query.view case query.view