patch of appview/notify: merge new comment events into one · round #0 · pull #867 · tangled.org/core

+1 -1

appview/issues/issues.go

···

       488
       488
        
       	// reset atUri to make rollback a no-op

     

       489
       489
        
       	atUri = ""

     

       490
       490
        
       

     

       491
       491
       -
       	rp.notifier.NewIssueComment(r.Context(), &comment, mentions)

     

       491
       491
       +
       	rp.notifier.NewComment(r.Context(), &comment)

     

       492
       492
        
       

     

       493
       493
        
       	ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)

     

       494
       494
        
       	rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d#comment-%d", ownerSlashRepo, issue.IssueId, comment.Id))

+105 -110

appview/notify/db/db.go

···

       73
       73
        
       	// no-op

     

       74
       74
        
       }

     

       75
       75
        
       

     

       76
       76
       -
       func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) {

     

       76
       76
       +
       func (n *databaseNotifier) NewComment(ctx context.Context, comment *models.Comment) {

     

       77
       77
       +
       	var (

     

       78
       78
       +
       		recipients []syntax.DID

     

       79
       79
       +
       		entityType string

     

       80
       80
       +
       		entityId   string

     

       81
       81
       +
       		repoId     *int64

     

       82
       82
       +
       		issueId    *int64

     

       83
       83
       +
       		pullId     *int64

     

       84
       84
       +
       	)

     

       77
       85
        
       

     

       78
       78
       -
       	// build the recipients list

     

       79
       79
       -
       	// - owner of the repo

     

       80
       80
       -
       	// - collaborators in the repo

     

       81
       81
       -
       	var recipients []syntax.DID

     

       82
       82
       -
       	recipients = append(recipients, syntax.DID(issue.Repo.Did))

     

       83
       83
       -
       	collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", issue.Repo.RepoAt()))

     

       86
       86
       +
       	subjectDid, err := comment.Subject.Authority().AsDID()

     

       84
       87
        
       	if err != nil {

     

       85
       85
       -
       		log.Printf("failed to fetch collaborators: %v", err)

     

       88
       88
       +
       		log.Printf("NewComment: expected did based at-uri for comment.subject")

     

       86
       89
        
       		return

     

       87
       90
        
       	}

     

       88
       88
       -
       	for _, c := range collaborators {

     

       89
       89
       -
       		recipients = append(recipients, c.SubjectDid)

     

       90
       90
       -
       	}

     

       91
       91
       +
       	switch comment.Subject.Collection() {

     

       92
       92
       +
       	case tangled.RepoIssueNSID:

     

       93
       93
       +
       		issues, err := db.GetIssues(

     

       94
       94
       +
       			n.db,

     

       95
       95
       +
       			db.FilterEq("did", subjectDid),

     

       96
       96
       +
       			db.FilterEq("rkey", comment.Subject.RecordKey()),

     

       97
       97
       +
       		)

     

       98
       98
       +
       		if err != nil {

     

       99
       99
       +
       			log.Printf("NewComment: failed to get issues: %v", err)

     

       100
       100
       +
       			return

     

       101
       101
       +
       		}

     

       102
       102
       +
       		if len(issues) == 0 {

     

       103
       103
       +
       			log.Printf("NewComment: no issue found for %s", comment.Subject)

     

       104
       104
       +
       			return

     

       105
       105
       +
       		}

     

       106
       106
       +
       		issue := issues[0]

     

       107
       107
       +
       

     

       108
       108
       +
       		recipients = append(recipients, syntax.DID(issue.Repo.Did))

     

       109
       109
       +
       		if comment.IsReply() {

     

       110
       110
       +
       			// if this comment is a reply, then notify everybody in that thread

     

       111
       111
       +
       			parentAtUri := *comment.ReplyTo

     

       112
       112
       +
       			allThreads := issue.CommentList()

     

       113
       113
       +
       

     

       114
       114
       +
       			// find the parent thread, and add all DIDs from here to the recipient list

     

       115
       115
       +
       			for _, t := range allThreads {

     

       116
       116
       +
       				if t.Self.AtUri() == parentAtUri {

     

       117
       117
       +
       					recipients = append(recipients, t.Participants()...)

     

       118
       118
       +
       				}

     

       119
       119
       +
       			}

     

       120
       120
       +
       		} else {

     

       121
       121
       +
       			// not a reply, notify just the issue author

     

       122
       122
       +
       			recipients = append(recipients, syntax.DID(issue.Did))

     

       123
       123
       +
       		}

     

       91
       124
        
       

     

       92
       92
       -
       	actorDid := syntax.DID(issue.Did)

     

       93
       93
       -
       	entityType := "issue"

     

       94
       94
       -
       	entityId := issue.AtUri().String()

     

       95
       95
       -
       	repoId := &issue.Repo.Id

     

       96
       96
       -
       	issueId := &issue.Id

     

       97
       97
       -
       	var pullId *int64

     

       125
       125
       +
       		entityType = "issue"

     

       126
       126
       +
       		entityId = issue.AtUri().String()

     

       127
       127
       +
       		repoId = &issue.Repo.Id

     

       128
       128
       +
       		issueId = &issue.Id

     

       129
       129
       +
       	case tangled.RepoPullNSID:

     

       130
       130
       +
       		pulls, err := db.GetPullsWithLimit(

     

       131
       131
       +
       			n.db,

     

       132
       132
       +
       			1,

     

       133
       133
       +
       			db.FilterEq("owner_did", subjectDid),

     

       134
       134
       +
       			db.FilterEq("rkey", comment.Subject.RecordKey()),

     

       135
       135
       +
       		)

     

       136
       136
       +
       		if err != nil {

     

       137
       137
       +
       			log.Printf("NewComment: failed to get pulls: %v", err)

     

       138
       138
       +
       			return

     

       139
       139
       +
       		}

     

       140
       140
       +
       		if len(pulls) == 0 {

     

       141
       141
       +
       			log.Printf("NewComment: no pull found for %s", comment.Subject)

     

       142
       142
       +
       			return

     

       143
       143
       +
       		}

     

       144
       144
       +
       		pull := pulls[0]

     

       145
       145
       +
       

     

       146
       146
       +
       		pull.Repo, err = db.GetRepo(n.db, db.FilterEq("at_uri", pull.RepoAt))

     

       147
       147
       +
       		if err != nil {

     

       148
       148
       +
       			log.Printf("NewComment: failed to get repos: %v", err)

     

       149
       149
       +
       			return

     

       150
       150
       +
       		}

     

       151
       151
       +
       

     

       152
       152
       +
       		recipients = append(recipients, syntax.DID(pull.Repo.Did))

     

       153
       153
       +
       		for _, p := range pull.Participants() {

     

       154
       154
       +
       			recipients = append(recipients, syntax.DID(p))

     

       155
       155
       +
       		}

     

       156
       156
       +
       

     

       157
       157
       +
       		entityType = "pull"

     

       158
       158
       +
       		entityId = pull.AtUri().String()

     

       159
       159
       +
       		repoId = &pull.Repo.Id

     

       160
       160
       +
       		p := int64(pull.ID)

     

       161
       161
       +
       		pullId = &p

     

       162
       162
       +
       	default:

     

       163
       163
       +
       		return // no-op

     

       164
       164
       +
       	}

     

       98
       165
        
       

     

       99
       166
        
       	n.notifyEvent(

     

       100
       100
       -
       		actorDid,

     

       167
       167
       +
       		comment.Did,

     

       101
       168
        
       		recipients,

     

       102
       102
       -
       		models.NotificationTypeIssueCreated,

     

       169
       169
       +
       		models.NotificationTypeIssueCommented,

     

       103
       170
        
       		entityType,

     

       104
       171
        
       		entityId,

     

       105
       172
        
       		repoId,

     
···

       107
       174
        
       		pullId,

     

       108
       175
        
       	)

     

       109
       176
        
       	n.notifyEvent(

     

       110
       110
       -
       		actorDid,

     

       111
       111
       -
       		mentions,

     

       177
       177
       +
       		comment.Did,

     

       178
       178
       +
       		comment.Mentions,

     

       112
       179
        
       		models.NotificationTypeUserMentioned,

     

       113
       180
        
       		entityType,

     

       114
       181
        
       		entityId,

     
···

       118
       185
        
       	)

     

       119
       186
        
       }

     

       120
       187
        
       

     

       121
       121
       -
       func (n *databaseNotifier) NewIssueComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       122
       122
       -
       	issues, err := db.GetIssues(n.db, db.FilterEq("at_uri", comment.Subject))

     

       123
       123
       -
       	if err != nil {

     

       124
       124
       -
       		log.Printf("NewIssueComment: failed to get issues: %v", err)

     

       125
       125
       -
       		return

     

       126
       126
       -
       	}

     

       127
       127
       -
       	if len(issues) == 0 {

     

       128
       128
       -
       		log.Printf("NewIssueComment: no issue found for %s", comment.Subject)

     

       129
       129
       -
       		return

     

       130
       130
       -
       	}

     

       131
       131
       -
       	issue := issues[0]

     

       188
       188
       +
       func (n *databaseNotifier) DeleteComment(ctx context.Context, comment *models.Comment) {

     

       189
       189
       +
       	// no-op

     

       190
       190
       +
       }

     

       191
       191
       +
       

     

       192
       192
       +
       func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) {

     

       132
       193
        
       

     

       194
       194
       +
       	// build the recipients list

     

       195
       195
       +
       	// - owner of the repo

     

       196
       196
       +
       	// - collaborators in the repo

     

       133
       197
        
       	var recipients []syntax.DID

     

       134
       198
        
       	recipients = append(recipients, syntax.DID(issue.Repo.Did))

     

       135
       135
       -
       

     

       136
       136
       -
       	if comment.IsReply() {

     

       137
       137
       -
       		// if this comment is a reply, then notify everybody in that thread

     

       138
       138
       -
       		parentAtUri := *comment.ReplyTo

     

       139
       139
       -
       		allThreads := issue.CommentList()

     

       140
       140
       -
       

     

       141
       141
       -
       		// find the parent thread, and add all DIDs from here to the recipient list

     

       142
       142
       -
       		for _, t := range allThreads {

     

       143
       143
       -
       			if t.Self.AtUri() == parentAtUri {

     

       144
       144
       -
       				recipients = append(recipients, t.Participants()...)

     

       145
       145
       -
       			}

     

       146
       146
       -
       		}

     

       147
       147
       -
       	} else {

     

       148
       148
       -
       		// not a reply, notify just the issue author

     

       149
       149
       -
       		recipients = append(recipients, syntax.DID(issue.Did))

     

       199
       199
       +
       	collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", issue.Repo.RepoAt()))

     

       200
       200
       +
       	if err != nil {

     

       201
       201
       +
       		log.Printf("failed to fetch collaborators: %v", err)

     

       202
       202
       +
       		return

     

       203
       203
       +
       	}

     

       204
       204
       +
       	for _, c := range collaborators {

     

       205
       205
       +
       		recipients = append(recipients, c.SubjectDid)

     

       150
       206
        
       	}

     

       151
       207
        
       

     

       152
       152
       -
       	actorDid := syntax.DID(comment.Did)

     

       208
       208
       +
       	actorDid := syntax.DID(issue.Did)

     

       153
       209
        
       	entityType := "issue"

     

       154
       210
        
       	entityId := issue.AtUri().String()

     

       155
       211
        
       	repoId := &issue.Repo.Id

     
···

       159
       215
        
       	n.notifyEvent(

     

       160
       216
        
       		actorDid,

     

       161
       217
        
       		recipients,

     

       162
       162
       -
       		models.NotificationTypeIssueCommented,

     

       218
       218
       +
       		models.NotificationTypeIssueCreated,

     

       163
       219
        
       		entityType,

     

       164
       220
        
       		entityId,

     

       165
       221
        
       		repoId,

     
···

       248
       304
        
       	)

     

       249
       305
        
       }

     

       250
       306
        
       

     

       251
       251
       -
       func (n *databaseNotifier) NewPullComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       252
       252
       -
       	pulls, err := db.GetPulls(n.db,

     

       253
       253
       -
       		db.FilterEq("owner_did", comment.Subject.Authority()),

     

       254
       254
       -
       		db.FilterEq("rkey", comment.Subject.RecordKey()),

     

       255
       255
       -
       	)

     

       256
       256
       -
       	if err != nil {

     

       257
       257
       -
       		log.Printf("NewPullComment: failed to get pulls: %v", err)

     

       258
       258
       -
       		return

     

       259
       259
       -
       	}

     

       260
       260
       -
       	if len(pulls) == 0 {

     

       261
       261
       -
       		log.Printf("NewPullComment: no pull found for %s", comment.Subject)

     

       262
       262
       -
       		return

     

       263
       263
       -
       	}

     

       264
       264
       -
       	pull := pulls[0]

     

       265
       265
       -
       

     

       266
       266
       -
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", pull.RepoAt))

     

       267
       267
       -
       	if err != nil {

     

       268
       268
       -
       		log.Printf("NewPullComment: failed to get repos: %v", err)

     

       269
       269
       -
       		return

     

       270
       270
       -
       	}

     

       271
       271
       -
       

     

       272
       272
       -
       	// build up the recipients list:

     

       273
       273
       -
       	// - repo owner

     

       274
       274
       -
       	// - all pull participants

     

       275
       275
       -
       	var recipients []syntax.DID

     

       276
       276
       -
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       277
       277
       -
       	for _, p := range pull.Participants() {

     

       278
       278
       -
       		recipients = append(recipients, syntax.DID(p))

     

       279
       279
       -
       	}

     

       280
       280
       -
       

     

       281
       281
       -
       	actorDid := comment.Did

     

       282
       282
       -
       	eventType := models.NotificationTypePullCommented

     

       283
       283
       -
       	entityType := "pull"

     

       284
       284
       -
       	entityId := pull.AtUri().String()

     

       285
       285
       -
       	repoId := &repo.Id

     

       286
       286
       -
       	var issueId *int64

     

       287
       287
       -
       	p := int64(pull.ID)

     

       288
       288
       -
       	pullId := &p

     

       289
       289
       -
       

     

       290
       290
       -
       	n.notifyEvent(

     

       291
       291
       -
       		actorDid,

     

       292
       292
       -
       		recipients,

     

       293
       293
       -
       		eventType,

     

       294
       294
       -
       		entityType,

     

       295
       295
       -
       		entityId,

     

       296
       296
       -
       		repoId,

     

       297
       297
       -
       		issueId,

     

       298
       298
       -
       		pullId,

     

       299
       299
       -
       	)

     

       300
       300
       -
       	n.notifyEvent(

     

       301
       301
       -
       		actorDid,

     

       302
       302
       -
       		mentions,

     

       303
       303
       -
       		models.NotificationTypeUserMentioned,

     

       304
       304
       -
       		entityType,

     

       305
       305
       -
       		entityId,

     

       306
       306
       -
       		repoId,

     

       307
       307
       -
       		issueId,

     

       308
       308
       -
       		pullId,

     

       309
       309
       -
       	)

     

       310
       310
       -
       }

     

       311
       311
       -
       

     

       312
       307
        
       func (n *databaseNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) {

     

       313
       308
        
       	// no-op

     

       314
       309
        
       }

+8 -8

appview/notify/merged_notifier.go

···

       54
       54
        
       	m.fanout("DeleteStar", ctx, star)

     

       55
       55
        
       }

     

       56
       56
        
       

     

       57
       57
       -
       func (m *mergedNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) {

     

       58
       58
       -
       	m.fanout("NewIssue", ctx, issue, mentions)

     

       57
       57
       +
       func (m *mergedNotifier) NewComment(ctx context.Context, comment *models.Comment) {

     

       58
       58
       +
       	m.fanout("NewComment", ctx, comment)

     

       59
       59
       +
       }

     

       60
       60
       +
       

     

       61
       61
       +
       func (m *mergedNotifier) DeleteComment(ctx context.Context, comment *models.Comment) {

     

       62
       62
       +
       	m.fanout("DeleteComment", ctx, comment)

     

       59
       63
        
       }

     

       60
       64
        
       

     

       61
       61
       -
       func (m *mergedNotifier) NewIssueComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       62
       62
       -
       	m.fanout("NewIssueComment", ctx, comment, mentions)

     

       65
       65
       +
       func (m *mergedNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) {

     

       66
       66
       +
       	m.fanout("NewIssue", ctx, issue, mentions)

     

       63
       67
        
       }

     

       64
       68
        
       

     

       65
       69
        
       func (m *mergedNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) {

     
···

       82
       86
        
       	m.fanout("NewPull", ctx, pull)

     

       83
       87
        
       }

     

       84
       88
        
       

     

       85
       85
       -
       func (m *mergedNotifier) NewPullComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       86
       86
       -
       	m.fanout("NewPullComment", ctx, comment, mentions)

     

       87
       87
       -
       }

     

       88
       88
       -
       

     

       89
       89
        
       func (m *mergedNotifier) NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull) {

     

       90
       90
        
       	m.fanout("NewPullState", ctx, actor, pull)

     

       91
       91
        
       }

+6 -6

appview/notify/notifier.go

···

       13
       13
        
       	NewStar(ctx context.Context, star *models.Star)

     

       14
       14
        
       	DeleteStar(ctx context.Context, star *models.Star)

     

       15
       15
        
       

     

       16
       16
       +
       	NewComment(ctx context.Context, comment *models.Comment)

     

       17
       17
       +
       	DeleteComment(ctx context.Context, comment *models.Comment)

     

       18
       18
       +
       

     

       16
       19
        
       	NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID)

     

       17
       17
       -
       	NewIssueComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID)

     

       18
       20
        
       	NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue)

     

       19
       21
        
       	DeleteIssue(ctx context.Context, issue *models.Issue)

     

       20
       22
        
       

     
···

       22
       24
        
       	DeleteFollow(ctx context.Context, follow *models.Follow)

     

       23
       25
        
       

     

       24
       26
        
       	NewPull(ctx context.Context, pull *models.Pull)

     

       25
       25
       -
       	NewPullComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID)

     

       26
       27
        
       	NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull)

     

       27
       28
        
       

     

       28
       29
        
       	UpdateProfile(ctx context.Context, profile *models.Profile)

     
···

       42
       43
        
       func (m *BaseNotifier) NewStar(ctx context.Context, star *models.Star)    {}

     

       43
       44
        
       func (m *BaseNotifier) DeleteStar(ctx context.Context, star *models.Star) {}

     

       44
       45
        
       

     

       46
       46
       +
       func (m *BaseNotifier) NewComment(ctx context.Context, comment *models.Comment)    {}

     

       47
       47
       +
       func (m *BaseNotifier) DeleteComment(ctx context.Context, comment *models.Comment) {}

     

       48
       48
       +
       

     

       45
       49
        
       func (m *BaseNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) {}

     

       46
       46
       -
       func (m *BaseNotifier) NewIssueComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       47
       47
       -
       }

     

       48
       50
        
       func (m *BaseNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) {}

     

       49
       51
        
       func (m *BaseNotifier) DeleteIssue(ctx context.Context, issue *models.Issue)                     {}

     

       50
       52
        
       

     
···

       52
       54
        
       func (m *BaseNotifier) DeleteFollow(ctx context.Context, follow *models.Follow) {}

     

       53
       55
        
       

     

       54
       56
        
       func (m *BaseNotifier) NewPull(ctx context.Context, pull *models.Pull) {}

     

       55
       55
       -
       func (m *BaseNotifier) NewPullComment(ctx context.Context, models *models.Comment, mentions []syntax.DID) {

     

       56
       56
       -
       }

     

       57
       57
        
       func (m *BaseNotifier) NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull) {}

     

       58
       58
        
       

     

       59
       59
        
       func (m *BaseNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) {}

+4 -18

appview/notify/posthog/notifier.go

···

       86
       86
        
       	}

     

       87
       87
        
       }

     

       88
       88
        
       

     

       89
       89
       -
       func (n *posthogNotifier) NewPullComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       90
       90
       -
       	err := n.client.Enqueue(posthog.Capture{

     

       91
       91
       -
       		DistinctId: comment.Did.String(),

     

       92
       92
       -
       		Event:      "new_pull_comment",

     

       93
       93
       -
       		Properties: posthog.Properties{

     

       94
       94
       -
       			"pull_at":  comment.Subject,

     

       95
       95
       -
       			"mentions": mentions,

     

       96
       96
       -
       		},

     

       97
       97
       -
       	})

     

       98
       98
       -
       	if err != nil {

     

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

     

       100
       100
       -
       	}

     

       101
       101
       -
       }

     

       102
       102
       -
       

     

       103
       89
        
       func (n *posthogNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       104
       90
        
       	err := n.client.Enqueue(posthog.Capture{

     

       105
       91
        
       		DistinctId: pull.OwnerDid,

     
···

       179
       165
        
       	}

     

       180
       166
        
       }

     

       181
       167
        
       

     

       182
       182
       -
       func (n *posthogNotifier) NewIssueComment(ctx context.Context, comment *models.Comment, mentions []syntax.DID) {

     

       168
       168
       +
       func (n *posthogNotifier) NewComment(ctx context.Context, comment *models.Comment) {

     

       183
       169
        
       	err := n.client.Enqueue(posthog.Capture{

     

       184
       170
        
       		DistinctId: comment.Did.String(),

     

       185
       185
       -
       		Event:      "new_issue_comment",

     

       171
       171
       +
       		Event:      "new_comment",

     

       186
       172
        
       		Properties: posthog.Properties{

     

       187
       187
       -
       			"issue_at": comment.Subject,

     

       188
       188
       -
       			"mentions": mentions,

     

       173
       173
       +
       			"subject_at": comment.Subject,

     

       174
       174
       +
       			"mentions":   comment.Mentions,

     

       189
       175
        
       		},

     

       190
       176
        
       	})

     

       191
       177
        
       	if err != nil {

+1 -1

appview/pulls/pulls.go

···

       793
       793
        
       			return

     

       794
       794
        
       		}

     

       795
       795
        
       

     

       796
       796
       -
       		s.notifier.NewPullComment(r.Context(), &comment, mentions)

     

       796
       796
       +
       		s.notifier.NewComment(r.Context(), &comment)

     

       797
       797
        
       

     

       798
       798
        
       		ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)

     

       799
       799
        
       		s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", ownerSlashRepo, pull.PullId, comment.Id))