Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

palomar: refactor query string parsing; updates to schemas and transform #643

Merged
merged 19 commits into from
Apr 11, 2024
Merged

palomar: refactor query string parsing; updates to schemas and transform #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
942fa51
Jaz's query/profile tweaks
bnewbold Apr 10, 2024
15ebdfa
update post and profile schemas: more fields, consolidate URLs
bnewbold Apr 10, 2024
2143ed8
update query structs to match proposed lexicon
bnewbold Apr 10, 2024
13bd53b
refactor query string parsing to use params struct
bnewbold Apr 10, 2024
6583666
update transform to match simplified url/domain schema
bnewbold Apr 10, 2024
a45c3fb
search: ensure text_ja is optional
bnewbold Apr 10, 2024
223eb50
schemas: fix int/integer
bnewbold Apr 10, 2024
f359a82
add purell dep
bnewbold Apr 10, 2024
6c08a0e
search: normalize URLs for indexing and query
bnewbold Apr 10, 2024
aaab8c1
add missing error check (derp)
bnewbold Apr 11, 2024
c9e3d30
fixes and tests for query strings
bnewbold Apr 11, 2024
5cc0ca1
updated query param name
bnewbold Apr 11, 2024
3c84091
don't try to parse profile search query strings
bnewbold Apr 11, 2024
b5c6eee
helper to merge query params
bnewbold Apr 11, 2024
772f286
search: ensure most keyword term matches are case-insensitive
bnewbold Apr 11, 2024
7a4526f
lexgen search params
bnewbold Apr 11, 2024
6f6119d
palomar: wire up extended params (lexicon)
bnewbold Apr 11, 2024
4617ab4
handle from:me query server-side
bnewbold Apr 11, 2024
42b6b51
Update search/handlers.go
bnewbold Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions api/bsky/actorsearchActorsTypeahead.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 22 additions & 4 deletions api/bsky/feedsearchPosts.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion api/bsky/unspeccedsearchActorsSkeleton.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 24 additions & 4 deletions api/bsky/unspeccedsearchPostsSkeleton.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions cmd/palomar/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,11 @@ var searchPostCmd = &cli.Command{
identity.DefaultDirectory(), // TODO: parse PLC arg
escli,
cctx.String("es-post-index"),
strings.Join(cctx.Args().Slice(), " "),
0,
20,
&search.PostSearchParams{
Query: strings.Join(cctx.Args().Slice(), " "),
Offset: 0,
Size: 20,
},
)
if err != nil {
return err
Expand Down Expand Up @@ -359,8 +361,10 @@ var searchProfileCmd = &cli.Command{
context.Background(),
escli,
cctx.String("es-profile-index"),
strings.Join(cctx.Args().Slice(), " "),
10,
&search.ActorSearchParams{
Query: strings.Join(cctx.Args().Slice(), " "),
Size: 10,
},
)
if err != nil {
return err
Expand All @@ -372,9 +376,11 @@ var searchProfileCmd = &cli.Command{
identity.DefaultDirectory(), // TODO: parse PLC arg
escli,
cctx.String("es-profile-index"),
strings.Join(cctx.Args().Slice(), " "),
0,
20,
&search.ActorSearchParams{
Query: strings.Join(cctx.Args().Slice(), " "),
Offset: 0,
Size: 20,
},
)
if err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ require (
)

require (
github.com/PuerkitoBio/purell v1.2.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/go-redis/redis v6.15.9+incompatible // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/PuerkitoBio/purell v1.2.1 h1:QsZ4TjvwiMpat6gBCBxEQI0rcS9ehtkKtSpiUnd9N28=
github.com/PuerkitoBio/purell v1.2.1/go.mod h1:ZwHcC/82TOaovDi//J/804umJFFmbOHPngi8iYYv/Eo=
github.com/RussellLuo/slidingwindow v0.0.0-20200528002341-535bb99d338b h1:5/++qT1/z812ZqBvqQt6ToRswSuPZ/B33m6xVHRzADU=
github.com/RussellLuo/slidingwindow v0.0.0-20200528002341-535bb99d338b/go.mod h1:4+EPqMRApwwE/6yo6CxiHoSnBzjRr3jsqer7frxP8y4=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down
Loading
Loading