oppi.li / indigo-ci
porting all github actions from bluesky-social/indigo to tangled CI
fork atom

update client requests to match new Lexicons

bnewbold.net c2ae7061 c2aaf8dc

options
unified split
Changed files
+13 -12
cmd
beemo
main.go
gosky
admin.go
fakedata
generators.go
testing
integ_test.go
labelmaker_fakedata_test.go
utils.go
+2 -2
cmd/beemo/main.go
··· 143 143 xrpcc.Auth.AccessJwt = refresh.AccessJwt 144 144 xrpcc.Auth.RefreshJwt = refresh.RefreshJwt 145 145 146 - // AdminGetModerationReports(ctx context.Context, c *xrpc.Client, actionType string, cursor string, limit int64, resolved bool, subject string) (*AdminGetModerationReports_Output, error) { 146 + // AdminGetModerationReports(ctx context.Context, c *xrpc.Client, actionType string, actionedBy string, cursor string, ignoreSubjects []string, limit int64, reporters []string, resolved bool, reverse bool, subject string) (*AdminGetModerationReports_Output, error) 147 147 resolved := false 148 148 var limit int64 = 50 149 - mrr, err := comatproto.AdminGetModerationReports(context.TODO(), xrpcc, "", "", limit, resolved, "") 149 + mrr, err := comatproto.AdminGetModerationReports(context.TODO(), xrpcc, "", "", "", nil, limit, nil, resolved, false, "") 150 150 if err != nil { 151 151 return err 152 152 }
+2 -1
cmd/gosky/admin.go
··· 393 393 adminKey := cctx.String("admin-password") 394 394 xrpcc.AdminToken = &adminKey 395 395 396 - resp, err := atproto.AdminGetModerationReports(ctx, xrpcc, "", "", 100, cctx.Bool("resolved"), "") 396 + // AdminGetModerationReports(ctx context.Context, c *xrpc.Client, actionType string, actionedBy string, cursor string, ignoreSubjects []string, limit int64, reporters []string, resolved bool, reverse bool, subject string) (*AdminGetModerationReports_Output, error) 397 + resp, err := atproto.AdminGetModerationReports(ctx, xrpcc, "", "", "", nil, 100, nil, cctx.Bool("resolved"), false, "") 397 398 if err != nil { 398 399 return err 399 400 }
+2 -2
fakedata/generators.go
··· 408 408 case "mention": 409 409 fallthrough 410 410 case "reply": 411 - _, err := appbsky.FeedGetPostThread(context.TODO(), xrpcc, 4, notif.Uri) 411 + _, err := appbsky.FeedGetPostThread(context.TODO(), xrpcc, 4, 80, notif.Uri) 412 412 if err != nil { 413 413 return err 414 414 } ··· 434 434 } 435 435 // TODO: should we do something different here? 436 436 if rand.Float64() < 0.25 { 437 - _, err = appbsky.FeedGetPostThread(context.TODO(), xrpcc, 4, post.Post.Uri) 437 + _, err = appbsky.FeedGetPostThread(context.TODO(), xrpcc, 4, 80, post.Post.Uri) 438 438 if err != nil { 439 439 return err 440 440 }
+4 -4
testing/integ_test.go
··· 417 417 b1.BanDomain(t, "foo.com") 418 418 419 419 c := &xrpc.Client{Host: "http://" + b1.Host()} 420 - if err := atproto.SyncRequestCrawl(context.TODO(), c, "foo.com"); err == nil { 420 + if err := atproto.SyncRequestCrawl(context.TODO(), c, &atproto.SyncRequestCrawl_Input{Hostname: "foo.com"}); err == nil { 421 421 t.Fatal("domain should be banned") 422 422 } 423 423 424 - if err := atproto.SyncRequestCrawl(context.TODO(), c, "pds.foo.com"); err == nil { 424 + if err := atproto.SyncRequestCrawl(context.TODO(), c, &atproto.SyncRequestCrawl_Input{Hostname: "pds.foo.com"}); err == nil { 425 425 t.Fatal("domain should be banned") 426 426 } 427 427 428 - if err := atproto.SyncRequestCrawl(context.TODO(), c, "app.pds.foo.com"); err == nil { 428 + if err := atproto.SyncRequestCrawl(context.TODO(), c, &atproto.SyncRequestCrawl_Input{Hostname: "app.pds.foo.com"}); err == nil { 429 429 t.Fatal("domain should be banned") 430 430 } 431 431 432 432 // should not be banned 433 - err := atproto.SyncRequestCrawl(context.TODO(), c, "foo.bar.com") 433 + err := atproto.SyncRequestCrawl(context.TODO(), c, &atproto.SyncRequestCrawl_Input{Hostname: "foo.bar.com"}) 434 434 if err == nil { 435 435 t.Fatal("should still fail") 436 436 }
+2 -2
testing/labelmaker_fakedata_test.go
··· 169 169 assert.Nil(queryOut.Cursor) 170 170 171 171 // auth is required 172 - _, err = comatproto.AdminGetModerationReports(ctx, &xrpcc, "", "", 20, false, "") 172 + _, err = comatproto.AdminGetModerationReports(ctx, &xrpcc, "", "", "", nil, 20, nil, false, false, "") 173 173 assert.Error(err) 174 174 175 175 adminPassword := "test-admin-pass" 176 176 xrpcc.AdminToken = &adminPassword 177 - _, err = comatproto.AdminGetModerationReports(ctx, &xrpcc, "", "", 20, false, "") 177 + _, err = comatproto.AdminGetModerationReports(ctx, &xrpcc, "", "", "", nil, 20, nil, false, false, "") 178 178 assert.NoError(err) 179 179 180 180 // TODO: many more tests
+1 -1
testing/utils.go
··· 165 165 t.Helper() 166 166 167 167 c := &xrpc.Client{Host: "http://" + b.Host()} 168 - if err := atproto.SyncRequestCrawl(context.TODO(), c, tp.RawHost()); err != nil { 168 + if err := atproto.SyncRequestCrawl(context.TODO(), c, &atproto.SyncRequestCrawl_Input{Hostname: tp.RawHost()}); err != nil { 169 169 t.Fatal(err) 170 170 } 171 171 }