comparing ec77ec062810a938b860b1a0012b0cd3b5181d9e and master on edavis.dev/monarch

+87

models/feed_threadgate.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 FeedThreadgate struct {

     

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

     

       14
       14
       +
       

     

       15
       15
       +
       	AllowRules    []FeedThreadgate_AllowRule

     

       16
       16
       +
       	CreatedAt     string

     

       17
       17
       +
       	HiddenReplies []FeedThreadgate_HiddenReply

     

       18
       18
       +
       	Post          string

     

       19
       19
       +
       

     

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

     

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

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       type FeedThreadgate_AllowRule struct {

     

       25
       25
       +
       	FeedThreadgateID string

     

       26
       26
       +
       	Rule             string

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       type FeedThreadgate_HiddenReply struct {

     

       30
       30
       +
       	FeedThreadgateID string

     

       31
       31
       +
       	Uri              string

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       func NewFeedThreadgate(uri syntax.ATURI, rec []byte) *FeedThreadgate {

     

       35
       35
       +
       	var out appbsky.FeedThreadgate

     

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

     

       37
       37
       +
       		slog.Error("could not unmarshal feed threadgate CBOR", "err", err)

     

       38
       38
       +
       		return nil

     

       39
       39
       +
       	}

     

       40
       40
       +
       

     

       41
       41
       +
       	threadgate := FeedThreadgate{

     

       42
       42
       +
       		ID:        string(uri),

     

       43
       43
       +
       		CreatedAt: out.CreatedAt,

     

       44
       44
       +
       		Post:      out.Post,

     

       45
       45
       +
       	}

     

       46
       46
       +
       

     

       47
       47
       +
       	for _, hidden := range out.HiddenReplies {

     

       48
       48
       +
       		threadgate.HiddenReplies = append(threadgate.HiddenReplies, FeedThreadgate_HiddenReply{

     

       49
       49
       +
       			FeedThreadgateID: threadgate.ID,

     

       50
       50
       +
       			Uri:              hidden,

     

       51
       51
       +
       		})

     

       52
       52
       +
       	}

     

       53
       53
       +
       

     

       54
       54
       +
       	if out.Allow != nil {

     

       55
       55
       +
       		for _, rule := range out.Allow {

     

       56
       56
       +
       			if rule.FeedThreadgate_MentionRule != nil {

     

       57
       57
       +
       				threadgate.AllowRules = append(threadgate.AllowRules, FeedThreadgate_AllowRule{

     

       58
       58
       +
       					FeedThreadgateID: threadgate.ID,

     

       59
       59
       +
       					Rule:             rule.FeedThreadgate_MentionRule.LexiconTypeID,

     

       60
       60
       +
       				})

     

       61
       61
       +
       			}

     

       62
       62
       +
       

     

       63
       63
       +
       			if rule.FeedThreadgate_FollowerRule != nil {

     

       64
       64
       +
       				threadgate.AllowRules = append(threadgate.AllowRules, FeedThreadgate_AllowRule{

     

       65
       65
       +
       					FeedThreadgateID: threadgate.ID,

     

       66
       66
       +
       					Rule:             rule.FeedThreadgate_FollowerRule.LexiconTypeID,

     

       67
       67
       +
       				})

     

       68
       68
       +
       			}

     

       69
       69
       +
       

     

       70
       70
       +
       			if rule.FeedThreadgate_FollowingRule != nil {

     

       71
       71
       +
       				threadgate.AllowRules = append(threadgate.AllowRules, FeedThreadgate_AllowRule{

     

       72
       72
       +
       					FeedThreadgateID: threadgate.ID,

     

       73
       73
       +
       					Rule:             rule.FeedThreadgate_FollowingRule.LexiconTypeID,

     

       74
       74
       +
       				})

     

       75
       75
       +
       			}

     

       76
       76
       +
       

     

       77
       77
       +
       			if rule.FeedThreadgate_ListRule != nil {

     

       78
       78
       +
       				threadgate.AllowRules = append(threadgate.AllowRules, FeedThreadgate_AllowRule{

     

       79
       79
       +
       					FeedThreadgateID: threadgate.ID,

     

       80
       80
       +
       					Rule:             rule.FeedThreadgate_ListRule.LexiconTypeID,

     

       81
       81
       +
       				})

     

       82
       82
       +
       			}

     

       83
       83
       +
       		}

     

       84
       84
       +
       	}

     

       85
       85
       +
       

     

       86
       86
       +
       	return &threadgate

     

       87
       87
       +
       }

-20

models/models.go

···

       1
       1
       -
       package models

     

       2
       2
       -
       

     

       3
       3
       -
       // - [X] ActorProfile *

     

       4
       4
       -
       // - [X] ActorStatus *

     

       5
       5
       -
       // - [X] FeedGenerator *

     

       6
       6
       -
       // - [X] FeedLike

     

       7
       7
       -
       // - [X] FeedPost

     

       8
       8
       -
       // - [X] FeedPostgate

     

       9
       9
       -
       // - [X] FeedRepost

     

       10
       10
       -
       // - [X] FeedThreadgate

     

       11
       11
       -
       // - [X] GraphBlock *

     

       12
       12
       -
       // - [X] GraphFollow

     

       13
       13
       -
       // - [X] GraphList *

     

       14
       14
       -
       // - [X] GraphListblock *

     

       15
       15
       -
       // - [X] GraphListitem *

     

       16
       16
       -
       // - [X] GraphStarterpack *

     

       17
       17
       -
       // - [X] GraphVerification *

     

       18
       18
       -
       // - [X] LabelerService *

     

       19
       19
       -
       // - [X] ActorDeclaration

     

       20
       20
       -
       // - [ ] LexiconSchema *

+10 -26

models/actor_profile.go

···

       17
       17
        
       	CreatedAt            *string

     

       18
       18
        
       	Description          *string

     

       19
       19
        
       	DisplayName          *string

     

       20
       20
       -
       	JoinedViaStarterPack []ActorProfile_JoinedViaStarterPack

     

       20
       20
       +
       	JoinedViaStarterPack *StrongRef `gorm:"embedded;embeddedPrefix:starterpack_"`

     

       21
       21
        
       	Labels               []ActorProfile_Label

     

       22
       22
       -
       	PinnedPost           []ActorProfile_PinnedPost

     

       22
       22
       +
       	PinnedPost           *StrongRef `gorm:"embedded;embeddedPrefix:pinnedpost_"`

     

       23
       23
        
       

     

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

     

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

     
···

       30
       30
        
       	Value          string

     

       31
       31
        
       }

     

       32
       32
        
       

     

       33
       33
       -
       type ActorProfile_JoinedViaStarterPack struct {

     

       34
       34
       -
       	ActorProfileID string

     

       35
       35
       -
       	StrongRef

     

       36
       36
       -
       }

     

       37
       37
       -
       

     

       38
       38
       -
       type ActorProfile_PinnedPost struct {

     

       39
       39
       -
       	ActorProfileID string

     

       40
       40
       -
       	StrongRef

     

       41
       41
       -
       }

     

       42
       42
       -
       

     

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

     

       44
       34
        
       	var out appbsky.ActorProfile

     

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

     
···

       55
       45
        
       	}

     

       56
       46
        
       

     

       57
       47
        
       	if out.JoinedViaStarterPack != nil {

     

       58
       58
       -
       		profile.JoinedViaStarterPack = append(profile.JoinedViaStarterPack, ActorProfile_JoinedViaStarterPack{

     

       59
       59
       -
       			ActorProfileID: profile.ID,

     

       60
       60
       -
       			StrongRef: StrongRef{

     

       61
       61
       -
       				Uri: out.JoinedViaStarterPack.Uri,

     

       62
       62
       -
       				Cid: out.JoinedViaStarterPack.Cid,

     

       63
       63
       -
       			},

     

       64
       64
       -
       		})

     

       48
       48
       +
       		profile.JoinedViaStarterPack = &StrongRef{

     

       49
       49
       +
       			Uri: out.JoinedViaStarterPack.Uri,

     

       50
       50
       +
       			Cid: out.JoinedViaStarterPack.Cid,

     

       51
       51
       +
       		}

     

       65
       52
        
       	}

     

       66
       53
        
       

     

       67
       54
        
       	if out.PinnedPost != nil {

     

       68
       68
       -
       		profile.PinnedPost = append(profile.PinnedPost, ActorProfile_PinnedPost{

     

       69
       69
       -
       			ActorProfileID: profile.ID,

     

       70
       70
       -
       			StrongRef: StrongRef{

     

       71
       71
       -
       				Uri: out.PinnedPost.Uri,

     

       72
       72
       -
       				Cid: out.PinnedPost.Cid,

     

       73
       73
       -
       			},

     

       74
       74
       -
       		})

     

       55
       55
       +
       		profile.PinnedPost = &StrongRef{

     

       56
       56
       +
       			Uri: out.PinnedPost.Uri,

     

       57
       57
       +
       			Cid: out.PinnedPost.Cid,

     

       58
       58
       +
       		}

     

       75
       59
        
       	}

     

       76
       60
        
       

     

       77
       61
        
       	if out.Labels != nil && out.Labels.LabelDefs_SelfLabels != nil && out.Labels.LabelDefs_SelfLabels.Values != nil {

+2 -2

models/feed_postgate.go

···

       28
       28
        
       

     

       29
       29
        
       type FeedPostgate_EmbeddingRule struct {

     

       30
       30
        
       	FeedPostgateID string

     

       31
       31
       -
       	DisableRule    string

     

       31
       31
       +
       	Rule           string

     

       32
       32
        
       }

     

       33
       33
        
       

     

       34
       34
        
       func NewFeedPostgate(uri syntax.ATURI, rec []byte) *FeedPostgate {

     
···

       56
       56
        
       			if rule.FeedPostgate_DisableRule != nil {

     

       57
       57
        
       				postgate.EmbeddingRules = append(postgate.EmbeddingRules, FeedPostgate_EmbeddingRule{

     

       58
       58
        
       					FeedPostgateID: postgate.ID,

     

       59
       59
       -
       					DisableRule:    rule.FeedPostgate_DisableRule.LexiconTypeID,

     

       59
       59
       +
       					Rule:           rule.FeedPostgate_DisableRule.LexiconTypeID,

     

       60
       60
        
       				})

     

       61
       61
        
       			}

     

       62
       62
        
       		}

+1

models/actor_status.go

···

       35
       35
        
       	}

     

       36
       36
        
       

     

       37
       37
        
       	status := ActorStatus{

     

       38
       38
       +
       		ID:              string(uri),

     

       38
       39
        
       		CreatedAt:       out.CreatedAt,

     

       39
       40
        
       		DurationMinutes: out.DurationMinutes,

     

       40
       41
        
       		Status:          out.Status,

+1

models/feed_generator.go

···

       39
       39
        
       	}

     

       40
       40
        
       

     

       41
       41
        
       	feedgen := FeedGenerator{

     

       42
       42
       +
       		ID:                  string(uri),

     

       42
       43
        
       		AcceptsInteractions: out.AcceptsInteractions,

     

       43
       44
        
       		ContentMode:         out.ContentMode,

     

       44
       45
        
       		CreatedAt:           out.CreatedAt,

+1

models/graph_block.go

···

       27
       27
        
       	}

     

       28
       28
        
       

     

       29
       29
        
       	return &GraphBlock{

     

       30
       30
       +
       		ID:        string(uri),

     

       30
       31
        
       		CreatedAt: out.CreatedAt,

     

       31
       32
        
       		Subject:   out.Subject,

     

       32
       33
        
       	}

+1

models/graph_follow.go

···

       27
       27
        
       	}

     

       28
       28
        
       

     

       29
       29
        
       	return &GraphFollow{

     

       30
       30
       +
       		ID:        string(uri),

     

       30
       31
        
       		CreatedAt: out.CreatedAt,

     

       31
       32
        
       		Subject:   out.Subject,

     

       32
       33
        
       	}

+1

models/graph_list.go

···

       37
       37
        
       	}

     

       38
       38
        
       

     

       39
       39
        
       	list := GraphList{

     

       40
       40
       +
       		ID:          string(uri),

     

       40
       41
        
       		CreatedAt:   out.CreatedAt,

     

       41
       42
        
       		Description: out.Description,

     

       42
       43
        
       		Name:        out.Name,

+1

models/graph_listblock.go

···

       27
       27
        
       	}

     

       28
       28
        
       

     

       29
       29
        
       	return &GraphListblock{

     

       30
       30
       +
       		ID:        string(uri),

     

       30
       31
        
       		CreatedAt: out.CreatedAt,

     

       31
       32
        
       		Subject:   out.Subject,

     

       32
       33
        
       	}

+1

models/graph_listitem.go

···

       28
       28
        
       	}

     

       29
       29
        
       

     

       30
       30
        
       	return &GraphListitem{

     

       31
       31
       +
       		ID:        string(uri),

     

       31
       32
        
       		CreatedAt: out.CreatedAt,

     

       32
       33
        
       		List:      out.List,

     

       33
       34
        
       		Subject:   out.Subject,

+1

models/graph_starterpack.go

···

       37
       37
        
       	}

     

       38
       38
        
       

     

       39
       39
        
       	pack := GraphStarterpack{

     

       40
       40
       +
       		ID:          string(uri),

     

       40
       41
        
       		CreatedAt:   out.CreatedAt,

     

       41
       42
        
       		Description: out.Description,

     

       42
       43
        
       		List:        out.List,

+1

models/graph_verification.go

···

       29
       29
        
       	}

     

       30
       30
        
       

     

       31
       31
        
       	verification := GraphVerification{

     

       32
       32
       +
       		ID:          string(uri),

     

       32
       33
        
       		CreatedAt:   out.CreatedAt,

     

       33
       34
        
       		DisplayName: out.DisplayName,

     

       34
       35
        
       		Handle:      out.Handle,

+1

models/labeler_service.go

···

       65
       65
        
       	}

     

       66
       66
        
       

     

       67
       67
        
       	labeler := LabelerService{

     

       68
       68
       +
       		ID:        string(uri),

     

       68
       69
        
       		CreatedAt: out.CreatedAt,

     

       69
       70
        
       	}

     

       70
       71

-31

cmd/monarch/database.go

···

       1
       1
       -
       package main

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"log"

     

       5
       5
       -
       	"log/slog"

     

       6
       6
       -
       	"os"

     

       7
       7
       -
       	"time"

     

       8
       8
       -
       

     

       9
       9
       -
       	"gorm.io/driver/sqlite"

     

       10
       10
       -
       	"gorm.io/gorm"

     

       11
       11
       -
       	"gorm.io/gorm/logger"

     

       12
       12
       -
       )

     

       13
       13
       -
       

     

       14
       14
       -
       func NewDatabase(path string) *gorm.DB {

     

       15
       15
       -
       	sl := slog.With("source", "database")

     

       16
       16
       -
       	l := logger.New(

     

       17
       17
       -
       		log.New(os.Stdout, "\r\n", log.LstdFlags),

     

       18
       18
       -
       		logger.Config{

     

       19
       19
       -
       			SlowThreshold: time.Second,

     

       20
       20
       -
       			Colorful:      false,

     

       21
       21
       -
       		},

     

       22
       22
       -
       	)

     

       23
       23
       -
       	db, err := gorm.Open(sqlite.Open(path), &gorm.Config{

     

       24
       24
       -
       		Logger: l,

     

       25
       25
       -
       	})

     

       26
       26
       -
       	if err != nil {

     

       27
       27
       -
       		sl.Error("failed to open database", "err", err)

     

       28
       28
       -
       	}

     

       29
       29
       -
       	db.Exec("PRAGMA journal_mode=WAL")

     

       30
       30
       -
       	return db

     

       31
       31
       -
       }

+20

cmd/monarch/handlers.go

···

       5
       5
        
       	"context"

     

       6
       6
        
       	"encoding/json"

     

       7
       7
        
       	"fmt"

     

       8
       8
       +
       	"log/slog"

     

       8
       9
        
       

     

       9
       10
        
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       10
       11
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     
···

       75
       76
        
       		var out appbsky.LabelerService

     

       76
       77
        
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       77
       78
        
       		body, err = json.Marshal(out)

     

       79
       79
       +
       

     

       80
       80
       +
       	case syntax.NSID("app.bsky.graph.list"):

     

       81
       81
       +
       		var out appbsky.GraphList

     

       82
       82
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       83
       83
       +
       		body, err = json.Marshal(out)

     

       84
       84
       +
       

     

       85
       85
       +
       	case syntax.NSID("app.bsky.graph.verification"):

     

       86
       86
       +
       		var out appbsky.GraphVerification

     

       87
       87
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       88
       88
       +
       		body, err = json.Marshal(out)

     

       89
       89
       +
       

     

       90
       90
       +
       	case syntax.NSID("app.bsky.graph.starterpack"):

     

       91
       91
       +
       		var out appbsky.GraphStarterpack

     

       92
       92
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       93
       93
       +
       		body, err = json.Marshal(out)

     

       94
       94
       +
       

     

       95
       95
       +
       	default:

     

       96
       96
       +
       		slog.Error("tracked collection missing handler", "collection", uri.Collection())

     

       97
       97
       +
       		return nil

     

       78
       98
        
       	}

     

       79
       99
        
       

     

       80
       100
        
       	switch action {

+1 -1

cmd/monarch/main.go

···

       139
       139
        
       		},

     

       140
       140
        
       		&cli.IntFlag{

     

       141
       141
        
       			Name:  "sync-requests-limit",

     

       142
       142
       -
       			Value: 30,

     

       142
       142
       +
       			Value: 10, // ratelimit-policy: 3000;w=300

     

       143
       143
        
       		},

     

       144
       144
        
       	}

     

       145
       145

+4 -20

cmd/monarch/census.go

···

       14
       14
        
       )

     

       15
       15
        
       

     

       16
       16
        
       type CensusService struct {

     

       17
       17
       -
       	cursor   *CursorService

     

       18
       18
       -
       	backfill *backfill.Backfiller

     

       19
       19
       -
       

     

       17
       17
       +
       	cursor    *CursorService

     

       18
       18
       +
       	backfill  *backfill.Backfiller

     

       20
       19
        
       	seenHosts map[string]bool

     

       21
       21
       -
       	seenLk    sync.Mutex

     

       22
       22
       -
       

     

       23
       23
       -
       	storeLk sync.Mutex

     

       24
       20
        
       }

     

       25
       21
        
       

     

       26
       22
        
       type jobMaker interface {

     
···

       70
       66
        
       

     

       71
       67
        
       		for _, host := range res.Hosts {

     

       72
       68
        
       			// don't reprocess hosts already handled

     

       73
       73
       -
       			cs.seenLk.Lock()

     

       74
       74
       -
       			_, ok := cs.seenHosts[host.Hostname]

     

       75
       75
       -
       			cs.seenLk.Unlock()

     

       76
       76
       -
       			if ok {

     

       69
       69
       +
       			seen := cs.seenHosts[host.Hostname]

     

       70
       70
       +
       			if seen {

     

       77
       71
        
       				slog.Info("already processed host, skipping", "host", host)

     

       78
       72
        
       				continue

     

       79
       73
        
       			}

     
···

       114
       108
        
       		return

     

       115
       109
        
       	}

     

       116
       110
        
       

     

       117
       117
       -
       	cs.storeLk.Lock()

     

       118
       111
        
       	hcur, err := cs.cursor.GetHostCursor(host)

     

       119
       112
        
       	if err != nil {

     

       120
       113
        
       		slog.Error("error fetching host cursor", "err", err)

     

       121
       114
        
       	}

     

       122
       122
       -
       	cs.storeLk.Unlock()

     

       123
       115
        
       

     

       124
       116
        
       	var added int

     

       125
       117
        
       	curs := hcur.Cursor

     
···

       138
       130
        
       			continue

     

       139
       131
        
       		}

     

       140
       132
        
       

     

       141
       141
       -
       		cs.storeLk.Lock()

     

       142
       133
        
       		for _, repo := range res.Repos {

     

       143
       134
        
       			_, err := jmstore.GetOrCreateJob(ctx, repo.Did, backfill.StateEnqueued)

     

       144
       135
        
       			if err != nil {

     
···

       147
       138
        
       				added += 1

     

       148
       139
        
       			}

     

       149
       140
        
       		}

     

       150
       150
       -
       		cs.storeLk.Unlock()

     

       151
       141
        
       

     

       152
       142
        
       		if res.Cursor != nil && *res.Cursor != "" {

     

       153
       143
        
       			curs = *res.Cursor

     

       154
       154
       -
       			cs.storeLk.Lock()

     

       155
       144
        
       			if err := cs.cursor.SetHostCursor(host, curs); err != nil {

     

       156
       145
        
       				slog.Error("error updating cursor for host", "err", err)

     

       157
       146
        
       			}

     

       158
       158
       -
       			cs.storeLk.Unlock()

     

       159
       147
        
       		} else {

     

       160
       148
        
       			break

     

       161
       149
        
       		}

     

       162
       150
        
       	}

     

       163
       151
        
       

     

       164
       152
        
       	slog.Info("finished listing repos", "host", host)

     

       165
       165
       -
       

     

       166
       166
       -
       	cs.seenLk.Lock()

     

       167
       167
       -
       	defer cs.seenLk.Unlock()

     

       168
       168
       -
       

     

       169
       153
        
       	cs.seenHosts[host] = true

     

       170
       154
        
       }

     

       171
       155

+1 -4

cmd/monarch/cursors.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"log/slog"

     

       6
       6
       -
       	"sync"

     

       7
       6
        
       	"time"

     

       8
       7
        
       

     

       9
       8
        
       	"gorm.io/gorm"

     

       10
       9
        
       )

     

       11
       10
        
       

     

       12
       11
        
       type CursorService struct {

     

       13
       13
       -
       	store *gorm.DB

     

       14
       14
       -
       

     

       15
       15
       -
       	firehoseLk  sync.Mutex

     

       12
       12
       +
       	store       *gorm.DB

     

       16
       13
        
       	firehoseSeq int64

     

       17
       14
        
       }

     

       18
       15

Compare changes