Remove commit from getRecord since there's no repo history anymore (#423

)
bluesky-social · Nov 8, 2023 · d3d9ea3 · d3d9ea3
2 parents 3f7c1d3 + 19866f4
commit d3d9ea3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/backfill/backfill_test.go b/backfill/backfill_test.go
@@ -32,6 +32,7 @@ func TestBackfill(t *testing.T) {
 	ts := &testState{}
 
 	opts := backfill.DefaultBackfillOptions()
+	opts.CheckoutPath = "https://bsky.network/xrpc/com.atproto.sync.getRepo"
 	opts.NSIDFilter = "app.bsky.feed.follow/"
 
 	bf := backfill.NewBackfiller(

diff --git a/bgs/handlers.go b/bgs/handlers.go
@@ -22,7 +22,7 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-func (s *BGS) handleComAtprotoSyncGetRecord(ctx context.Context, collection string, commit string, did string, rkey string) (io.Reader, error) {
+func (s *BGS) handleComAtprotoSyncGetRecord(ctx context.Context, collection string, did string, rkey string) (io.Reader, error) {
 	u, err := s.lookupUserByDid(ctx, did)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -40,16 +40,7 @@ func (s *BGS) handleComAtprotoSyncGetRecord(ctx context.Context, collection stri
 		return nil, fmt.Errorf("account was taken down")
 	}
 
-	reqCid := cid.Undef
-	if commit != "" {
-		reqCid, err = cid.Decode(commit)
-		if err != nil {
-			log.Errorw("failed to decode commit cid", "err", err, "cid", commit)
-			return nil, echo.NewHTTPError(http.StatusBadRequest, "failed to decode commit cid")
-		}
-	}
-
-	_, record, err := s.repoman.GetRecord(ctx, u.ID, collection, rkey, reqCid)
+	_, record, err := s.repoman.GetRecord(ctx, u.ID, collection, rkey, cid.Undef)
 	if err != nil {
 		if errors.Is(err, mst.ErrNotFound) {
 			return nil, echo.NewHTTPError(http.StatusNotFound, "record not found in repo")

diff --git a/bgs/stubs.go b/bgs/stubs.go
@@ -112,7 +112,6 @@ func (s *BGS) HandleComAtprotoSyncGetRecord(c echo.Context) error {
 	ctx, span := otel.Tracer("server").Start(c.Request().Context(), "HandleComAtprotoSyncGetRecord")
 	defer span.End()
 	collection := c.QueryParam("collection")
-	commit := c.QueryParam("commit")
 	did := c.QueryParam("did")
 	rkey := c.QueryParam("rkey")
 
@@ -131,17 +130,10 @@ func (s *BGS) HandleComAtprotoSyncGetRecord(c echo.Context) error {
 		return c.JSON(http.StatusBadRequest, XRPCError{Message: fmt.Sprintf("invalid did: %s", did)})
 	}
 
-	if commit != "" {
-		_, err = cid.Parse(commit)
-		if err != nil {
-			return c.JSON(http.StatusBadRequest, XRPCError{Message: fmt.Sprintf("invalid commit: %s", commit)})
-		}
-	}
-
 	var out io.Reader
 	var handleErr error
 	// func (s *BGS) handleComAtprotoSyncGetRecord(ctx context.Context,collection string,commit string,did string,rkey string) (io.Reader, error)
-	out, handleErr = s.handleComAtprotoSyncGetRecord(ctx, collection, commit, did, rkey)
+	out, handleErr = s.handleComAtprotoSyncGetRecord(ctx, collection, did, rkey)
 	if handleErr != nil {
 		return handleErr
 	}