Skip to content

Commit 8394b04

Browse files
committed
Qualify QueryKind.media to fix Nim 2.0.x build
Fixes #1422
1 parent 61246df commit 8394b04

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/query.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ proc initQuery*(pms: Table[string, string]; name=""): Query =
3434

3535
proc getMediaQuery*(name: string): Query =
3636
Query(
37-
kind: media,
37+
kind: QueryKind.media,
3838
filters: @["twimg", "native_video"],
3939
fromUser: @[name],
4040
sep: "OR"
@@ -64,7 +64,7 @@ proc genQueryParam*(query: Query; maxId=""): string =
6464
else:
6565
param &= ")"
6666

67-
if query.fromUser.len > 0 and query.kind in {posts, media}:
67+
if query.fromUser.len > 0 and query.kind in {posts, QueryKind.media}:
6868
param &= " (filter:self_threads OR -filter:replies)"
6969

7070
if "nativeretweets" notin query.excludes:
@@ -106,7 +106,7 @@ proc genQueryUrl*(query: Query): string =
106106

107107
# media doubles as the profile media tab, where f isn't part of the URL scheme
108108
if query.kind in {tweets, users, lists, top} or
109-
(query.kind == media and query.fromUser.len == 0):
109+
(query.kind == QueryKind.media and query.fromUser.len == 0):
110110
params.add &"f={query.kind}"
111111
if query.text.len > 0:
112112
params.add "q=" & encodeUrl(query.text)

src/routes/rss.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ proc createRssRouter*(cfg: Config) =
6868
let
6969
prefs = requestPrefs()
7070
query = initQuery(params(request))
71-
if query.kind notin {tweets, top, media}:
71+
if query.kind notin {QueryKind.tweets, QueryKind.top, QueryKind.media}:
7272
resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg)
7373

7474
let

src/routes/timeline.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ proc fetchProfile*(after: string; query: Query; skipRail=false): Future[Profile]
5353

5454
let
5555
rail =
56-
skipIf(skipRail or query.kind == media, @[]):
56+
skipIf(skipRail or query.kind == QueryKind.media, @[]):
5757
getCachedPhotoRail(userId)
5858

5959
user = getCachedUser(name)

src/views/profile.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ proc renderProtected*(username: string): VNode =
115115
proc renderProfile*(profile: var Profile; prefs: Prefs; path: string): VNode =
116116
profile.tweets.query.fromUser = @[profile.user.username]
117117
let
118-
isGalleryView = profile.tweets.query.kind == media and
118+
isGalleryView = profile.tweets.query.kind == QueryKind.media and
119119
profile.tweets.query.view == "gallery"
120120
viewClass = if isGalleryView: " media-only" else: ""
121121

src/views/search.nim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string;
120120
pinned=none(Tweet)): VNode =
121121
let query = results.query
122122
let containerClass =
123-
if query.fromUser.len == 0 and query.kind == media and
123+
if query.fromUser.len == 0 and query.kind == QueryKind.media and
124124
query.view == "gallery": "timeline-container media-only"
125125
else: "timeline-container"
126126
buildHtml(tdiv(class=containerClass)):
@@ -129,18 +129,18 @@ proc renderTweetSearch*(results: Timeline; prefs: Prefs; path: string;
129129
text query.fromUser.join(" | ")
130130

131131
if query.fromUser.len > 0:
132-
if query.kind != media or query.view != "gallery":
132+
if query.kind != QueryKind.media or query.view != "gallery":
133133
renderProfileTabs(query, query.fromUser.join(","))
134-
if query.kind == media and query.fromUser.len == 1:
134+
if query.kind == QueryKind.media and query.fromUser.len == 1:
135135
renderMediaViewTabs(query)
136136

137-
if query.fromUser.len == 0 or query.kind == tweets:
137+
if query.fromUser.len == 0 or query.kind == QueryKind.tweets:
138138
tdiv(class="timeline-header"):
139139
renderSearchPanel(query)
140140

141141
if query.fromUser.len == 0:
142142
renderSearchTabs(query)
143-
if query.kind == media:
143+
if query.kind == QueryKind.media:
144144
renderMediaViewTabs(query)
145145

146146
renderTimelineTweets(results, prefs, path, pinned)

src/views/timeline.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ".."/[types, query, formatters]
66
import tweet, renderutils
77

88
proc timelineViewClass(query: Query): string =
9-
if query.kind != media:
9+
if query.kind != QueryKind.media:
1010
return "timeline"
1111

1212
case query.view

0 commit comments

Comments
 (0)