Merge branch 'main' into admire-token-notifs

gallery-so · Oct 25, 2023 · b9f4266 · b9f4266
2 parents 7b73ec2 + c355c6d
commit b9f4266
Show file tree

Hide file tree

Showing 28 changed files with 743 additions and 372 deletions.
diff --git a/Makefile b/Makefile
@@ -272,7 +272,7 @@ $(DEPLOY)-%-userpref-upload            : DOCKER_FILE    := $(DOCKER_DIR)/userpre
 $(PROMOTE)-%-backend                   : SERVICE := default
 $(PROMOTE)-%-indexer                   : SERVICE := indexer
 $(PROMOTE)-%-indexer-server            : SERVICE := indexer-api
-$(PROMOTE)-%-emails                    : SERVICE := emails
+$(PROMOTE)-%-emails                    : SERVICE := emails-v2
 $(PROMOTE)-%-tokenprocessing           : SERVICE := tokenprocessing
 $(PROMOTE)-%-tokenprocessing           : SERVICE := tokenprocessing-v3
 $(PROMOTE)-%-autosocial                : SERVICE := autosocial

diff --git a/autosocial/handler.go b/autosocial/handler.go
@@ -115,6 +115,7 @@ func addFarcasterProfileToUser(ctx context.Context, n *farcaster.NeynarAPI, addr
 		}
 		u, err := n.UserByAddress(ctx, a.Address())
 		if err != nil {
+			logrus.Error(err)
 			continue
 		}
 		if u.Fid.String() == "" {

diff --git a/db/gen/coredb/batch.go b/db/gen/coredb/batch.go
diff --git a/db/gen/coredb/contract_gallery.sql.go b/db/gen/coredb/contract_gallery.sql.go
diff --git a/db/gen/coredb/models_gen.go b/db/gen/coredb/models_gen.go