From 8394b044ef8aabc974e055de40a590c04f32dded Mon Sep 17 00:00:00 2001 From: Zed Date: Thu, 9 Jul 2026 11:32:31 +0200 Subject: [PATCH] Qualify QueryKind.media to fix Nim 2.0.x build Fixes #1422 --- src/query.nim | 6 +++--- src/routes/rss.nim | 2 +- src/routes/timeline.nim | 2 +- src/views/profile.nim | 2 +- src/views/search.nim | 10 +++++----- src/views/timeline.nim | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/query.nim b/src/query.nim index f541d27..aeda0a1 100644 --- a/src/query.nim +++ b/src/query.nim @@ -34,7 +34,7 @@ proc initQuery*(pms: Table[string, string]; name=""): Query = proc getMediaQuery*(name: string): Query = Query( - kind: media, + kind: QueryKind.media, filters: @["twimg", "native_video"], fromUser: @[name], sep: "OR" @@ -64,7 +64,7 @@ proc genQueryParam*(query: Query; maxId=""): string = else: 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)" 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 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}" if query.text.len > 0: params.add "q=" & encodeUrl(query.text) diff --git a/src/routes/rss.nim b/src/routes/rss.nim index f2582c1..f56a2cb 100644 --- a/src/routes/rss.nim +++ b/src/routes/rss.nim @@ -68,7 +68,7 @@ proc createRssRouter*(cfg: Config) = let prefs = requestPrefs() 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) let diff --git a/src/routes/timeline.nim b/src/routes/timeline.nim index 6e8969e..35ef1aa 100644 --- a/src/routes/timeline.nim +++ b/src/routes/timeline.nim @@ -53,7 +53,7 @@ proc fetchProfile*(after: string; query: Query; skipRail=false): Future[Profile] let rail = - skipIf(skipRail or query.kind == media, @[]): + skipIf(skipRail or query.kind == QueryKind.media, @[]): getCachedPhotoRail(userId) user = getCachedUser(name) diff --git a/src/views/profile.nim b/src/views/profile.nim index de09368..c9012ed 100644 --- a/src/views/profile.nim +++ b/src/views/profile.nim @@ -115,7 +115,7 @@ proc renderProtected*(username: string): VNode = proc renderProfile*(profile: var Profile; prefs: Prefs; path: string): VNode = profile.tweets.query.fromUser = @[profile.user.username] let - isGalleryView = profile.tweets.query.kind == media and + isGalleryView = profile.tweets.query.kind == QueryKind.media and profile.tweets.query.view == "gallery" viewClass = if isGalleryView: " media-only" else: "" diff --git a/src/views/search.nim b/src/views/search.nim index fe50280..1c29203 100644 --- a/src/views/search.nim +++ b/src/views/search.nim @@ -120,7 +120,7 @@ proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string; pinned=none(Tweet)): VNode = let query = results.query 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" else: "timeline-container" buildHtml(tdiv(class=containerClass)): @@ -129,18 +129,18 @@ proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string; text query.fromUser.join(" | ") 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(",")) - if query.kind == media and query.fromUser.len == 1: + if query.kind == QueryKind.media and query.fromUser.len == 1: 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"): renderSearchPanel(query) if query.fromUser.len == 0: renderSearchTabs(query) - if query.kind == media: + if query.kind == QueryKind.media: renderMediaViewTabs(query) renderTimelineTweets(results, prefs, path, pinned) diff --git a/src/views/timeline.nim b/src/views/timeline.nim index 9c85c9c..2890dd1 100644 --- a/src/views/timeline.nim +++ b/src/views/timeline.nim @@ -6,7 +6,7 @@ import ".."/[types, query, formatters] import tweet, renderutils proc timelineViewClass(query: Query): string = - if query.kind != media: + if query.kind != QueryKind.media: return "timeline" case query.view