Misc. fixes

api/plc.go

@@ -54,9 +54,7 @@ func (s *PLCServer) GetDocument(ctx context.Context, didstr string) (*did.Docume
 	return &doc, nil
 }
 
-func (s *PLCServer) FlushCacheFor(did string) {
-	return
-}
+func (s *PLCServer) FlushCacheFor(did string) {}
 
 type CreateOp struct {
 	Type        string  `json:"type" cborgen:"type"`

atproto/data/data.go

@@ -66,11 +66,13 @@ func extractBlobsAtom(atom any) []Blob {
 		out = append(out, v)
 	case []any:
 		for _, el := range v {
-			out = append(out, extractBlobsAtom(el)...)
+			down := extractBlobsAtom(el)
+			out = append(out, down...)
 		}
 	case map[string]any:
 		for _, val := range v {
-			out = append(out, extractBlobsAtom(val)...)
+			down := extractBlobsAtom(val)
+			out = append(out, down...)
 		}
 	default:
 	}

atproto/identity/cmd/atp-id/main.go

@@ -1,16 +1,15 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"log/slog"
 	"os"
 
+	"github.com/urfave/cli/v2"
+
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/bluesky-social/indigo/atproto/syntax"
-
-	"github.com/urfave/cli/v2"
 )
 
 func main() {
@@ -44,7 +43,7 @@ func main() {
 }
 
 func runLookup(cctx *cli.Context) error {
-	ctx := context.Background()
+	ctx := cctx.Context
 	s := cctx.Args().First()
 	if s == "" {
 		return fmt.Errorf("need to provide identifier as an argument")
@@ -66,7 +65,7 @@ func runLookup(cctx *cli.Context) error {
 }
 
 func runResolveHandle(cctx *cli.Context) error {
-	ctx := context.Background()
+	ctx := cctx.Context
 	s := cctx.Args().First()
 	if s == "" {
 		return fmt.Errorf("need to provide handle as an argument")
@@ -88,7 +87,7 @@ func runResolveHandle(cctx *cli.Context) error {
 }
 
 func runResolveDID(cctx *cli.Context) error {
-	ctx := context.Background()
+	ctx := cctx.Context
 	s := cctx.Args().First()
 	if s == "" {
 		fmt.Println("need to provide DID as an argument")

atproto/identity/mock_directory_test.go

@@ -50,6 +50,6 @@ func TestMockDirectory(t *testing.T) {
 
 	_, err = c.LookupHandle(ctx, syntax.HandleInvalid)
 	assert.ErrorIs(err, ErrHandleNotFound)
-	out, err = c.LookupDID(ctx, syntax.DID("did:plc:abc999"))
+	_, err = c.LookupDID(ctx, syntax.DID("did:plc:abc999"))
 	assert.ErrorIs(err, ErrDIDNotFound)
 }

atproto/lexicon/cmd/lextool/net.go

@@ -1,22 +1,22 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
 
+	"github.com/bobg/errors"
+	"github.com/urfave/cli/v2"
+
 	"github.com/bluesky-social/indigo/atproto/data"
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/bluesky-social/indigo/atproto/lexicon"
 	"github.com/bluesky-social/indigo/atproto/syntax"
-
-	"github.com/urfave/cli/v2"
 )
 
 func runValidateRecord(cctx *cli.Context) error {
-	ctx := context.Background()
+	ctx := cctx.Context
 	args := cctx.Args().Slice()
 	if len(args) != 2 {
 		return fmt.Errorf("expected two args (catalog path and AT-URI)")
@@ -29,12 +29,12 @@ func runValidateRecord(cctx *cli.Context) error {
 	cat := lexicon.NewBaseCatalog()
 	err := cat.LoadDirectory(p)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "in LoadDirectory")
 	}
 
 	aturi, err := syntax.ParseATURI(args[1])
 	if err != nil {
-		return err
+		return errors.Wrap(err, "in ParseATURI")
 	}
 	if aturi.RecordKey() == "" {
 		return fmt.Errorf("need a full, not partial, AT-URI: %s", aturi)
@@ -54,17 +54,24 @@ func runValidateRecord(cctx *cli.Context) error {
 		pdsURL, ident.DID, aturi.Collection(), aturi.RecordKey())
 	resp, err := http.Get(url)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "in http.Get")
 	}
+	defer resp.Body.Close()
+
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("fetch failed")
 	}
+
 	respBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "in ReadAll")
 	}
 
 	body, err := data.UnmarshalJSON(respBytes)
+	if err != nil {
+		return errors.Wrap(err, "in UnmarshalJSON")
+	}
+
 	record, ok := body["value"].(map[string]any)
 	if !ok {
 		return fmt.Errorf("fetched record was not an object")
@@ -73,7 +80,7 @@ func runValidateRecord(cctx *cli.Context) error {
 	slog.Info("validating", "did", ident.DID.String(), "collection", aturi.Collection().String(), "rkey", aturi.RecordKey().String())
 	err = lexicon.ValidateRecord(&cat, record, aturi.Collection().String(), lexicon.LenientMode)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "in ValidateRecord")
 	}
 	fmt.Println("success!")
 	return nil

atproto/lexicon/language.go

@@ -142,7 +142,6 @@ func (s *SchemaDef) SetBase(base string) {
 		}
 		s.Inner = v
 	}
-	return
 }
 
 func (s SchemaDef) MarshalJSON() ([]byte, error) {

atproto/lexicon/lexicon.go

@@ -136,7 +136,7 @@ func validateArray(cat Catalog, s SchemaArray, arr []any, flags ValidateFlags) e
 }
 
 func validateUnion(cat Catalog, s SchemaUnion, d any, flags ValidateFlags) error {
-	closed := s.Closed != nil && *s.Closed == true
+	closed := s.Closed != nil && *s.Closed
 
 	obj, ok := d.(map[string]any)
 	if !ok {

automod/consumer/firehose.go

@@ -171,7 +171,6 @@ func (fc *FirehoseConsumer) HandleRepoCommit(ctx context.Context, evt *comatprot
 				action = automod.UpdateOp
 			default:
 				logger.Error("impossible event kind", "kind", ek)
-				break
 			}
 			recCID := syntax.CID(op.Cid.String())
 			op := automod.RecordOp{

automod/engine/fetch_account_meta.go

@@ -93,7 +93,7 @@ func (e *Engine) GetAccountMeta(ctx context.Context, ident *identity.Identity) (
 	var labels []string
 	var negLabels []string
 	for _, lbl := range pv.Labels {
-		if lbl.Neg != nil && *lbl.Neg == true {
+		if lbl.Neg != nil && *lbl.Neg {
 			negLabels = append(negLabels, lbl.Val)
 		} else {
 			labels = append(labels, lbl.Val)
@@ -130,10 +130,10 @@ func (e *Engine) GetAccountMeta(ctx context.Context, ident *identity.Identity) (
 				am.Deactivated = true
 			}
 			if rd.Moderation != nil && rd.Moderation.SubjectStatus != nil {
-				if rd.Moderation.SubjectStatus.Takendown != nil && *rd.Moderation.SubjectStatus.Takendown == true {
+				if rd.Moderation.SubjectStatus.Takendown != nil && *rd.Moderation.SubjectStatus.Takendown {
 					am.Takendown = true
 				}
-				if rd.Moderation.SubjectStatus.Appealed != nil && *rd.Moderation.SubjectStatus.Appealed == true {
+				if rd.Moderation.SubjectStatus.Appealed != nil && *rd.Moderation.SubjectStatus.Appealed {
 					ap.Appealed = true
 				}
 				ap.AccountTags = dedupeStrings(rd.Moderation.SubjectStatus.Tags)

automod/engine/persist.go

@@ -276,7 +276,7 @@ func (eng *Engine) persistRecordModActions(c *RecordContext) error {
 			var existingLabels []string
 			var negLabels []string
 			for _, lbl := range rv.Labels {
-				if lbl.Neg != nil && *lbl.Neg == true {
+				if lbl.Neg != nil && *lbl.Neg {
 					negLabels = append(negLabels, lbl.Val)
 				} else {
 					existingLabels = append(existingLabels, lbl.Val)

automod/flagstore/flagstore_mem.go

@@ -23,10 +23,7 @@ func (s MemFlagStore) Get(ctx context.Context, key string) ([]string, error) {
 }
 
 func (s MemFlagStore) Add(ctx context.Context, key string, flags []string) error {
-	v, ok := s.Data[key]
-	if !ok {
-		v = []string{}
-	}
+	v := s.Data[key]
 	v = append(v, flags...)
 	v = dedupeStrings(v)
 	s.Data[key] = v
@@ -49,8 +46,8 @@ func (s MemFlagStore) Remove(ctx context.Context, key string, flags []string) er
 	for _, f := range flags {
 		delete(m, f)
 	}
-	out := []string{}
-	for f, _ := range m {
+	var out []string
+	for f := range m {
 		out = append(out, f)
 	}
 	s.Data[key] = out

automod/helpers/bsky.go

@@ -203,10 +203,7 @@ func ParentOrRootIsFollower(c *automod.RecordContext, post *appbsky.FeedPost) bo
 	}
 
 	rel = c.GetAccountRelationship(rootDID)
-	if rel.FollowedBy {
-		return true
-	}
-	return false
+	return rel.FollowedBy
 }
 
 func PostParentOrRootIsDid(post *appbsky.FeedPost, did string) bool {

automod/keyword/cmd/kw-cli/main.go

@@ -2,15 +2,14 @@ package main
 
 import (
 	"bufio"
-	"context"
 	"fmt"
 	"log/slog"
 	"os"
 
+	"github.com/urfave/cli/v2"
+
 	"github.com/bluesky-social/indigo/automod/keyword"
 	"github.com/bluesky-social/indigo/automod/setstore"
-
-	"github.com/urfave/cli/v2"
 )
 
 func main() {
@@ -64,7 +63,7 @@ func runFuzzy(cctx *cli.Context) error {
 }
 
 func runTokens(cctx *cli.Context) error {
-	ctx := context.Background()
+	ctx := cctx.Context
 	sets := setstore.NewMemSetStore()
 	if err := sets.LoadFromFileJSON(cctx.String("json-set-file")); err != nil {
 		return err

automod/keyword/tokenize.go

@@ -12,7 +12,6 @@ import (
 )
 
 var (
-	puncChars                    = regexp.MustCompile(`[[:punct:]]+`)
 	nonTokenChars                = regexp.MustCompile(`[^\pL\pN\s]+`)
 	nonTokenCharsSkipCensorChars = regexp.MustCompile(`[^\pL\pN\s#*_-]`)
 )