commit 3287351f53dc2ba205144370aff34f4fafa14b1e · edavis.dev/monarch

+10 -1

cmd/monarch/handlers.go

···

       20
       20
        
       		&models.ActorProfile_Label{},

     

       21
       21
        
       		&models.ActorProfile_JoinedViaStarterPack{},

     

       22
       22
        
       		&models.ActorProfile_PinnedPost{},

     

       23
       23
       +
       

     

       24
       24
       +
       		&models.ActorStatus{},

     

       25
       25
       +
       		&models.ActorStatus_Embed{},

     

       23
       26
        
       	}

     

       24
       27
        
       	for _, migration := range migrations {

     

       25
       28
        
       		store.AutoMigrate(migration)

     
···

       41
       44
        
       	case syntax.NSID("app.bsky.actor.profile"):

     

       42
       45
        
       		profile := models.NewActorProfile(uri, *rec)

     

       43
       46
        
       		if err := hs.store.Where(models.ActorProfile{ID: string(uri)}).Assign(profile).FirstOrCreate(&models.ActorProfile{}).Error; err != nil {

     

       44
       44
       -
       			return fmt.Errorf("error upserting profile: %w", err)

     

       47
       47
       +
       			return fmt.Errorf("error upserting actor profile: %w", err)

     

       48
       48
       +
       		}

     

       49
       49
       +
       

     

       50
       50
       +
       	case syntax.NSID("app.bsky.actor.status"):

     

       51
       51
       +
       		status := models.NewActorStatus(uri, *rec)

     

       52
       52
       +
       		if err := hs.store.Where(models.ActorStatus{ID: string(uri)}).Assign(status).FirstOrCreate(&models.ActorStatus{}).Error; err != nil {

     

       53
       53
       +
       			return fmt.Errorf("error upserting actor status: %w", err)

     

       45
       54
        
       		}

     

       46
       55
        
       	}

     

       47
       56

+1 -1

models/actor_profile.go

···

       43
       43
        
       func NewActorProfile(uri syntax.ATURI, rec []byte) *ActorProfile {

     

       44
       44
        
       	var out appbsky.ActorProfile

     

       45
       45
        
       	if err := out.UnmarshalCBOR(bytes.NewReader(rec)); err != nil {

     

       46
       46
       -
       		slog.Error("could not unmarshal profile CBOR", "err", err)

     

       46
       46
       +
       		slog.Error("could not unmarshal actor profile CBOR", "err", err)

     

       47
       47
        
       		return nil

     

       48
       48
        
       	}

     

       49
       49

+54

models/actor_status.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"bytes"

     

       5
       5
       +
       	"log/slog"

     

       6
       6
       +
       	"time"

     

       7
       7
       +
       

     

       8
       8
       +
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       type ActorStatus struct {

     

       13
       13
       +
       	ID string `gorm:"primaryKey"`

     

       14
       14
       +
       

     

       15
       15
       +
       	CreatedAt       string

     

       16
       16
       +
       	DurationMinutes *int64

     

       17
       17
       +
       	Embed           *ActorStatus_Embed

     

       18
       18
       +
       	Status          string

     

       19
       19
       +
       

     

       20
       20
       +
       	AutoCreatedAt time.Time `gorm:"autoCreateTime"`

     

       21
       21
       +
       	AutoUpdatedAt time.Time `gorm:"autoUpdateTime"`

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       type ActorStatus_Embed struct {

     

       25
       25
       +
       	ActorStatusID string

     

       26
       26
       +
       	Description   string

     

       27
       27
       +
       	Title         string

     

       28
       28
       +
       	Uri           string

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

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

     

       32
       32
       +
       	var out appbsky.ActorStatus

     

       33
       33
       +
       	if err := out.UnmarshalCBOR(bytes.NewReader(rec)); err != nil {

     

       34
       34
       +
       		slog.Error("could not unmarshal actor status CBOR", "err", err)

     

       35
       35
       +
       		return nil

     

       36
       36
       +
       	}

     

       37
       37
       +
       

     

       38
       38
       +
       	status := ActorStatus{

     

       39
       39
       +
       		CreatedAt:       out.CreatedAt,

     

       40
       40
       +
       		DurationMinutes: out.DurationMinutes,

     

       41
       41
       +
       		Status:          out.Status,

     

       42
       42
       +
       	}

     

       43
       43
       +
       

     

       44
       44
       +
       	if out.Embed != nil && out.Embed.EmbedExternal != nil && out.Embed.EmbedExternal.External != nil {

     

       45
       45
       +
       		status.Embed = &ActorStatus_Embed{

     

       46
       46
       +
       			ActorStatusID: status.ID,

     

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

     

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

     

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

     

       50
       50
       +
       		}

     

       51
       51
       +
       	}

     

       52
       52
       +
       

     

       53
       53
       +
       	return &status

     

       54
       54
       +
       }

models/models.go

···

       1
       1
        
       package models

     

       2
       2
        
       

     

       3
       3
       +
       // ActorProfile

     

       3
       4
        
       // ActorStatus

     

       4
       5
        
       // FeedGenerator

     

       5
       6
        
       // FeedLike