From 3c5dd59f5c3be00909df4a509eea940393fd060e Mon Sep 17 00:00:00 2001 From: Ben Morrison Date: Mon, 27 May 2019 18:08:41 -0400 Subject: merging user keyword/url queries --- query.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'query.go') diff --git a/query.go b/query.go index 17d7a36..e74e109 100644 --- a/query.go +++ b/query.go @@ -68,15 +68,19 @@ func apiEndpointQuery(w http.ResponseWriter, r *http.Request) error { // something went very wrong. switch endpoint { case "users": + var out2 []string if query != "" { out, err = twtxtCache.QueryUser(query) apiErrCheck(err, r) } if urls != "" { - out, err = twtxtCache.QueryUser(urls) + out2, err = twtxtCache.QueryUser(urls) apiErrCheck(err, r) } + out = append(out, out2...) + out = uniq(out) + case "mentions": if urls == "" { return fmt.Errorf("missing URL in mention query") -- cgit 1.4.1-2-gfad0