commit 1c8db3c12add772c8f380587bcdc20a75b56e4d1 · edavis.dev/monarch

+20 -8

cmd/monarch/handlers.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       6
       7
        
       

     

       7
       8
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       9
        
       	"github.com/ipfs/go-cid"

     
···

       33
       34
        
       		&models.LabelerService{},

     

       34
       35
        
       		&models.LabelerService_Label{},

     

       35
       36
        
       		&models.LabelerService_Policy{},

     

       37
       37
       +
       		&models.LabelerService_ReasonType{},

     

       38
       38
       +
       		&models.LabelerService_SubjectCollection{},

     

       39
       39
       +
       		&models.LabelerService_SubjectType{},

     

       36
       40
        
       	}

     

       37
       41
        
       	for _, migration := range migrations {

     

       38
       42
        
       		store.AutoMigrate(migration)

     
···

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

     

       57
       61
        
       		// 	return fmt.Errorf("error upserting actor profile: %w", err)

     

       58
       62
        
       		// }

     

       63
       63
       +
       		return nil

     

       59
       64
        
       

     

       60
       65
        
       	case syntax.NSID("app.bsky.actor.status"):

     

       61
       66
        
       		status := models.NewActorStatus(uri, *rec)

     
···

       70
       75
        
       		}

     

       71
       76
        
       

     

       72
       77
        
       	case syntax.NSID("app.bsky.graph.block"):

     

       73
       73
       -
       		block := models.NewGraphBlock(uri, *rec)

     

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

     

       75
       75
       -
       			return fmt.Errorf("error upserting graph block: %w", err)

     

       76
       76
       -
       		}

     

       78
       78
       +
       		// block := models.NewGraphBlock(uri, *rec)

     

       79
       79
       +
       		// if err := hs.store.Where(models.GraphBlock{ID: string(uri)}).Assign(block).FirstOrCreate(&models.GraphBlock{}).Error; err != nil {

     

       80
       80
       +
       		// 	return fmt.Errorf("error upserting graph block: %w", err)

     

       81
       81
       +
       		// }

     

       82
       82
       +
       		return nil

     

       77
       83
        
       

     

       78
       84
        
       	case syntax.NSID("app.bsky.graph.list"):

     

       79
       85
        
       		list := models.NewGraphList(uri, *rec)

     
···

       82
       88
        
       		}

     

       83
       89
        
       

     

       84
       90
        
       	case syntax.NSID("app.bsky.graph.listblock"):

     

       85
       85
       -
       		listblock := models.NewGraphListblock(uri, *rec)

     

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

     

       87
       87
       -
       			return fmt.Errorf("error upserting graph listblock: %w", err)

     

       88
       88
       -
       		}

     

       91
       91
       +
       		// listblock := models.NewGraphListblock(uri, *rec)

     

       92
       92
       +
       		// if err := hs.store.Where(models.GraphListblock{ID: string(uri)}).Assign(listblock).FirstOrCreate(&models.GraphListblock{}).Error; err != nil {

     

       93
       93
       +
       		// 	return fmt.Errorf("error upserting graph listblock: %w", err)

     

       94
       94
       +
       		// }

     

       95
       95
       +
       		return nil

     

       89
       96
        
       

     

       90
       97
        
       	case syntax.NSID("app.bsky.graph.listitem"):

     

       91
       98
        
       		listitem := models.NewGraphListitem(uri, *rec)

     
···

       110
       117
        
       		if err := hs.store.Where(models.LabelerService{ID: string(uri)}).Assign(labeler).FirstOrCreate(&models.LabelerService{}).Error; err != nil {

     

       111
       118
        
       			return fmt.Errorf("error upserting labeler service: %w", err)

     

       112
       119
        
       		}

     

       120
       120
       +
       

     

       121
       121
       +
       	default:

     

       122
       122
       +
       		return nil

     

       113
       123
        
       	}

     

       124
       124
       +
       

     

       125
       125
       +
       	slog.Info("created record", "uri", uri)

     

       114
       126
        
       

     

       115
       127
        
       	return nil

     

       116
       128
        
       }

+33 -7

models/labeler_service.go

···

       15
       15
        
       	CreatedAt          string

     

       16
       16
        
       	Labels             []LabelerService_Label

     

       17
       17
        
       	Policies           []LabelerService_Policy

     

       18
       18
       -
       	ReasonTypes        []*string

     

       19
       19
       -
       	SubjectCollections []string

     

       20
       20
       -
       	SubjctTypes        []*string

     

       18
       18
       +
       	ReasonTypes        []LabelerService_ReasonType

     

       19
       19
       +
       	SubjectCollections []LabelerService_SubjectCollection

     

       20
       20
       +
       	SubjctTypes        []LabelerService_SubjectType

     

       21
       21
        
       

     

       22
       22
        
       	AutoCreatedAt time.Time `gorm:"autoCreateTime"`

     

       23
       23
        
       	AutoUpdatedAt time.Time `gorm:"autoUpdateTime"`

     
···

       30
       30
        
       

     

       31
       31
        
       type LabelerService_Policy struct {

     

       32
       32
        
       	LabelerServiceID string

     

       33
       33
       -
       	Definition       LabelerService_PolicyDefinition

     

       33
       33
       +
       	Definition       LabelerService_PolicyDefinition `gorm:"embedded"`

     

       34
       34
        
       	Label            *string

     

       35
       35
        
       }

     

       36
       36
        
       

     
···

       42
       42
        
       	Severity       string

     

       43
       43
        
       }

     

       44
       44
        
       

     

       45
       45
       +
       type LabelerService_ReasonType struct {

     

       46
       46
       +
       	LabelerServiceID string

     

       47
       47
       +
       	Value *string

     

       48
       48
       +
       }

     

       49
       49
       +
       

     

       50
       50
       +
       type LabelerService_SubjectCollection struct {

     

       51
       51
       +
       	LabelerServiceID string

     

       52
       52
       +
       	Value string

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       type LabelerService_SubjectType struct {

     

       56
       56
       +
       	LabelerServiceID string

     

       57
       57
       +
       	Value *string

     

       58
       58
       +
       }

     

       59
       59
       +
       

     

       60
       60
       +
       

     

       45
       61
        
       func NewLabelerService(uri syntax.ATURI, rec []byte) *LabelerService {

     

       46
       62
        
       	var out appbsky.LabelerService

     

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

     
···

       55
       71
        
       

     

       56
       72
        
       	if out.ReasonTypes != nil {

     

       57
       73
        
       		for _, reasontype := range out.ReasonTypes {

     

       58
       58
       -
       			labeler.ReasonTypes = append(labeler.ReasonTypes, reasontype)

     

       74
       74
       +
       			labeler.ReasonTypes = append(labeler.ReasonTypes, LabelerService_ReasonType{

     

       75
       75
       +
       				LabelerServiceID: labeler.ID,

     

       76
       76
       +
       				Value: reasontype,

     

       77
       77
       +
       			})

     

       59
       78
        
       		}

     

       60
       79
        
       	}

     

       61
       80
        
       

     

       62
       81
        
       	for _, collection := range out.SubjectCollections {

     

       63
       63
       -
       		labeler.SubjectCollections = append(labeler.SubjectCollections, collection)

     

       82
       82
       +
       		labeler.SubjectCollections = append(labeler.SubjectCollections, LabelerService_SubjectCollection{

     

       83
       83
       +
       			LabelerServiceID: labeler.ID,

     

       84
       84
       +
       			Value: collection,

     

       85
       85
       +
       		})

     

       64
       86
        
       	}

     

       65
       87
        
       

     

       66
       88
        
       	if out.SubjectTypes != nil {

     

       67
       89
        
       		for _, stype := range out.SubjectTypes {

     

       68
       68
       -
       			labeler.SubjctTypes = append(labeler.SubjctTypes, stype)

     

       90
       90
       +
       			labeler.SubjctTypes = append(labeler.SubjctTypes, LabelerService_SubjectType{

     

       91
       91
       +
       				LabelerServiceID: labeler.ID,

     

       92
       92
       +
       				Value: stype,

     

       93
       93
       +
       			})

     

       69
       94
        
       		}

     

       70
       95
        
       	}

     

       71
       96
        
       

     
···

       80
       105
        
       	if out.Policies != nil && out.Policies.LabelValueDefinitions != nil && out.Policies.LabelValues != nil {

     

       81
       106
        
       		for idx, valdef := range out.Policies.LabelValueDefinitions {

     

       82
       107
        
       			policy := LabelerService_Policy{

     

       108
       108
       +
       				LabelerServiceID: labeler.ID,

     

       83
       109
        
       				Definition: LabelerService_PolicyDefinition{

     

       84
       110
        
       					AdultOnly:      valdef.AdultOnly,

     

       85
       111
        
       					Blurs:          valdef.Blurs,