blankie
/
nitter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix regression excluding replies from search

This commit is contained in:
Zed 2020-05-02 19:44:10 +02:00
parent 1bd48ea8ca
commit 517d9144f6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/query.nim
View File

@ -51,13 +51,14 @@ proc getReplyQuery*(name: string): Query =
proc genQueryParam*(query: Query; rewriteReplies=true): string = proc genQueryParam*(query: Query; rewriteReplies=true): string =
var filters: seq[string] var filters: seq[string]
var param: string var param: string
let userSearch = query.fromUser.len > 0 let rewrite =
rewriteReplies and query.fromUser.len > 0 and query.kind != tweets
if query.kind == users: if query.kind == users:
return query.text return query.text
for i, user in query.fromUser: for i, user in query.fromUser:
if rewriteReplies: if rewrite:
param &= &"(from:{user}(to:{user} OR -filter:replies)) " param &= &"(from:{user}(to:{user} OR -filter:replies)) "
else: else:
param &= &"from:{user} " param &= &"from:{user} "
@ -68,7 +69,7 @@ proc genQueryParam*(query: Query; rewriteReplies=true): string =
for f in query.filters: for f in query.filters:
filters.add "filter:" & f filters.add "filter:" & f
for e in query.excludes: for e in query.excludes:
if userSearch and rewriteReplies and e == "replies": continue if rewrite and e == "replies": continue
filters.add "-filter:" & e filters.add "-filter:" & e
for i in query.includes: for i in query.includes:
filters.add "include:" & i filters.add "include:" & i
@ -83,7 +84,7 @@ proc genQueryParam*(query: Query; rewriteReplies=true): string =
if query.text.len > 0: if query.text.len > 0:
result &= " " & query.text result &= " " & query.text
if userSearch and rewriteReplies and result.len >= 500: if rewrite and result.len >= 500:
return genQueryParam(query, rewriteReplies=false) return genQueryParam(query, rewriteReplies=false)
proc genQueryUrl*(query: Query): string = proc genQueryUrl*(query: Query): string =