commit 51b6970502f6118c8e16df8b5329066de5619906 · edavis.dev/monarch

+10 -1

cmd/monarch/handlers.go

···

       38
       38
        
       		&models.FeedPostgate_DetachedEmbeddingUri{},

     

       39
       39
        
       		&models.FeedPostgate_EmbeddingRule{},

     

       40
       40
        
       		&models.FeedRepost{},

     

       41
       41
       +
       		&models.FeedThreadgate{},

     

       42
       42
       +
       		&models.FeedThreadgate_AllowRule{},

     

       43
       43
       +
       		&models.FeedThreadgate_HiddenReply{},

     

       41
       44
        
       

     

       42
       45
        
       		&models.GraphBlock{},

     

       43
       46
        
       		&models.GraphList{},

     
···

       109
       112
        
       

     

       110
       113
        
       	case syntax.NSID("app.bsky.feed.repost"):

     

       111
       114
        
       		repost := models.NewFeedRepost(uri, *rec)

     

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

     

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

     

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

     

       117
       117
       +
       		}

     

       118
       118
       +
       

     

       119
       119
       +
       	case syntax.NSID("app.bsky.feed.threadgate"):

     

       120
       120
       +
       		threadgate := models.NewFeedThreadgate(uri, *rec)

     

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

     

       122
       122
       +
       			return fmt.Errorf("error upserting feed threadgate: %w", err)

     

       114
       123
        
       		}

     

       115
       124
        
       

     

       116
       125
        
       	case syntax.NSID("app.bsky.graph.block"):

+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
       +
       }

+1 -1

models/models.go

···

       7
       7
        
       // - [X] FeedPost

     

       8
       8
        
       // - [X] FeedPostgate

     

       9
       9
        
       // - [X] FeedRepost

     

       10
       10
       -
       // - [ ] FeedThreadgate

     

       10
       10
       +
       // - [X] FeedThreadgate

     

       11
       11
        
       // - [X] GraphBlock *

     

       12
       12
        
       // - [ ] GraphFollow

     

       13
       13
        
       // - [X] GraphList *