mleku/eventstore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Query

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2024-05-23 13:42:06 +09:00
parent 18d31ade43
commit 0f9a96b95d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opensearch/query.go
View File

@@ -87,9 +87,11 @@ func (oss *OpensearchStorage) getByID(filter nostr.Filter) ([]*nostr.Event, erro
for _, e := range mgetResponse.Docs {
if e.Found {
if b, err := e.Source.MarshalJSON(); err == nil {
var ev nostr.Event
if err = json.Unmarshal(b, &ev); err == nil {
events = append(events, &ev)
var payload struct {
Event nostr.Event `json:"event"`
}
if err = json.Unmarshal(b, &payload); err == nil {
events = append(events, &payload.Event)
}
}
}
@@ -130,7 +132,7 @@ func (oss *OpensearchStorage) QueryEvents(ctx context.Context, filter nostr.Filt
Indices: []string{oss.IndexName},
Body: bytes.NewReader(dsl),
Params: opensearchapi.SearchParams{
Size: &limit,
Size: opensearchapi.ToPointer(limit),
Sort: []string{"event.created_at:desc"},
},
},
@@ -142,9 +144,11 @@ func (oss *OpensearchStorage) QueryEvents(ctx context.Context, filter nostr.Filt
go func() {
for _, e := range searchResponse.Hits.Hits {
if b, err := e.Source.MarshalJSON(); err == nil {
var ev nostr.Event
if err = json.Unmarshal(b, &ev); err == nil {
ch <- &ev
var payload struct {
Event nostr.Event `json:"event"`
}
if err = json.Unmarshal(b, &payload); err == nil {
ch <- &payload.Event
}
}
}