Extend claim search for use in livestreaming

extras/jsonrpc/daemon.go

@@ -536,24 +536,35 @@ func (d *Client) Resolve(urls string) (*ResolveResponse, error) {
 	})
 }
 
-func (d *Client) ClaimSearch(claimName, claimID, txid *string, nout *uint, page uint64, pageSize uint64) (*ClaimSearchResponse, error) {
+type ClaimSearchArgs struct {
+	ClaimID               *string  `json:"claim_id,omitempty"`
+	TXID                  *string  `json:"txid,omitempty"`
+	Nout                  *uint    `json:"nout,omitempty"`
+	Name                  *string  `json:"name,omitempty"`
+	ClaimType             []string `json:"claim_type,omitempty"`
+	OrderBy               []string `json:"order_by,omitempty"`
+	LimitClaimsPerChannel *int     `json:"limit_claims_per_channel,omitempty"`
+	HasNoSource           *bool    `json:"has_no_source,omitempty"`
+	ReleaseTime           string   `json:"release_time,omitempty"`
+	ChannelIDs            []string `json:"channel_ids,omitempty"`
+	NoTotals              *bool    `json:"no_totals,omitempty"`
+	IncludeProtobuf       *bool    `json:"include_protobuf,omitempty"`
+	AnyTags               []string `json:"any_tags,omitempty"`
+
+	Page     uint64 `json:"page"`
+	PageSize uint64 `json:"page_size"`
+}
+
+func (d *Client) ClaimSearch(args ClaimSearchArgs) (*ClaimSearchResponse, error) {
 	response := new(ClaimSearchResponse)
-	args := struct {
+	if args.NoTotals == nil {
-		ClaimID         *string `json:"claim_id,omitempty"`
+		nototals := true
-		TXID            *string `json:"txid,omitempty"`
+		args.NoTotals = &nototals
-		Nout            *uint   `json:"nout,omitempty"`
+	}
-		Name            *string `json:"name,omitempty"`
+
-		IncludeProtobuf bool    `json:"include_protobuf"`
+	if args.IncludeProtobuf == nil {
-		Page            uint64  `json:"page"`
+		include := true
-		PageSize        uint64  `json:"page_size"`
+		args.IncludeProtobuf = &include
-	}{
-		ClaimID:         claimID,
-		TXID:            txid,
-		Nout:            nout,
-		Name:            claimName,
-		IncludeProtobuf: true,
-		Page:            page,
-		PageSize:        pageSize,
 	}
 	structs.DefaultTagName = "json"
 	return response, d.call(response, "claim_search", structs.Map(args))

extras/jsonrpc/daemon_test.go

@@ -463,7 +463,14 @@ func TestClient_TxoSpendTest(t *testing.T) {
 
 func TestClient_ClaimSearch(t *testing.T) {
 	d := NewClient("")
-	got, err := d.ClaimSearch(nil, util.PtrToString(channelID), nil, nil, 1, 20)
+	got, err := d.ClaimSearch(ClaimSearchArgs{
+		ChannelIDs:  []string{channelID},
+		ReleaseTime: ">1633350820",
+		HasNoSource: util.PtrToBool(true),
+		OrderBy:     []string{"^release_time"},
+		Page:        1,
+		PageSize:    20,
+	})
 	if err != nil {
 		t.Error(err)
 		return