Merge branch 'bluesky-social:main' into plc-cmds

api/bsky/notificationunregisterPush.go

···
+// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
+
+package bsky
+
+// schema: app.bsky.notification.unregisterPush
+
+import (
+	"context"
+
+	"github.com/bluesky-social/indigo/lex/util"
+)
+
+// NotificationUnregisterPush_Input is the input argument to a app.bsky.notification.unregisterPush call.
+type NotificationUnregisterPush_Input struct {
+	AppId      string `json:"appId" cborgen:"appId"`
+	Platform   string `json:"platform" cborgen:"platform"`
+	ServiceDid string `json:"serviceDid" cborgen:"serviceDid"`
+	Token      string `json:"token" cborgen:"token"`
+}
+
+// NotificationUnregisterPush calls the XRPC method "app.bsky.notification.unregisterPush".
+func NotificationUnregisterPush(ctx context.Context, c util.LexClient, input *NotificationUnregisterPush_Input) error {
+	if err := c.LexDo(ctx, util.Procedure, "application/json", "app.bsky.notification.unregisterPush", nil, input, nil); err != nil {
+		return err
+	}
+
+	return nil
+}

api/ozone/moderationemitEvent.go

···
 
 // ModerationEmitEvent_Input is the input argument to a tools.ozone.moderation.emitEvent call.
 type ModerationEmitEvent_Input struct {
-	CreatedBy       string                             `json:"createdBy" cborgen:"createdBy"`
-	Event           *ModerationEmitEvent_Input_Event   `json:"event" cborgen:"event"`
+	CreatedBy string                           `json:"createdBy" cborgen:"createdBy"`
+	Event     *ModerationEmitEvent_Input_Event `json:"event" cborgen:"event"`
+	// externalId: An optional external ID for the event, used to deduplicate events from external systems. Fails when an event of same type with the same external ID exists for the same subject.
+	ExternalId      *string                            `json:"externalId,omitempty" cborgen:"externalId,omitempty"`
 	ModTool         *ModerationDefs_ModTool            `json:"modTool,omitempty" cborgen:"modTool,omitempty"`
 	Subject         *ModerationEmitEvent_Input_Subject `json:"subject" cborgen:"subject"`
 	SubjectBlobCids []string                           `json:"subjectBlobCids,omitempty" cborgen:"subjectBlobCids,omitempty"`

atproto/identity/mock_directory.go

···
 	"context"
 	"encoding/json"
 	"fmt"
+	"sync"
 
 	"github.com/bluesky-social/indigo/atproto/syntax"
 )
 
 // A fake identity directory, for use in tests
 type MockDirectory struct {
+	mu         *sync.RWMutex
 	Handles    map[syntax.Handle]syntax.DID
 	Identities map[syntax.DID]Identity
 }
···
 
 func NewMockDirectory() MockDirectory {
 	return MockDirectory{
+		mu:         &sync.RWMutex{},
 		Handles:    make(map[syntax.Handle]syntax.DID),
 		Identities: make(map[syntax.DID]Identity),
 	}
 }
 
 func (d *MockDirectory) Insert(ident Identity) {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
 	if !ident.Handle.IsInvalidHandle() {
 		d.Handles[ident.Handle.Normalize()] = ident.DID
 	}
···
 }
 
 func (d *MockDirectory) LookupHandle(ctx context.Context, h syntax.Handle) (*Identity, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
 	h = h.Normalize()
 	did, ok := d.Handles[h]
 	if !ok {
···
 }
 
 func (d *MockDirectory) LookupDID(ctx context.Context, did syntax.DID) (*Identity, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
 	ident, ok := d.Identities[did]
 	if !ok {
 		return nil, ErrDIDNotFound
···
 }
 
 func (d *MockDirectory) Lookup(ctx context.Context, a syntax.AtIdentifier) (*Identity, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
 	handle, err := a.AsHandle()
 	if nil == err { // if not an error, is a Handle
 		return d.LookupHandle(ctx, handle)
···
 }
 
 func (d *MockDirectory) ResolveHandle(ctx context.Context, h syntax.Handle) (syntax.DID, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
 	h = h.Normalize()
 	did, ok := d.Handles[h]
 	if !ok {
···
 }
 
 func (d *MockDirectory) ResolveDID(ctx context.Context, did syntax.DID) (*DIDDocument, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
 	ident, ok := d.Identities[did]
 	if !ok {
 		return nil, ErrDIDNotFound
···
 }
 
 func (d *MockDirectory) ResolveDIDRaw(ctx context.Context, did syntax.DID) (json.RawMessage, error) {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
 	ident, ok := d.Identities[did]
 	if !ok {
 		return nil, ErrDIDNotFound
···
 }
 
 func (d *MockDirectory) Purge(ctx context.Context, a syntax.AtIdentifier) error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
 	return nil
 }

carstore/repo_test.go

···
 	appbsky "github.com/bluesky-social/indigo/api/bsky"
 	"github.com/bluesky-social/indigo/repo"
 	"github.com/bluesky-social/indigo/util"
-	sqlbs "github.com/ipfs/go-bs-sqlite3"
+	//sqlbs "github.com/ipfs/go-bs-sqlite3"
 	"github.com/ipfs/go-cid"
 	flatfs "github.com/ipfs/go-ds-flatfs"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
···
 	}
 }
 
+/* NOTE(bnewbold): this depends on github.com/ipfs/go-bs-sqlite3, which rewrote git history (?) breaking the dependency tree. We can roll forward, but that will require broad dependency updates. So for now just removing this benchmark/perf test.
 func BenchmarkRepoWritesSqlite(b *testing.B) {
 	ctx := context.TODO()
 
···
 		head = nroot
 	}
 }
+*/
 
 func TestDuplicateBlockAcrossShards(ot *testing.T) {
 	ctx := context.TODO()

go.mod

···
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/icrowley/fake v0.0.0-20221112152111-d7b7e2276db2
 	github.com/ipfs/go-block-format v0.2.0
-	github.com/ipfs/go-bs-sqlite3 v0.0.0-20221122195556-bfcee1be620d
 	github.com/ipfs/go-cid v0.4.1
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-flatfs v0.5.1

go.sum

···
 github.com/ipfs/go-block-format v0.2.0/go.mod h1:+jpL11nFx5A/SPpsoBn6Bzkra/zaArfSmsknbPMYgzM=
 github.com/ipfs/go-blockservice v0.5.2 h1:in9Bc+QcXwd1apOVM7Un9t8tixPKdaHQFdLSUM1Xgk8=
 github.com/ipfs/go-blockservice v0.5.2/go.mod h1:VpMblFEqG67A/H2sHKAemeH9vlURVavlysbdUI632yk=
-github.com/ipfs/go-bs-sqlite3 v0.0.0-20221122195556-bfcee1be620d h1:9V+GGXCuOfDiFpdAHz58q9mKLg447xp0cQKvqQrAwYE=
-github.com/ipfs/go-bs-sqlite3 v0.0.0-20221122195556-bfcee1be620d/go.mod h1:pMbnFyNAGjryYCLCe59YDLRv/ujdN+zGJBT1umlvYRM=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
 github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
 github.com/ipfs/go-datastore v0.5.0/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk=