patch of appview: wrap posthog under unified notifier · round #2 · pull #333 · tangled.org/core

+2 -2

appview/db/follow.go

···

       12
       12
        
       	Rkey       string

     

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
       -
       func AddFollow(e Execer, userDid, subjectDid, rkey string) error {

     

       15
       15
       +
       func AddFollow(e Execer, follow *Follow) error {

     

       16
       16
        
       	query := `insert or ignore into follows (user_did, subject_did, rkey) values (?, ?, ?)`

     

       17
       17
       -
       	_, err := e.Exec(query, userDid, subjectDid, rkey)

     

       17
       17
       +
       	_, err := e.Exec(query, follow.UserDid, follow.SubjectDid, follow.Rkey)

     

       18
       18
        
       	return err

     

       19
       19
        
       }

     

       20
       20

+7 -2

appview/db/star.go

···

       33
       33
        
       	return nil

     

       34
       34
        
       }

     

       35
       35
        
       

     

       36
       36
       -
       func AddStar(e Execer, starredByDid string, repoAt syntax.ATURI, rkey string) error {

     

       36
       36
       +
       func AddStar(e Execer, star *Star) error {

     

       37
       37
        
       	query := `insert or ignore into stars (starred_by_did, repo_at, rkey) values (?, ?, ?)`

     

       38
       38
       -
       	_, err := e.Exec(query, starredByDid, repoAt, rkey)

     

       38
       38
       +
       	_, err := e.Exec(

     

       39
       39
       +
       		query,

     

       40
       40
       +
       		star.StarredByDid,

     

       41
       41
       +
       		star.RepoAt.String(),

     

       42
       42
       +
       		star.Rkey,

     

       43
       43
       +
       	)

     

       39
       44
        
       	return err

     

       40
       45
        
       }

     

       41
       46

+10 -3

appview/ingester.go

···

       100
       100
        
       			l.Error("invalid record", "err", err)

     

       101
       101
        
       			return err

     

       102
       102
        
       		}

     

       103
       103
       -
       		err = db.AddStar(i.Db, did, subjectUri, e.Commit.RKey)

     

       103
       103
       +
       		err = db.AddStar(i.Db, &db.Star{

     

       104
       104
       +
       			StarredByDid: did,

     

       105
       105
       +
       			RepoAt:       subjectUri,

     

       106
       106
       +
       			Rkey:         e.Commit.RKey,

     

       107
       107
       +
       		})

     

       104
       108
        
       	case models.CommitOperationDelete:

     

       105
       109
        
       		err = db.DeleteStarByRkey(i.Db, did, e.Commit.RKey)

     

       106
       110
        
       	}

     
···

       129
       133
        
       			return err

     

       130
       134
        
       		}

     

       131
       135
        
       

     

       132
       132
       -
       		subjectDid := record.Subject

     

       133
       133
       -
       		err = db.AddFollow(i.Db, did, subjectDid, e.Commit.RKey)

     

       136
       136
       +
       		err = db.AddFollow(i.Db, &db.Follow{

     

       137
       137
       +
       			UserDid:    did,

     

       138
       138
       +
       			SubjectDid: record.Subject,

     

       139
       139
       +
       			Rkey:       e.Commit.RKey,

     

       140
       140
       +
       		})

     

       134
       141
        
       	case models.CommitOperationDelete:

     

       135
       142
        
       		err = db.DeleteFollowByRkey(i.Db, did, e.Commit.RKey)

     

       136
       143
        
       	}

+5 -14

appview/issues/issues.go

···

       14
       14
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       15
       15
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       16
       16
        
       	"github.com/go-chi/chi/v5"

     

       17
       17
       -
       	"github.com/posthog/posthog-go"

     

       18
       17
        
       

     

       19
       18
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       20
       19
        
       	"tangled.sh/tangled.sh/core/appview"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       23
       23
       +
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       24
       24
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       25
       25
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       26
       26
        
       	"tangled.sh/tangled.sh/core/appview/pagination"

     
···

       34
       34
        
       	idResolver   *idresolver.Resolver

     

       35
       35
        
       	db           *db.DB

     

       36
       36
        
       	config       *config.Config

     

       37
       37
       -
       	posthog      posthog.Client

     

       37
       37
       +
       	notifier     notify.Notifier

     

       38
       38
        
       }

     

       39
       39
        
       

     

       40
       40
        
       func New(

     
···

       44
       44
        
       	idResolver *idresolver.Resolver,

     

       45
       45
        
       	db *db.DB,

     

       46
       46
        
       	config *config.Config,

     

       47
       47
       -
       	posthog posthog.Client,

     

       47
       47
       +
       	notifier notify.Notifier,

     

       48
       48
        
       ) *Issues {

     

       49
       49
        
       	return &Issues{

     

       50
       50
        
       		oauth:        oauth,

     
···

       53
       53
        
       		idResolver:   idResolver,

     

       54
       54
        
       		db:           db,

     

       55
       55
        
       		config:       config,

     

       56
       56
       -
       		posthog:      posthog,

     

       56
       56
       +
       		notifier:     notifier,

     

       57
       57
        
       	}

     

       58
       58
        
       }

     

       59
       59
        
       

     
···

       750
       750
        
       			return

     

       751
       751
        
       		}

     

       752
       752
        
       

     

       753
       753
       -
       		if !rp.config.Core.Dev {

     

       754
       754
       -
       			err = rp.posthog.Enqueue(posthog.Capture{

     

       755
       755
       -
       				DistinctId: user.Did,

     

       756
       756
       -
       				Event:      "new_issue",

     

       757
       757
       -
       				Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "issue_id": issue.IssueId},

     

       758
       758
       -
       			})

     

       759
       759
       -
       			if err != nil {

     

       760
       760
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       761
       761
       -
       			}

     

       762
       762
       -
       		}

     

       753
       753
       +
       		rp.notifier.NewIssue(r.Context(), issue)

     

       763
       754
        
       

     

       764
       755
        
       		rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issue.IssueId))

     

       765
       756
        
       		return

+37 -6

appview/notify/merged_notifier.go

···

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
        
       func NewMergedNotifier(notifiers ...Notifier) Notifier {

     

       14
       14
       -
       	return &mergedNotifier{

     

       15
       15
       -
       		notifiers,

     

       16
       16
       -
       	}

     

       14
       14
       +
       	return &mergedNotifier{notifiers}

     

       17
       15
        
       }

     

       18
       16
        
       

     

       19
       17
        
       var _ Notifier = &mergedNotifier{}

     

       20
       18
        
       

     

       19
       19
       +
       func (m *mergedNotifier) NewRepo(ctx context.Context, repo *db.Repo) {

     

       20
       20
       +
       	for _, notifier := range m.notifiers {

     

       21
       21
       +
       		notifier.NewRepo(ctx, repo)

     

       22
       22
       +
       	}

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       func (m *mergedNotifier) NewStar(ctx context.Context, star *db.Star) {

     

       26
       26
       +
       	for _, notifier := range m.notifiers {

     

       27
       27
       +
       		notifier.NewStar(ctx, star)

     

       28
       28
       +
       	}

     

       29
       29
       +
       }

     

       30
       30
       +
       func (m *mergedNotifier) DeleteStar(ctx context.Context, star *db.Star) {

     

       31
       31
       +
       	for _, notifier := range m.notifiers {

     

       32
       32
       +
       		notifier.DeleteStar(ctx, star)

     

       33
       33
       +
       	}

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       21
       36
        
       func (m *mergedNotifier) NewIssue(ctx context.Context, issue *db.Issue) {

     

       22
       37
        
       	for _, notifier := range m.notifiers {

     

       23
       38
        
       		notifier.NewIssue(ctx, issue)

     

       24
       39
        
       	}

     

       25
       40
        
       }

     

       26
       41
        
       

     

       27
       27
       -
       func (m *mergedNotifier) NewIssueComment(ctx context.Context, comment db.Comment) {

     

       42
       42
       +
       func (m *mergedNotifier) NewFollow(ctx context.Context, follow *db.Follow) {

     

       43
       43
       +
       	for _, notifier := range m.notifiers {

     

       44
       44
       +
       		notifier.NewFollow(ctx, follow)

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

     

       47
       47
       +
       func (m *mergedNotifier) DeleteFollow(ctx context.Context, follow *db.Follow) {

     

       28
       48
        
       	for _, notifier := range m.notifiers {

     

       29
       29
       -
       		notifier.NewIssueComment(ctx, comment)

     

       49
       49
       +
       		notifier.DeleteFollow(ctx, follow)

     

       30
       50
        
       	}

     

       31
       51
        
       }

     

       32
       52
        
       

     

       33
       33
       -
       func (m *mergedNotifier) NewPullComment(ctx context.Context, comment db.PullComment) {

     

       53
       53
       +
       func (m *mergedNotifier) NewPull(ctx context.Context, pull *db.Pull) {

     

       54
       54
       +
       	for _, notifier := range m.notifiers {

     

       55
       55
       +
       		notifier.NewPull(ctx, pull)

     

       56
       56
       +
       	}

     

       57
       57
       +
       }

     

       58
       58
       +
       func (m *mergedNotifier) NewPullComment(ctx context.Context, comment *db.PullComment) {

     

       34
       59
        
       	for _, notifier := range m.notifiers {

     

       35
       60
        
       		notifier.NewPullComment(ctx, comment)

     

       36
       61
        
       	}

     

       37
       62
        
       }

     

       63
       63
       +
       

     

       64
       64
       +
       func (m *mergedNotifier) UpdateProfile(ctx context.Context, profile *db.Profile) {

     

       65
       65
       +
       	for _, notifier := range m.notifiers {

     

       66
       66
       +
       		notifier.UpdateProfile(ctx, profile)

     

       67
       67
       +
       	}

     

       68
       68
       +
       }

+32 -2

appview/notify/notifier.go

···

       7
       7
        
       )

     

       8
       8
        
       

     

       9
       9
        
       type Notifier interface {

     

       10
       10
       +
       	NewRepo(ctx context.Context, repo *db.Repo)

     

       11
       11
       +
       

     

       12
       12
       +
       	NewStar(ctx context.Context, star *db.Star)

     

       13
       13
       +
       	DeleteStar(ctx context.Context, star *db.Star)

     

       14
       14
       +
       

     

       10
       15
        
       	NewIssue(ctx context.Context, issue *db.Issue)

     

       11
       11
       -
       	NewIssueComment(ctx context.Context, comment db.Comment)

     

       12
       16
        
       

     

       13
       13
       -
       	NewPullComment(ctx context.Context, comment db.PullComment)

     

       17
       17
       +
       	NewFollow(ctx context.Context, follow *db.Follow)

     

       18
       18
       +
       	DeleteFollow(ctx context.Context, follow *db.Follow)

     

       19
       19
       +
       

     

       20
       20
       +
       	NewPull(ctx context.Context, pull *db.Pull)

     

       21
       21
       +
       	NewPullComment(ctx context.Context, comment *db.PullComment)

     

       22
       22
       +
       

     

       23
       23
       +
       	UpdateProfile(ctx context.Context, profile *db.Profile)

     

       14
       24
        
       }

     

       25
       25
       +
       

     

       26
       26
       +
       // BaseNotifier is a listener that does nothing

     

       27
       27
       +
       type BaseNotifier struct{}

     

       28
       28
       +
       

     

       29
       29
       +
       var _ Notifier = &BaseNotifier{}

     

       30
       30
       +
       

     

       31
       31
       +
       func (m *BaseNotifier) NewRepo(ctx context.Context, repo *db.Repo) {}

     

       32
       32
       +
       

     

       33
       33
       +
       func (m *BaseNotifier) NewStar(ctx context.Context, star *db.Star) {}

     

       34
       34
       +
       func (m *BaseNotifier) DeleteStar(ctx context.Context, star *db.Star) {}

     

       35
       35
       +
       

     

       36
       36
       +
       func (m *BaseNotifier) NewIssue(ctx context.Context, issue *db.Issue) {}

     

       37
       37
       +
       

     

       38
       38
       +
       func (m *BaseNotifier) NewFollow(ctx context.Context, follow *db.Follow) {}

     

       39
       39
       +
       func (m *BaseNotifier) DeleteFollow(ctx context.Context, follow *db.Follow) {}

     

       40
       40
       +
       

     

       41
       41
       +
       func (m *BaseNotifier) NewPull(ctx context.Context, pull *db.Pull) {}

     

       42
       42
       +
       func (m *BaseNotifier) NewPullComment(ctx context.Context, comment *db.PullComment) {}

     

       43
       43
       +
       

     

       44
       44
       +
       func (m *BaseNotifier) UpdateProfile(ctx context.Context, profile *db.Profile) {}

-4

appview/pipelines/pipelines.go

···

       22
       22
        
       

     

       23
       23
        
       	"github.com/go-chi/chi/v5"

     

       24
       24
        
       	"github.com/gorilla/websocket"

     

       25
       25
       -
       	"github.com/posthog/posthog-go"

     

       26
       25
        
       )

     

       27
       26
        
       

     

       28
       27
        
       type Pipelines struct {

     
···

       34
       33
        
       	spindlestream *eventconsumer.Consumer

     

       35
       34
        
       	db            *db.DB

     

       36
       35
        
       	enforcer      *rbac.Enforcer

     

       37
       37
       -
       	posthog       posthog.Client

     

       38
       36
        
       	logger        *slog.Logger

     

       39
       37
        
       }

     

       40
       38
        
       

     
···

       46
       44
        
       	idResolver *idresolver.Resolver,

     

       47
       45
        
       	db *db.DB,

     

       48
       46
        
       	config *config.Config,

     

       49
       49
       -
       	posthog posthog.Client,

     

       50
       47
        
       	enforcer *rbac.Enforcer,

     

       51
       48
        
       ) *Pipelines {

     

       52
       49
        
       	logger := log.New("pipelines")

     
···

       58
       55
        
       		config:        config,

     

       59
       56
        
       		spindlestream: spindlestream,

     

       60
       57
        
       		db:            db,

     

       61
       61
       -
       		posthog:       posthog,

     

       62
       58
        
       		enforcer:      enforcer,

     

       63
       59
        
       		logger:        logger,

     

       64
       60
        
       	}

+131

appview/posthog/notifier.go

···

       1
       1
       +
       package posthog_service

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"log"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/posthog/posthog-go"

     

       8
       8
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       9
       9
       +
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       type posthogNotifier struct {

     

       13
       13
       +
       	client posthog.Client

     

       14
       14
       +
       	notify.BaseNotifier

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       func NewPosthogNotifier(client posthog.Client) notify.Notifier {

     

       18
       18
       +
       	return &posthogNotifier{

     

       19
       19
       +
       		client,

     

       20
       20
       +
       		notify.BaseNotifier{},

     

       21
       21
       +
       	}

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       var _ notify.Notifier = &posthogNotifier{}

     

       25
       25
       +
       

     

       26
       26
       +
       func (n *posthogNotifier) NewRepo(ctx context.Context, repo *db.Repo) {

     

       27
       27
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       28
       28
       +
       		DistinctId: repo.Did,

     

       29
       29
       +
       		Event:      "new_repo",

     

       30
       30
       +
       		Properties: posthog.Properties{"repo": repo.Name, "repo_at": repo.AtUri},

     

       31
       31
       +
       	})

     

       32
       32
       +
       	if err != nil {

     

       33
       33
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       34
       34
       +
       	}

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       func (n *posthogNotifier) NewStar(ctx context.Context, star *db.Star) {

     

       38
       38
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       39
       39
       +
       		DistinctId: star.StarredByDid,

     

       40
       40
       +
       		Event:      "star",

     

       41
       41
       +
       		Properties: posthog.Properties{"repo_at": star.RepoAt.String()},

     

       42
       42
       +
       	})

     

       43
       43
       +
       	if err != nil {

     

       44
       44
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       func (n *posthogNotifier) DeleteStar(ctx context.Context, star *db.Star) {

     

       49
       49
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       50
       50
       +
       		DistinctId: star.StarredByDid,

     

       51
       51
       +
       		Event:      "unstar",

     

       52
       52
       +
       		Properties: posthog.Properties{"repo_at": star.RepoAt.String()},

     

       53
       53
       +
       	})

     

       54
       54
       +
       	if err != nil {

     

       55
       55
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       56
       56
       +
       	}

     

       57
       57
       +
       }

     

       58
       58
       +
       

     

       59
       59
       +
       func (n *posthogNotifier) NewIssue(ctx context.Context, issue *db.Issue) {

     

       60
       60
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       61
       61
       +
       		DistinctId: issue.OwnerDid,

     

       62
       62
       +
       		Event:      "new_issue",

     

       63
       63
       +
       		Properties: posthog.Properties{

     

       64
       64
       +
       			"repo_at":  issue.RepoAt.String(),

     

       65
       65
       +
       			"issue_id": issue.IssueId,

     

       66
       66
       +
       		},

     

       67
       67
       +
       	})

     

       68
       68
       +
       	if err != nil {

     

       69
       69
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       70
       70
       +
       	}

     

       71
       71
       +
       }

     

       72
       72
       +
       

     

       73
       73
       +
       func (n *posthogNotifier) NewPull(ctx context.Context, pull *db.Pull) {

     

       74
       74
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       75
       75
       +
       		DistinctId: pull.OwnerDid,

     

       76
       76
       +
       		Event:      "new_pull",

     

       77
       77
       +
       		Properties: posthog.Properties{

     

       78
       78
       +
       			"repo_at":  pull.RepoAt,

     

       79
       79
       +
       			"pull_id": pull.PullId,

     

       80
       80
       +
       		},

     

       81
       81
       +
       	})

     

       82
       82
       +
       	if err != nil {

     

       83
       83
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       84
       84
       +
       	}

     

       85
       85
       +
       }

     

       86
       86
       +
       

     

       87
       87
       +
       func (n *posthogNotifier) NewPullComment(ctx context.Context, comment *db.PullComment) {

     

       88
       88
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       89
       89
       +
       		DistinctId: comment.OwnerDid,

     

       90
       90
       +
       		Event:      "new_pull_comment",

     

       91
       91
       +
       		Properties: posthog.Properties{

     

       92
       92
       +
       			"repo_at":  comment.RepoAt,

     

       93
       93
       +
       			"pull_id": comment.PullId,

     

       94
       94
       +
       		},

     

       95
       95
       +
       	})

     

       96
       96
       +
       	if err != nil {

     

       97
       97
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       98
       98
       +
       	}

     

       99
       99
       +
       }

     

       100
       100
       +
       

     

       101
       101
       +
       func (n *posthogNotifier) NewFollow(ctx context.Context, follow *db.Follow) {

     

       102
       102
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       103
       +
       		DistinctId: follow.UserDid,

     

       104
       104
       +
       		Event:      "follow",

     

       105
       105
       +
       		Properties: posthog.Properties{"subject": follow.SubjectDid},

     

       106
       106
       +
       	})

     

       107
       107
       +
       	if err != nil {

     

       108
       108
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       109
       109
       +
       	}

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       func (n *posthogNotifier) DeleteFollow(ctx context.Context, follow *db.Follow) {

     

       113
       113
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       114
       114
       +
       		DistinctId: follow.UserDid,

     

       115
       115
       +
       		Event:      "unfollow",

     

       116
       116
       +
       		Properties: posthog.Properties{"subject": follow.SubjectDid},

     

       117
       117
       +
       	})

     

       118
       118
       +
       	if err != nil {

     

       119
       119
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       120
       120
       +
       	}

     

       121
       121
       +
       }

     

       122
       122
       +
       

     

       123
       123
       +
       func (n *posthogNotifier) UpdateProfile(ctx context.Context, profile *db.Profile) {

     

       124
       124
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       125
       125
       +
       		DistinctId: profile.Did,

     

       126
       126
       +
       		Event:      "edit_profile",

     

       127
       127
       +
       	})

     

       128
       128
       +
       	if err != nil {

     

       129
       129
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       130
       130
       +
       	}

     

       131
       131
       +
       }

+14 -29

appview/pulls/pulls.go

···

       18
       18
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       20
       20
        
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       21
       21
       +
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       21
       22
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       22
       23
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       23
       24
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     
···

       31
       32
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       32
       33
        
       	"github.com/go-chi/chi/v5"

     

       33
       34
        
       	"github.com/google/uuid"

     

       34
       34
       -
       	"github.com/posthog/posthog-go"

     

       35
       35
        
       )

     

       36
       36
        
       

     

       37
       37
        
       type Pulls struct {

     
···

       41
       41
        
       	idResolver   *idresolver.Resolver

     

       42
       42
        
       	db           *db.DB

     

       43
       43
        
       	config       *config.Config

     

       44
       44
       -
       	posthog      posthog.Client

     

       44
       44
       +
       	notifier     notify.Notifier

     

       45
       45
        
       }

     

       46
       46
        
       

     

       47
       47
        
       func New(

     
···

       51
       51
        
       	resolver *idresolver.Resolver,

     

       52
       52
        
       	db *db.DB,

     

       53
       53
        
       	config *config.Config,

     

       54
       54
       -
       	posthog posthog.Client,

     

       54
       54
       +
       	notifier notify.Notifier,

     

       55
       55
        
       ) *Pulls {

     

       56
       56
        
       	return &Pulls{

     

       57
       57
        
       		oauth:        oauth,

     
···

       60
       60
        
       		idResolver:   resolver,

     

       61
       61
        
       		db:           db,

     

       62
       62
        
       		config:       config,

     

       63
       63
       -
       		posthog:      posthog,

     

       63
       63
       +
       		notifier:     notifier,

     

       64
       64
        
       	}

     

       65
       65
        
       }

     

       66
       66
        
       

     
···

       685
       685
        
       			return

     

       686
       686
        
       		}

     

       687
       687
        
       

     

       688
       688
       -
       		// Create the pull comment in the database with the commentAt field

     

       689
       689
       -
       		commentId, err := db.NewPullComment(tx, &db.PullComment{

     

       688
       688
       +
       		comment := &db.PullComment{

     

       690
       689
        
       			OwnerDid:     user.Did,

     

       691
       690
        
       			RepoAt:       f.RepoAt.String(),

     

       692
       691
        
       			PullId:       pull.PullId,

     

       693
       692
        
       			Body:         body,

     

       694
       693
        
       			CommentAt:    atResp.Uri,

     

       695
       694
        
       			SubmissionId: pull.Submissions[roundNumber].ID,

     

       696
       696
       -
       		})

     

       695
       695
       +
       		}

     

       696
       696
       +
       

     

       697
       697
       +
       		// Create the pull comment in the database with the commentAt field

     

       698
       698
       +
       		commentId, err := db.NewPullComment(tx, comment)

     

       697
       699
        
       		if err != nil {

     

       698
       700
        
       			log.Println("failed to create pull comment", err)

     

       699
       701
        
       			s.pages.Notice(w, "pull-comment", "Failed to create comment.")

     
···

       707
       709
        
       			return

     

       708
       710
        
       		}

     

       709
       711
        
       

     

       710
       710
       -
       		if !s.config.Core.Dev {

     

       711
       711
       -
       			err = s.posthog.Enqueue(posthog.Capture{

     

       712
       712
       -
       				DistinctId: user.Did,

     

       713
       713
       -
       				Event:      "new_pull_comment",

     

       714
       714
       -
       				Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "pull_id": pull.PullId},

     

       715
       715
       -
       			})

     

       716
       716
       -
       			if err != nil {

     

       717
       717
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       718
       718
       -
       			}

     

       719
       719
       -
       		}

     

       712
       712
       +
       		s.notifier.NewPullComment(r.Context(), comment)

     

       720
       713
        
       

     

       721
       714
        
       		s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", f.OwnerSlashRepo(), pull.PullId, commentId))

     

       722
       715
        
       		return

     
···

       1050
       1043
        
       		Patch:     patch,

     

       1051
       1044
        
       		SourceRev: sourceRev,

     

       1052
       1045
        
       	}

     

       1053
       1053
       -
       	err = db.NewPull(tx, &db.Pull{

     

       1046
       1046
       +
       	pull := &db.Pull{

     

       1054
       1047
        
       		Title:        title,

     

       1055
       1048
        
       		Body:         body,

     

       1056
       1049
        
       		TargetBranch: targetBranch,

     
···

       1061
       1054
        
       			&initialSubmission,

     

       1062
       1055
        
       		},

     

       1063
       1056
        
       		PullSource: pullSource,

     

       1064
       1064
       -
       	})

     

       1057
       1057
       +
       	}

     

       1058
       1058
       +
       	err = db.NewPull(tx, pull)

     

       1065
       1059
        
       	if err != nil {

     

       1066
       1060
        
       		log.Println("failed to create pull request", err)

     

       1067
       1061
        
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     
···

       1101
       1095
        
       		return

     

       1102
       1096
        
       	}

     

       1103
       1097
        
       

     

       1104
       1104
       -
       	if !s.config.Core.Dev {

     

       1105
       1105
       -
       		err = s.posthog.Enqueue(posthog.Capture{

     

       1106
       1106
       -
       			DistinctId: user.Did,

     

       1107
       1107
       -
       			Event:      "new_pull",

     

       1108
       1108
       -
       			Properties: posthog.Properties{"repo_at": f.RepoAt.String(), "pull_id": pullId},

     

       1109
       1109
       -
       		})

     

       1110
       1110
       -
       		if err != nil {

     

       1111
       1111
       -
       			log.Println("failed to enqueue posthog event:", err)

     

       1112
       1112
       -
       		}

     

       1113
       1113
       -
       	}

     

       1098
       1098
       +
       	s.notifier.NewPull(r.Context(), pull)

     

       1114
       1099
        
       

     

       1115
       1100
        
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pullId))

     

       1116
       1101
        
       }

+4 -4

appview/repo/repo.go

···

       23
       23
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       24
       24
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       25
       25
        
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       26
       26
       +
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       26
       27
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       27
       28
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       28
       29
        
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     
···

       36
       37
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       37
       38
        
       	"github.com/go-chi/chi/v5"

     

       38
       39
        
       	"github.com/go-git/go-git/v5/plumbing"

     

       39
       39
       -
       	"github.com/posthog/posthog-go"

     

       40
       40
        
       

     

       41
       41
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       42
       42
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     
···

       51
       51
        
       	spindlestream *eventconsumer.Consumer

     

       52
       52
        
       	db            *db.DB

     

       53
       53
        
       	enforcer      *rbac.Enforcer

     

       54
       54
       -
       	posthog       posthog.Client

     

       54
       54
       +
       	notifier      notify.Notifier

     

       55
       55
        
       }

     

       56
       56
        
       

     

       57
       57
        
       func New(

     
···

       62
       62
        
       	idResolver *idresolver.Resolver,

     

       63
       63
        
       	db *db.DB,

     

       64
       64
        
       	config *config.Config,

     

       65
       65
       -
       	posthog posthog.Client,

     

       65
       65
       +
       	notifier notify.Notifier,

     

       66
       66
        
       	enforcer *rbac.Enforcer,

     

       67
       67
        
       ) *Repo {

     

       68
       68
        
       	return &Repo{oauth: oauth,

     
···

       72
       72
        
       		config:        config,

     

       73
       73
        
       		spindlestream: spindlestream,

     

       74
       74
        
       		db:            db,

     

       75
       75
       -
       		posthog:       posthog,

     

       75
       75
       +
       		notifier:      notifier,

     

       76
       76
        
       		enforcer:      enforcer,

     

       77
       77
        
       	}

     

       78
       78
        
       }

+11 -24

appview/state/follow.go

···

       7
       7
        
       

     

       8
       8
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       9
       9
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       10
       10
       -
       	"github.com/posthog/posthog-go"

     

       11
       10
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       12
       11
        
       	"tangled.sh/tangled.sh/core/appview"

     

       13
       12
        
       	"tangled.sh/tangled.sh/core/appview/db"

     
···

       58
       57
        
       			return

     

       59
       58
        
       		}

     

       60
       59
        
       

     

       61
       61
       -
       		err = db.AddFollow(s.db, currentUser.Did, subjectIdent.DID.String(), rkey)

     

       60
       60
       +
       		log.Println("created atproto record: ", resp.Uri)

     

       61
       61
       +
       

     

       62
       62
       +
       		follow := &db.Follow{

     

       63
       63
       +
       			UserDid: currentUser.Did,

     

       64
       64
       +
       			SubjectDid: subjectIdent.DID.String(),

     

       65
       65
       +
       			Rkey: rkey,

     

       66
       66
       +
       		}

     

       67
       67
       +
       

     

       68
       68
       +
       		err = db.AddFollow(s.db, follow)

     

       62
       69
        
       		if err != nil {

     

       63
       70
        
       			log.Println("failed to follow", err)

     

       64
       71
        
       			return

     

       65
       72
        
       		}

     

       66
       73
        
       

     

       67
       67
       -
       		log.Println("created atproto record: ", resp.Uri)

     

       74
       74
       +
       		s.notifier.NewFollow(r.Context(), follow)

     

       68
       75
        
       

     

       69
       76
        
       		s.pages.FollowFragment(w, pages.FollowFragmentParams{

     

       70
       77
        
       			UserDid:      subjectIdent.DID.String(),

     

       71
       78
        
       			FollowStatus: db.IsFollowing,

     

       72
       79
        
       		})

     

       73
       80
        
       

     

       74
       74
       -
       		if !s.config.Core.Dev {

     

       75
       75
       -
       			err = s.posthog.Enqueue(posthog.Capture{

     

       76
       76
       -
       				DistinctId: currentUser.Did,

     

       77
       77
       -
       				Event:      "follow",

     

       78
       78
       -
       				Properties: posthog.Properties{"subject": subjectIdent.DID.String()},

     

       79
       79
       -
       			})

     

       80
       80
       -
       			if err != nil {

     

       81
       81
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       82
       82
       -
       			}

     

       83
       83
       -
       		}

     

       84
       84
       -
       

     

       85
       81
        
       		return

     

       86
       82
        
       	case http.MethodDelete:

     

       87
       83
        
       		// find the record in the db

     
···

       113
       109
        
       			FollowStatus: db.IsNotFollowing,

     

       114
       110
        
       		})

     

       115
       111
        
       

     

       116
       116
       -
       		if !s.config.Core.Dev {

     

       117
       117
       -
       			err = s.posthog.Enqueue(posthog.Capture{

     

       118
       118
       -
       				DistinctId: currentUser.Did,

     

       119
       119
       -
       				Event:      "unfollow",

     

       120
       120
       -
       				Properties: posthog.Properties{"subject": subjectIdent.DID.String()},

     

       121
       121
       -
       			})

     

       122
       122
       -
       			if err != nil {

     

       123
       123
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       124
       124
       -
       			}

     

       125
       125
       -
       		}

     

       112
       112
       +
       		s.notifier.DeleteFollow(r.Context(), follow)

     

       126
       113
        
       

     

       127
       114
        
       		return

     

       128
       115
        
       	}

+1 -10

appview/state/profile.go

···

       16
       16
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       17
       17
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       18
       18
        
       	"github.com/go-chi/chi/v5"

     

       19
       19
       -
       	"github.com/posthog/posthog-go"

     

       20
       19
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     
···

       371
       370
        
       		return

     

       372
       371
        
       	}

     

       373
       372
        
       

     

       374
       374
       -
       	if !s.config.Core.Dev {

     

       375
       375
       -
       		err = s.posthog.Enqueue(posthog.Capture{

     

       376
       376
       -
       			DistinctId: user.Did,

     

       377
       377
       -
       			Event:      "edit_profile",

     

       378
       378
       -
       		})

     

       379
       379
       -
       		if err != nil {

     

       380
       380
       -
       			log.Println("failed to enqueue posthog event:", err)

     

       381
       381
       -
       		}

     

       382
       382
       -
       	}

     

       373
       373
       +
       	s.notifier.UpdateProfile(r.Context(), profile)

     

       383
       374
        
       

     

       384
       375
        
       	s.pages.HxRedirect(w, "/"+user.Did)

     

       385
       376
        
       	return

+4 -4

appview/state/router.go

···

       198
       198
        
       }

     

       199
       199
        
       

     

       200
       200
        
       func (s *State) IssuesRouter(mw *middleware.Middleware) http.Handler {

     

       201
       201
       -
       	issues := issues.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.posthog)

     

       201
       201
       +
       	issues := issues.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.notifier)

     

       202
       202
        
       	return issues.Router(mw)

     

       203
       203
        
       }

     

       204
       204
        
       

     

       205
       205
        
       func (s *State) PullsRouter(mw *middleware.Middleware) http.Handler {

     

       206
       206
       -
       	pulls := pulls.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.posthog)

     

       206
       206
       +
       	pulls := pulls.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.notifier)

     

       207
       207
        
       	return pulls.Router(mw)

     

       208
       208
        
       }

     

       209
       209
        
       

     

       210
       210
        
       func (s *State) RepoRouter(mw *middleware.Middleware) http.Handler {

     

       211
       211
       -
       	repo := repo.New(s.oauth, s.repoResolver, s.pages, s.spindlestream, s.idResolver, s.db, s.config, s.posthog, s.enforcer)

     

       211
       211
       +
       	repo := repo.New(s.oauth, s.repoResolver, s.pages, s.spindlestream, s.idResolver, s.db, s.config, s.notifier, s.enforcer)

     

       212
       212
        
       	return repo.Router(mw)

     

       213
       213
        
       }

     

       214
       214
        
       

     

       215
       215
        
       func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler {

     

       216
       216
       -
       	pipes := pipelines.New(s.oauth, s.repoResolver, s.pages, s.spindlestream, s.idResolver, s.db, s.config, s.posthog, s.enforcer)

     

       216
       216
       +
       	pipes := pipelines.New(s.oauth, s.repoResolver, s.pages, s.spindlestream, s.idResolver, s.db, s.config, s.enforcer)

     

       217
       217
        
       	return pipes.Router(mw)

     

       218
       218
        
       }

+11 -25

appview/state/star.go

···

       8
       8
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

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

     

       10
       10
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       11
       11
       -
       	"github.com/posthog/posthog-go"

     

       12
       11
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       13
       12
        
       	"tangled.sh/tangled.sh/core/appview"

     

       14
       13
        
       	"tangled.sh/tangled.sh/core/appview/db"

     
···

       54
       53
        
       			log.Println("failed to create atproto record", err)

     

       55
       54
        
       			return

     

       56
       55
        
       		}

     

       56
       56
       +
       		log.Println("created atproto record: ", resp.Uri)

     

       57
       57
       +
       

     

       58
       58
       +
       		star := &db.Star{

     

       59
       59
       +
       			StarredByDid: currentUser.Did,

     

       60
       60
       +
       			RepoAt: subjectUri,

     

       61
       61
       +
       			Rkey: rkey,

     

       62
       62
       +
       		}

     

       57
       63
        
       

     

       58
       58
       -
       		err = db.AddStar(s.db, currentUser.Did, subjectUri, rkey)

     

       64
       64
       +
       		err = db.AddStar(s.db, star)

     

       59
       65
        
       		if err != nil {

     

       60
       66
        
       			log.Println("failed to star", err)

     

       61
       67
        
       			return

     
···

       66
       72
        
       			log.Println("failed to get star count for ", subjectUri)

     

       67
       73
        
       		}

     

       68
       74
        
       

     

       69
       69
       -
       		log.Println("created atproto record: ", resp.Uri)

     

       75
       75
       +
       		s.notifier.NewStar(r.Context(), star)

     

       70
       76
        
       

     

       71
       77
        
       		s.pages.RepoActionsFragment(w, pages.RepoActionsFragmentParams{

     

       72
       78
        
       			IsStarred: true,

     
···

       76
       82
        
       			},

     

       77
       83
        
       		})

     

       78
       84
        
       

     

       79
       79
       -
       		if !s.config.Core.Dev {

     

       80
       80
       -
       			err = s.posthog.Enqueue(posthog.Capture{

     

       81
       81
       -
       				DistinctId: currentUser.Did,

     

       82
       82
       -
       				Event:      "star",

     

       83
       83
       -
       				Properties: posthog.Properties{"repo_at": subjectUri.String()},

     

       84
       84
       -
       			})

     

       85
       85
       -
       			if err != nil {

     

       86
       86
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       87
       87
       -
       			}

     

       88
       88
       -
       		}

     

       89
       89
       -
       

     

       90
       85
        
       		return

     

       91
       86
        
       	case http.MethodDelete:

     

       92
       87
        
       		// find the record in the db

     
···

       119
       114
        
       			return

     

       120
       115
        
       		}

     

       121
       116
        
       

     

       117
       117
       +
       		s.notifier.DeleteStar(r.Context(), star)

     

       118
       118
       +
       

     

       122
       119
        
       		s.pages.RepoActionsFragment(w, pages.RepoActionsFragmentParams{

     

       123
       120
        
       			IsStarred: false,

     

       124
       121
        
       			RepoAt:    subjectUri,

     
···

       127
       124
        
       			},

     

       128
       125
        
       		})

     

       129
       126
        
       

     

       130
       130
       -
       		if !s.config.Core.Dev {

     

       131
       131
       -
       			err = s.posthog.Enqueue(posthog.Capture{

     

       132
       132
       -
       				DistinctId: currentUser.Did,

     

       133
       133
       -
       				Event:      "unstar",

     

       134
       134
       -
       				Properties: posthog.Properties{"repo_at": subjectUri.String()},

     

       135
       135
       -
       			})

     

       136
       136
       -
       			if err != nil {

     

       137
       137
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       138
       138
       -
       			}

     

       139
       139
       -
       		}

     

       140
       140
       -
       

     

       141
       127
        
       		return

     

       142
       128
        
       	}

     

       143
       129

+3 -10

appview/state/state.go

···

       25
       25
        
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       26
       26
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       27
       27
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       28
       28
       +
       	posthog_service "tangled.sh/tangled.sh/core/appview/posthog"

     

       28
       29
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       29
       30
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       30
       31
        
       	"tangled.sh/tangled.sh/core/jetstream"

     
···

       134
       135
        
       	spindlestream.Start(ctx)

     

       135
       136
        
       

     

       136
       137
        
       	notifier := notify.NewMergedNotifier(

     

       138
       138
       +
       		posthog_service.NewPosthogNotifier(posthog),

     

       137
       139
        
       	)

     

       138
       140
        
       

     

       139
       141
        
       	state := &State{

     
···

       766
       768
        
       			return

     

       767
       769
        
       		}

     

       768
       770
        
       

     

       769
       769
       -
       		if !s.config.Core.Dev {

     

       770
       770
       -
       			err = s.posthog.Enqueue(posthog.Capture{

     

       771
       771
       -
       				DistinctId: user.Did,

     

       772
       772
       -
       				Event:      "new_repo",

     

       773
       773
       -
       				Properties: posthog.Properties{"repo": repoName, "repo_at": repo.AtUri},

     

       774
       774
       -
       			})

     

       775
       775
       -
       			if err != nil {

     

       776
       776
       -
       				log.Println("failed to enqueue posthog event:", err)

     

       777
       777
       -
       			}

     

       778
       778
       -
       		}

     

       771
       771
       +
       		s.notifier.NewRepo(r.Context(), repo)

     

       779
       772
        
       

     

       780
       773
        
       		s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s", user.Handle, repoName))

     

       781
       774
        
       		return