commit 3ce4905d852ee68b3ea87f88acca3ba4179e25dc · edavis.dev/monarch

+1 -1

cmd/monarch/backfill.go

···

       11
       11
        
       		RelayHost:             "https://bsky.network",

     

       12
       12
        
       	}

     

       13
       13
        
       

     

       14
       14
       -
       	return backfill.NewBackfiller("backfiller", store, h.HandleUpsert, h.HandleUpsert, h.HandleDelete, opts)

     

       14
       14
       +
       	return backfill.NewBackfiller("backfiller", store, h.HandleCreate, h.HandleUpdate, h.HandleDelete, opts)

     

       15
       15
        
       }

+45 -5

cmd/monarch/handlers.go

···

       10
       10
        
       	"tangled.sh/edavis.dev/monarch/models"

     

       11
       11
        
       )

     

       12
       12
        
       

     

       13
       13
       +
       type Action int

     

       14
       14
       +
       

     

       15
       15
       +
       const (

     

       16
       16
       +
       	ActionCreate Action = iota

     

       17
       17
       +
       	ActionUpdate

     

       18
       18
       +
       )

     

       19
       19
       +
       

     

       13
       20
        
       type HandlerService struct {

     

       14
       21
        
       	store *gorm.DB

     

       15
       22
        
       }

     
···

       64
       71
        
       	}

     

       65
       72
        
       }

     

       66
       73
        
       

     

       74
       74
       +
       type helper struct {

     

       75
       75
       +
       	db     *gorm.DB

     

       76
       76
       +
       	uri    syntax.ATURI

     

       77
       77
       +
       	record []byte

     

       78
       78
       +
       	action Action

     

       79
       79
       +
       }

     

       80
       80
       +
       

     

       81
       81
       +
       func NewHelper(db *gorm.DB, uri syntax.ATURI, record []byte, action Action) *helper {

     

       82
       82
       +
       	return &helper{db, uri, record, action}

     

       83
       83
       +
       }

     

       84
       84
       +
       

     

       85
       85
       +
       func upsertRecord[T any](maker func(syntax.ATURI, []byte) T, opts *helper) error {

     

       86
       86
       +
       	obj := maker(opts.uri, opts.record)

     

       87
       87
       +
       	switch opts.action {

     

       88
       88
       +
       	case ActionCreate:

     

       89
       89
       +
       		if err := opts.db.Create(obj).Error; err != nil {

     

       90
       90
       +
       			return fmt.Errorf("error inserting %s record: %w", opts.uri.Collection(), err)

     

       91
       91
       +
       		}

     

       92
       92
       +
       	case ActionUpdate:

     

       93
       93
       +
       		if err := opts.db.Save(obj).Error; err != nil {

     

       94
       94
       +
       			return fmt.Errorf("error updating %s record: %w", opts.uri.Collection(), err)

     

       95
       95
       +
       		}

     

       96
       96
       +
       	}

     

       97
       97
       +
       	return nil

     

       98
       98
       +
       }

     

       99
       99
       +
       

     

       67
       100
        
       // handles both creates and updates

     

       68
       68
       -
       func (hs *HandlerService) HandleUpsert(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid) error {

     

       101
       101
       +
       func (hs *HandlerService) HandleUpsert(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid, action Action) error {

     

       69
       102
        
       	uri, err := syntax.ParseATURI(fmt.Sprintf("at://%s/%s", repo, path))

     

       70
       103
        
       	if err != nil {

     

       71
       104
        
       		return fmt.Errorf("error parsing at-uri: %w", err)

     

       72
       105
        
       	}

     

       106
       106
       +
       

     

       107
       107
       +
       	opts := NewHelper(hs.store, uri, *rec, action)

     

       73
       108
        
       

     

       74
       109
        
       	switch uri.Collection() {

     

       75
       110
        
       	case syntax.NSID("app.bsky.actor.profile"):

     
···

       109
       144
        
       		}

     

       110
       145
        
       

     

       111
       146
        
       	case syntax.NSID("app.bsky.feed.repost"):

     

       112
       112
       -
       		repost := models.NewFeedRepost(uri, *rec)

     

       113
       113
       -
       		if err := hs.store.Where(models.FeedRepost{ID: string(uri)}).Assign(repost).FirstOrCreate(&models.FeedRepost{}).Error; err != nil {

     

       114
       114
       -
       			return fmt.Errorf("error upserting feed repost: %w", err)

     

       115
       115
       -
       		}

     

       147
       147
       +
       		return upsertRecord(models.NewFeedRepost, opts)

     

       116
       148
        
       

     

       117
       149
        
       	case syntax.NSID("app.bsky.feed.threadgate"):

     

       118
       150
        
       		threadgate := models.NewFeedThreadgate(uri, *rec)

     
···

       176
       208
        
       	}

     

       177
       209
        
       

     

       178
       210
        
       	return nil

     

       211
       211
       +
       }

     

       212
       212
       +
       

     

       213
       213
       +
       func (hs *HandlerService) HandleCreate(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid) error {

     

       214
       214
       +
       	return hs.HandleUpsert(ctx, repo, rev, path, rec, cid, ActionCreate)

     

       215
       215
       +
       }

     

       216
       216
       +
       

     

       217
       217
       +
       func (hs *HandlerService) HandleUpdate(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid) error {

     

       218
       218
       +
       	return hs.HandleUpsert(ctx, repo, rev, path, rec, cid, ActionUpdate)

     

       179
       219
        
       }

     

       180
       220
        
       

     

       181
       221
        
       func (hs *HandlerService) HandleDelete(ctx context.Context, repo string, rev string, path string) error {

+6 -6

models/actor_status.go

···

       22
       22
        
       }

     

       23
       23
        
       

     

       24
       24
        
       type ActorStatus_Embed struct {

     

       25
       25
       -
       	Description   string

     

       26
       26
       -
       	Title         string

     

       27
       27
       -
       	Uri           string

     

       25
       25
       +
       	Description string

     

       26
       26
       +
       	Title       string

     

       27
       27
       +
       	Uri         string

     

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
        
       func NewActorStatus(uri syntax.ATURI, rec []byte) *ActorStatus {

     
···

       42
       42
        
       

     

       43
       43
        
       	if out.Embed != nil && out.Embed.EmbedExternal != nil && out.Embed.EmbedExternal.External != nil {

     

       44
       44
        
       		status.Embed = &ActorStatus_Embed{

     

       45
       45
       -
       			Description:   out.Embed.EmbedExternal.External.Description,

     

       46
       46
       -
       			Title:         out.Embed.EmbedExternal.External.Title,

     

       47
       47
       -
       			Uri:           out.Embed.EmbedExternal.External.Uri,

     

       45
       45
       +
       			Description: out.Embed.EmbedExternal.External.Description,

     

       46
       46
       +
       			Title:       out.Embed.EmbedExternal.External.Title,

     

       47
       47
       +
       			Uri:         out.Embed.EmbedExternal.External.Uri,

     

       48
       48
        
       		}

     

       49
       49
        
       	}

     

       50
       50

+1 -1

models/graph_starterpack.go

···

       47
       47
        
       		for _, feed := range out.Feeds {

     

       48
       48
        
       			pack.Feeds = append(pack.Feeds, GraphStarterpack_Feed{

     

       49
       49
        
       				GraphStarterpackID: pack.ID,

     

       50
       50
       -
       				Uri: feed.Uri,

     

       50
       50
       +
       				Uri:                feed.Uri,

     

       51
       51
        
       			})

     

       52
       52
        
       		}

     

       53
       53
        
       	}