patch of appview/notify: notify users mentioned on PR comments · round #12 · pull #739 · tangled.org/core

+11 -1

appview/notify/db/db.go

···

       239
       239
        
       	)

     

       240
       240
        
       }

     

       241
       241
        
       

     

       242
       242
       -
       func (n *databaseNotifier) NewPullComment(ctx context.Context, comment *models.PullComment) {

     

       242
       242
       +
       func (n *databaseNotifier) NewPullComment(ctx context.Context, comment *models.PullComment, mentions []syntax.DID) {

     

       243
       243
        
       	pull, err := db.GetPull(n.db,

     

       244
       244
        
       		syntax.ATURI(comment.RepoAt),

     

       245
       245
        
       		comment.PullId,

     
···

       283
       283
        
       		issueId,

     

       284
       284
        
       		pullId,

     

       285
       285
        
       	)

     

       286
       286
       +
       	n.notifyEvent(

     

       287
       287
       +
       		actorDid,

     

       288
       288
       +
       		mentions,

     

       289
       289
       +
       		models.NotificationTypeUserMentioned,

     

       290
       290
       +
       		entityType,

     

       291
       291
       +
       		entityId,

     

       292
       292
       +
       		repoId,

     

       293
       293
       +
       		issueId,

     

       294
       294
       +
       		pullId,

     

       295
       295
       +
       	)

     

       286
       296
        
       }

     

       287
       297
        
       

     

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

+2 -2

appview/notify/merged_notifier.go

···

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

     

       83
       83
        
       }

     

       84
       84
        
       

     

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

     

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

     

       85
       85
       +
       func (m *mergedNotifier) NewPullComment(ctx context.Context, comment *models.PullComment, 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) {

+4 -3

appview/notify/notifier.go

···

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

     

       23
       23
        
       

     

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

     

       25
       25
       -
       	NewPullComment(ctx context.Context, comment *models.PullComment)

     

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

     

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

     

       27
       27
        
       

     

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

     
···

       51
       51
        
       func (m *BaseNotifier) NewFollow(ctx context.Context, follow *models.Follow)    {}

     

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

     

       53
       53
        
       

     

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

     

       55
       55
       -
       func (m *BaseNotifier) NewPullComment(ctx context.Context, models *models.PullComment)        {}

     

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

     

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

     

       56
       56
       +
       }

     

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

     

       57
       58
        
       

     

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

+4 -3

appview/notify/posthog/notifier.go

···

       86
       86
        
       	}

     

       87
       87
        
       }

     

       88
       88
        
       

     

       89
       89
       -
       func (n *posthogNotifier) NewPullComment(ctx context.Context, comment *models.PullComment) {

     

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

     

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

     

       91
       91
        
       		DistinctId: comment.OwnerDid,

     

       92
       92
        
       		Event:      "new_pull_comment",

     

       93
       93
        
       		Properties: posthog.Properties{

     

       94
       94
       -
       			"repo_at": comment.RepoAt,

     

       95
       95
       -
       			"pull_id": comment.PullId,

     

       94
       94
       +
       			"repo_at":  comment.RepoAt,

     

       95
       95
       +
       			"pull_id":  comment.PullId,

     

       96
       96
       +
       			"mentions": mentions,

     

       96
       97
        
       		},

     

       97
       98
        
       	})

     

       98
       99
        
       	if err != nil {

+3 -3

appview/pages/markup/extension/atlink.go

···

       16
       16
        
       

     

       17
       17
        
       // An AtNode struct represents an AtNode

     

       18
       18
        
       type AtNode struct {

     

       19
       19
       -
       	handle string

     

       19
       19
       +
       	Handle string

     

       20
       20
        
       	ast.BaseInline

     

       21
       21
        
       }

     

       22
       22
        
       

     
···

       59
       59
        
       	block.Advance(m[1])

     

       60
       60
        
       	node := &AtNode{}

     

       61
       61
        
       	node.AppendChild(node, ast.NewTextSegment(atSegment))

     

       62
       62
       -
       	node.handle = string(atSegment.Value(block.Source())[1:])

     

       62
       62
       +
       	node.Handle = string(atSegment.Value(block.Source())[1:])

     

       63
       63
        
       	return node

     

       64
       64
        
       }

     

       65
       65
        
       

     
···

       88
       88
        
       func (r *atHtmlRenderer) renderAt(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) {

     

       89
       89
        
       	if entering {

     

       90
       90
        
       		w.WriteString(`<a href="/@`)

     

       91
       91
       -
       		w.WriteString(n.(*AtNode).handle)

     

       91
       91
       +
       		w.WriteString(n.(*AtNode).Handle)

     

       92
       92
        
       		w.WriteString(`" class="mention">`)

     

       93
       93
        
       	} else {

     

       94
       94
        
       		w.WriteString("</a>")

+24

appview/pages/markup/markdown.go

···

       302
       302
        
       	return path.Join(rctx.CurrentDir, dst)

     

       303
       303
        
       }

     

       304
       304
        
       

     

       305
       305
       +
       // FindUserMentions returns Set of user handles from given markup soruce.

     

       306
       306
       +
       // It doesn't guarntee unique DIDs

     

       307
       307
       +
       func FindUserMentions(source string) []string {

     

       308
       308
       +
       	var (

     

       309
       309
       +
       		mentions    []string

     

       310
       310
       +
       		mentionsSet = make(map[string]struct{})

     

       311
       311
       +
       		md          = NewMarkdown()

     

       312
       312
       +
       		sourceBytes = []byte(source)

     

       313
       313
       +
       		root        = md.Parser().Parse(text.NewReader(sourceBytes))

     

       314
       314
       +
       	)

     

       315
       315
       +
       	ast.Walk(root, func(n ast.Node, entering bool) (ast.WalkStatus, error) {

     

       316
       316
       +
       		if entering && n.Kind() == textension.KindAt {

     

       317
       317
       +
       			handle := n.(*textension.AtNode).Handle

     

       318
       318
       +
       			mentionsSet[handle] = struct{}{}

     

       319
       319
       +
       			return ast.WalkSkipChildren, nil

     

       320
       320
       +
       		}

     

       321
       321
       +
       		return ast.WalkContinue, nil

     

       322
       322
       +
       	})

     

       323
       323
       +
       	for handle := range mentionsSet {

     

       324
       324
       +
       		mentions = append(mentions, handle)

     

       325
       325
       +
       	}

     

       326
       326
       +
       	return mentions

     

       327
       327
       +
       }

     

       328
       328
       +
       

     

       305
       329
        
       func isAbsoluteUrl(link string) bool {

     

       306
       330
        
       	parsed, err := url.Parse(link)

     

       307
       331
        
       	if err != nil {

+11 -1

appview/pulls/pulls.go

···

       691
       691
        
       }

     

       692
       692
        
       

     

       693
       693
        
       func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) {

     

       694
       694
       +
       	l := s.logger.With("handler", "PullComment")

     

       694
       695
        
       	user := s.oauth.GetUser(r)

     

       695
       696
        
       	f, err := s.repoResolver.Resolve(r)

     

       696
       697
        
       	if err != nil {

     
···

       788
       789
        
       			return

     

       789
       790
        
       		}

     

       790
       791
        
       

     

       791
       791
       -
       		s.notifier.NewPullComment(r.Context(), comment)

     

       792
       792
       +
       		rawMentions := markup.FindUserMentions(comment.Body)

     

       793
       793
       +
       		idents := s.idResolver.ResolveIdents(r.Context(), rawMentions)

     

       794
       794
       +
       		l.Debug("parsed mentions", "raw", rawMentions, "idents", idents)

     

       795
       795
       +
       		var mentions []syntax.DID

     

       796
       796
       +
       		for _, ident := range idents {

     

       797
       797
       +
       			if ident != nil && !ident.Handle.IsInvalidHandle() {

     

       798
       798
       +
       				mentions = append(mentions, ident.DID)

     

       799
       799
       +
       			}

     

       800
       800
       +
       		}

     

       801
       801
       +
       		s.notifier.NewPullComment(r.Context(), comment, mentions)

     

       792
       802
        
       

     

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

     

       794
       804
        
       		return