patch of appview/notify/db: refactor db notifier · round #1 · pull #680 · tangled.org/core

+53

appview/db/collaborators.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
        
       	"strings"

     

       6
       6
       +
       	"time"

     

       6
       7
        
       

     

       7
       8
        
       	"tangled.org/core/appview/models"

     

       8
       9
        
       )

     
···

       59
       60
        
       

     

       60
       61
        
       	return GetRepos(e, 0, FilterIn("at_uri", repoAts))

     

       61
       62
        
       }

     

       63
       63
       +
       

     

       64
       64
       +
       func GetCollaborators(e Execer, filters ...filter) ([]models.Collaborator, error) {

     

       65
       65
       +
       	var collaborators []models.Collaborator

     

       66
       66
       +
       	var conditions []string

     

       67
       67
       +
       	var args []any

     

       68
       68
       +
       	for _, filter := range filters {

     

       69
       69
       +
       		conditions = append(conditions, filter.Condition())

     

       70
       70
       +
       		args = append(args, filter.Arg()...)

     

       71
       71
       +
       	}

     

       72
       72
       +
       	whereClause := ""

     

       73
       73
       +
       	if conditions != nil {

     

       74
       74
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       75
       75
       +
       	}

     

       76
       76
       +
       	query := fmt.Sprintf(`select

     

       77
       77
       +
       			id,

     

       78
       78
       +
       			did,

     

       79
       79
       +
       			rkey,

     

       80
       80
       +
       			subject_did,

     

       81
       81
       +
       			repo_at,

     

       82
       82
       +
       			created

     

       83
       83
       +
       		from collaborators %s`,

     

       84
       84
       +
       		whereClause,

     

       85
       85
       +
       	)

     

       86
       86
       +
       	rows, err := e.Query(query, args...)

     

       87
       87
       +
       	if err != nil {

     

       88
       88
       +
       		return nil, err

     

       89
       89
       +
       	}

     

       90
       90
       +
       	defer rows.Close()

     

       91
       91
       +
       	for rows.Next() {

     

       92
       92
       +
       		var collaborator models.Collaborator

     

       93
       93
       +
       		var createdAt string

     

       94
       94
       +
       		if err := rows.Scan(

     

       95
       95
       +
       			&collaborator.Id,

     

       96
       96
       +
       			&collaborator.Did,

     

       97
       97
       +
       			&collaborator.Rkey,

     

       98
       98
       +
       			&collaborator.SubjectDid,

     

       99
       99
       +
       			&collaborator.RepoAt,

     

       100
       100
       +
       			&createdAt,

     

       101
       101
       +
       		); err != nil {

     

       102
       102
       +
       			return nil, err

     

       103
       103
       +
       		}

     

       104
       104
       +
       		collaborator.Created, err = time.Parse(time.RFC3339, createdAt)

     

       105
       105
       +
       		if err != nil {

     

       106
       106
       +
       			collaborator.Created = time.Now()

     

       107
       107
       +
       		}

     

       108
       108
       +
       		collaborators = append(collaborators, collaborator)

     

       109
       109
       +
       	}

     

       110
       110
       +
       	if err := rows.Err(); err != nil {

     

       111
       111
       +
       		return nil, err

     

       112
       112
       +
       	}

     

       113
       113
       +
       	return collaborators, nil

     

       114
       114
       +
       }

-20

appview/db/issues.go

···

       247
       247
        
       	return GetIssuesPaginated(e, pagination.FirstPage(), filters...)

     

       248
       248
        
       }

     

       249
       249
        
       

     

       250
       250
       -
       func GetIssue(e Execer, repoAt syntax.ATURI, issueId int) (*models.Issue, error) {

     

       251
       251
       -
       	query := `select id, owner_did, rkey, created, title, body, open from issues where repo_at = ? and issue_id = ?`

     

       252
       252
       -
       	row := e.QueryRow(query, repoAt, issueId)

     

       253
       253
       -
       

     

       254
       254
       -
       	var issue models.Issue

     

       255
       255
       -
       	var createdAt string

     

       256
       256
       -
       	err := row.Scan(&issue.Id, &issue.Did, &issue.Rkey, &createdAt, &issue.Title, &issue.Body, &issue.Open)

     

       257
       257
       -
       	if err != nil {

     

       258
       258
       -
       		return nil, err

     

       259
       259
       -
       	}

     

       260
       260
       -
       

     

       261
       261
       -
       	createdTime, err := time.Parse(time.RFC3339, createdAt)

     

       262
       262
       -
       	if err != nil {

     

       263
       263
       -
       		return nil, err

     

       264
       264
       -
       	}

     

       265
       265
       -
       	issue.Created = createdTime

     

       266
       266
       -
       

     

       267
       267
       -
       	return &issue, nil

     

       268
       268
       -
       }

     

       269
       269
       -
       

     

       270
       250
        
       func AddIssueComment(e Execer, c models.IssueComment) (int64, error) {

     

       271
       251
        
       	result, err := e.Exec(

     

       272
       252
        
       		`insert into issue_comments (

appview/issues/issues.go

···

       849
       849
        
       			Body:    r.FormValue("body"),

     

       850
       850
        
       			Did:     user.Did,

     

       851
       851
        
       			Created: time.Now(),

     

       852
       852
       +
       			Repo:    &f.Repo,

     

       852
       853
        
       		}

     

       853
       854
        
       

     

       854
       855
        
       		if err := rp.validator.ValidateIssue(issue); err != nil {

+24

appview/models/issue.go

···

       54
       54
        
       	Replies []*IssueComment

     

       55
       55
        
       }

     

       56
       56
        
       

     

       57
       57
       +
       func (it *CommentListItem) Participants() []syntax.DID {

     

       58
       58
       +
       	participantSet := make(map[syntax.DID]struct{})

     

       59
       59
       +
       	participants := []syntax.DID{}

     

       60
       60
       +
       

     

       61
       61
       +
       	addParticipant := func(did syntax.DID) {

     

       62
       62
       +
       		if _, exists := participantSet[did]; !exists {

     

       63
       63
       +
       			participantSet[did] = struct{}{}

     

       64
       64
       +
       			participants = append(participants, did)

     

       65
       65
       +
       		}

     

       66
       66
       +
       	}

     

       67
       67
       +
       

     

       68
       68
       +
       	addParticipant(syntax.DID(it.Self.Did))

     

       69
       69
       +
       

     

       70
       70
       +
       	for _, c := range it.Replies {

     

       71
       71
       +
       		addParticipant(syntax.DID(c.Did))

     

       72
       72
       +
       	}

     

       73
       73
       +
       

     

       74
       74
       +
       	return participants

     

       75
       75
       +
       }

     

       76
       76
       +
       

     

       57
       77
        
       func (i *Issue) CommentList() []CommentListItem {

     

       58
       78
        
       	// Create a map to quickly find comments by their aturi

     

       59
       79
        
       	toplevel := make(map[string]*CommentListItem)

     
···

       169
       189
        
       	return i.ReplyTo == nil

     

       170
       190
        
       }

     

       171
       191
        
       

     

       192
       192
       +
       func (i *IssueComment) IsReply() bool {

     

       193
       193
       +
       	return i.ReplyTo != nil

     

       194
       194
       +
       }

     

       195
       195
       +
       

     

       172
       196
        
       func IssueCommentFromRecord(did, rkey string, record tangled.RepoIssueComment) (*IssueComment, error) {

     

       173
       197
        
       	created, err := time.Parse(time.RFC3339, record.CreatedAt)

     

       174
       198
        
       	if err != nil {

+26

appview/models/notifications.go

···

       82
       82
        
       	IssueClosed        bool

     

       83
       83
        
       	EmailNotifications bool

     

       84
       84
        
       }

     

       85
       85
       +
       

     

       86
       86
       +
       func (prefs *NotificationPreferences) ShouldNotify(t NotificationType) bool {

     

       87
       87
       +
       	switch t {

     

       88
       88
       +
       	case NotificationTypeRepoStarred:

     

       89
       89
       +
       		return prefs.RepoStarred

     

       90
       90
       +
       	case NotificationTypeIssueCreated:

     

       91
       91
       +
       		return prefs.IssueCreated

     

       92
       92
       +
       	case NotificationTypeIssueCommented:

     

       93
       93
       +
       		return prefs.IssueCommented

     

       94
       94
       +
       	case NotificationTypeIssueClosed:

     

       95
       95
       +
       		return prefs.IssueClosed

     

       96
       96
       +
       	case NotificationTypePullCreated:

     

       97
       97
       +
       		return prefs.PullCreated

     

       98
       98
       +
       	case NotificationTypePullCommented:

     

       99
       99
       +
       		return prefs.PullCommented

     

       100
       100
       +
       	case NotificationTypePullMerged:

     

       101
       101
       +
       		return prefs.PullMerged

     

       102
       102
       +
       	case NotificationTypePullClosed:

     

       103
       103
       +
       		return prefs.PullMerged // same pref for now

     

       104
       104
       +
       	case NotificationTypeFollowed:

     

       105
       105
       +
       		return prefs.Followed

     

       106
       106
       +
       	default:

     

       107
       107
       +
       		return false

     

       108
       108
       +
       	}

     

       109
       109
       +
       }

     

       110
       110
       +
       

     

       85
       111
        
       func DefaultNotificationPreferences(user syntax.DID) *NotificationPreferences {

     

       86
       112
        
       	return &NotificationPreferences{

     

       87
       113
        
       		UserDid:            user,

+332 -280

appview/notify/db/db.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"log"

     

       6
       6
       +
       	"maps"

     

       7
       7
       +
       	"slices"

     

       6
       8
        
       

     

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

     

       7
       10
        
       	"tangled.org/core/appview/db"

     

       8
       11
        
       	"tangled.org/core/appview/models"

     

       9
       12
        
       	"tangled.org/core/appview/notify"

     
···

       36
       39
        
       		return

     

       37
       40
        
       	}

     

       38
       41
        
       

     

       39
       39
       -
       	// don't notify yourself

     

       40
       40
       -
       	if repo.Did == star.StarredByDid {

     

       41
       41
       -
       		return

     

       42
       42
       -
       	}

     

       43
       43
       -
       

     

       44
       44
       -
       	// check if user wants these notifications

     

       45
       45
       -
       	prefs, err := db.GetNotificationPreference(n.db, repo.Did)

     

       46
       46
       -
       	if err != nil {

     

       47
       47
       -
       		log.Printf("NewStar: failed to get notification preferences for %s: %v", repo.Did, err)

     

       48
       48
       -
       		return

     

       49
       49
       -
       	}

     

       50
       50
       -
       	if !prefs.RepoStarred {

     

       51
       51
       -
       		return

     

       52
       52
       -
       	}

     

       53
       53
       -
       

     

       54
       54
       -
       	notification := &models.Notification{

     

       55
       55
       -
       		RecipientDid: repo.Did,

     

       56
       56
       -
       		ActorDid:     star.StarredByDid,

     

       57
       57
       -
       		Type:         models.NotificationTypeRepoStarred,

     

       58
       58
       -
       		EntityType:   "repo",

     

       59
       59
       -
       		EntityId:     string(star.RepoAt),

     

       60
       60
       -
       		RepoId:       &repo.Id,

     

       61
       61
       -
       	}

     

       62
       62
       -
       	err = db.CreateNotification(n.db, notification)

     

       63
       63
       -
       	if err != nil {

     

       64
       64
       -
       		log.Printf("NewStar: failed to create notification: %v", err)

     

       65
       65
       -
       		return

     

       66
       66
       -
       	}

     

       42
       42
       +
       	actorDid := syntax.DID(star.StarredByDid)

     

       43
       43
       +
       	recipients := []syntax.DID{syntax.DID(repo.Did)}

     

       44
       44
       +
       	eventType := models.NotificationTypeRepoStarred

     

       45
       45
       +
       	entityType := "repo"

     

       46
       46
       +
       	entityId := star.RepoAt.String()

     

       47
       47
       +
       	repoId := &repo.Id

     

       48
       48
       +
       	var issueId *int64

     

       49
       49
       +
       	var pullId *int64

     

       50
       50
       +
       

     

       51
       51
       +
       	n.notifyEvent(

     

       52
       52
       +
       		actorDid,

     

       53
       53
       +
       		recipients,

     

       54
       54
       +
       		eventType,

     

       55
       55
       +
       		entityType,

     

       56
       56
       +
       		entityId,

     

       57
       57
       +
       		repoId,

     

       58
       58
       +
       		issueId,

     

       59
       59
       +
       		pullId,

     

       60
       60
       +
       	)

     

       67
       61
        
       }

     

       68
       62
        
       

     

       69
       63
        
       func (n *databaseNotifier) DeleteStar(ctx context.Context, star *models.Star) {

     
···

       71
       65
        
       }

     

       72
       66
        
       

     

       73
       67
        
       func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue) {

     

       74
       74
       -
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       75
       75
       -
       	if err != nil {

     

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

     

       77
       77
       -
       		return

     

       78
       78
       -
       	}

     

       79
       68
        
       

     

       80
       80
       -
       	if repo.Did == issue.Did {

     

       81
       81
       -
       		return

     

       82
       82
       -
       	}

     

       83
       83
       -
       

     

       84
       84
       -
       	prefs, err := db.GetNotificationPreference(n.db, repo.Did)

     

       69
       69
       +
       	// build the recipients list

     

       70
       70
       +
       	// - owner of the repo

     

       71
       71
       +
       	// - collaborators in the repo

     

       72
       72
       +
       	var recipients []syntax.DID

     

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

     

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

     

       85
       75
        
       	if err != nil {

     

       86
       86
       -
       		log.Printf("NewIssue: failed to get notification preferences for %s: %v", repo.Did, err)

     

       87
       87
       -
       		return

     

       88
       88
       -
       	}

     

       89
       89
       -
       	if !prefs.IssueCreated {

     

       90
       90
       -
       		return

     

       91
       91
       -
       	}

     

       92
       92
       -
       

     

       93
       93
       -
       	notification := &models.Notification{

     

       94
       94
       -
       		RecipientDid: repo.Did,

     

       95
       95
       -
       		ActorDid:     issue.Did,

     

       96
       96
       -
       		Type:         models.NotificationTypeIssueCreated,

     

       97
       97
       -
       		EntityType:   "issue",

     

       98
       98
       -
       		EntityId:     string(issue.AtUri()),

     

       99
       99
       -
       		RepoId:       &repo.Id,

     

       100
       100
       -
       		IssueId:      &issue.Id,

     

       101
       101
       -
       	}

     

       102
       102
       -
       

     

       103
       103
       -
       	err = db.CreateNotification(n.db, notification)

     

       104
       104
       -
       	if err != nil {

     

       105
       105
       -
       		log.Printf("NewIssue: failed to create notification: %v", err)

     

       106
       106
       -
       		return

     

       107
       107
       -
       	}

     

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

     

       77
       77
       +
       		return

     

       78
       78
       +
       	}

     

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

     

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

     

       81
       81
       +
       	}

     

       82
       82
       +
       

     

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

     

       84
       84
       +
       	eventType := models.NotificationTypeIssueCreated

     

       85
       85
       +
       	entityType := "issue"

     

       86
       86
       +
       	entityId := issue.AtUri().String()

     

       87
       87
       +
       	repoId := &issue.Repo.Id

     

       88
       88
       +
       	issueId := &issue.Id

     

       89
       89
       +
       	var pullId *int64

     

       90
       90
       +
       

     

       91
       91
       +
       	n.notifyEvent(

     

       92
       92
       +
       		actorDid,

     

       93
       93
       +
       		recipients,

     

       94
       94
       +
       		eventType,

     

       95
       95
       +
       		entityType,

     

       96
       96
       +
       		entityId,

     

       97
       97
       +
       		repoId,

     

       98
       98
       +
       		issueId,

     

       99
       99
       +
       		pullId,

     

       100
       100
       +
       	)

     

       108
       101
        
       }

     

       109
       102
        
       

     

       110
       103
        
       func (n *databaseNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment) {

     
···

       119
       112
        
       	}

     

       120
       113
        
       	issue := issues[0]

     

       121
       114
        
       

     

       122
       122
       -
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       123
       123
       -
       	if err != nil {

     

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

     

       125
       125
       -
       		return

     

       126
       126
       -
       	}

     

       127
       127
       -
       

     

       128
       128
       -
       	recipients := make(map[string]bool)

     

       129
       129
       -
       

     

       130
       130
       -
       	// notify issue author (if not the commenter)

     

       131
       131
       -
       	if issue.Did != comment.Did {

     

       132
       132
       -
       		prefs, err := db.GetNotificationPreference(n.db, issue.Did)

     

       133
       133
       -
       		if err == nil && prefs.IssueCommented {

     

       134
       134
       -
       			recipients[issue.Did] = true

     

       135
       135
       -
       		} else if err != nil {

     

       136
       136
       -
       			log.Printf("NewIssueComment: failed to get preferences for issue author %s: %v", issue.Did, err)

     

       137
       137
       -
       		}

     

       138
       138
       -
       	}

     

       139
       139
       -
       

     

       140
       140
       -
       	// notify repo owner (if not the commenter and not already added)

     

       141
       141
       -
       	if repo.Did != comment.Did && repo.Did != issue.Did {

     

       142
       142
       -
       		prefs, err := db.GetNotificationPreference(n.db, repo.Did)

     

       143
       143
       -
       		if err == nil && prefs.IssueCommented {

     

       144
       144
       -
       			recipients[repo.Did] = true

     

       145
       145
       -
       		} else if err != nil {

     

       146
       146
       -
       			log.Printf("NewIssueComment: failed to get preferences for repo owner %s: %v", repo.Did, err)

     

       147
       147
       -
       		}

     

       148
       148
       -
       	}

     

       115
       115
       +
       	var recipients []syntax.DID

     

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

     

       149
       117
        
       

     

       150
       150
       -
       	// create notifications for all recipients

     

       151
       151
       -
       	for recipientDid := range recipients {

     

       152
       152
       -
       		notification := &models.Notification{

     

       153
       153
       -
       			RecipientDid: recipientDid,

     

       154
       154
       -
       			ActorDid:     comment.Did,

     

       155
       155
       -
       			Type:         models.NotificationTypeIssueCommented,

     

       156
       156
       -
       			EntityType:   "issue",

     

       157
       157
       -
       			EntityId:     string(issue.AtUri()),

     

       158
       158
       -
       			RepoId:       &repo.Id,

     

       159
       159
       -
       			IssueId:      &issue.Id,

     

       160
       160
       -
       		}

     

       118
       118
       +
       	if comment.IsReply() {

     

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

     

       120
       120
       +
       		parentAtUri := *comment.ReplyTo

     

       121
       121
       +
       		allThreads := issue.CommentList()

     

       161
       122
        
       

     

       162
       162
       -
       		err = db.CreateNotification(n.db, notification)

     

       163
       163
       -
       		if err != nil {

     

       164
       164
       -
       			log.Printf("NewIssueComment: failed to create notification for %s: %v", recipientDid, err)

     

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

     

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

     

       125
       125
       +
       			if t.Self.AtUri().String() == parentAtUri {

     

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

     

       127
       127
       +
       			}

     

       165
       128
        
       		}

     

       166
       166
       -
       	}

     

       129
       129
       +
       	} else {

     

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

     

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

     

       132
       132
       +
       	}

     

       133
       133
       +
       

     

       134
       134
       +
       	actorDid := syntax.DID(comment.Did)

     

       135
       135
       +
       	eventType := models.NotificationTypeIssueCommented

     

       136
       136
       +
       	entityType := "issue"

     

       137
       137
       +
       	entityId := issue.AtUri().String()

     

       138
       138
       +
       	repoId := &issue.Repo.Id

     

       139
       139
       +
       	issueId := &issue.Id

     

       140
       140
       +
       	var pullId *int64

     

       141
       141
       +
       

     

       142
       142
       +
       	n.notifyEvent(

     

       143
       143
       +
       		actorDid,

     

       144
       144
       +
       		recipients,

     

       145
       145
       +
       		eventType,

     

       146
       146
       +
       		entityType,

     

       147
       147
       +
       		entityId,

     

       148
       148
       +
       		repoId,

     

       149
       149
       +
       		issueId,

     

       150
       150
       +
       		pullId,

     

       151
       151
       +
       	)

     

       167
       152
        
       }

     

       168
       153
        
       

     

       169
       154
        
       func (n *databaseNotifier) NewFollow(ctx context.Context, follow *models.Follow) {

     

       170
       170
       -
       	prefs, err := db.GetNotificationPreference(n.db, follow.SubjectDid)

     

       171
       171
       -
       	if err != nil {

     

       172
       172
       -
       		log.Printf("NewFollow: failed to get notification preferences for %s: %v", follow.SubjectDid, err)

     

       173
       173
       -
       		return

     

       174
       174
       -
       	}

     

       175
       175
       -
       	if !prefs.Followed {

     

       176
       176
       -
       		return

     

       177
       177
       -
       	}

     

       178
       178
       -
       

     

       179
       179
       -
       	notification := &models.Notification{

     

       180
       180
       -
       		RecipientDid: follow.SubjectDid,

     

       181
       181
       -
       		ActorDid:     follow.UserDid,

     

       182
       182
       -
       		Type:         models.NotificationTypeFollowed,

     

       183
       183
       -
       		EntityType:   "follow",

     

       184
       184
       -
       		EntityId:     follow.UserDid,

     

       185
       185
       -
       	}

     

       186
       186
       -
       

     

       187
       187
       -
       	err = db.CreateNotification(n.db, notification)

     

       188
       188
       -
       	if err != nil {

     

       189
       189
       -
       		log.Printf("NewFollow: failed to create notification: %v", err)

     

       190
       190
       -
       		return

     

       191
       191
       -
       	}

     

       155
       155
       +
       	actorDid := syntax.DID(follow.UserDid)

     

       156
       156
       +
       	recipients := []syntax.DID{syntax.DID(follow.SubjectDid)}

     

       157
       157
       +
       	eventType := models.NotificationTypeFollowed

     

       158
       158
       +
       	entityType := "follow"

     

       159
       159
       +
       	entityId := follow.UserDid

     

       160
       160
       +
       	var repoId, issueId, pullId *int64

     

       161
       161
       +
       

     

       162
       162
       +
       	n.notifyEvent(

     

       163
       163
       +
       		actorDid,

     

       164
       164
       +
       		recipients,

     

       165
       165
       +
       		eventType,

     

       166
       166
       +
       		entityType,

     

       167
       167
       +
       		entityId,

     

       168
       168
       +
       		repoId,

     

       169
       169
       +
       		issueId,

     

       170
       170
       +
       		pullId,

     

       171
       171
       +
       	)

     

       192
       172
        
       }

     

       193
       173
        
       

     

       194
       174
        
       func (n *databaseNotifier) DeleteFollow(ctx context.Context, follow *models.Follow) {

     
···

       202
       182
        
       		return

     

       203
       183
        
       	}

     

       204
       184
        
       

     

       205
       205
       -
       	if repo.Did == pull.OwnerDid {

     

       206
       206
       -
       		return

     

       207
       207
       -
       	}

     

       208
       208
       -
       

     

       209
       209
       -
       	prefs, err := db.GetNotificationPreference(n.db, repo.Did)

     

       185
       185
       +
       	// build the recipients list

     

       186
       186
       +
       	// - owner of the repo

     

       187
       187
       +
       	// - collaborators in the repo

     

       188
       188
       +
       	var recipients []syntax.DID

     

       189
       189
       +
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       190
       190
       +
       	collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", repo.RepoAt()))

     

       210
       191
        
       	if err != nil {

     

       211
       211
       -
       		log.Printf("NewPull: failed to get notification preferences for %s: %v", repo.Did, err)

     

       212
       212
       -
       		return

     

       213
       213
       -
       	}

     

       214
       214
       -
       	if !prefs.PullCreated {

     

       215
       215
       -
       		return

     

       216
       216
       -
       	}

     

       217
       217
       -
       

     

       218
       218
       -
       	notification := &models.Notification{

     

       219
       219
       -
       		RecipientDid: repo.Did,

     

       220
       220
       -
       		ActorDid:     pull.OwnerDid,

     

       221
       221
       -
       		Type:         models.NotificationTypePullCreated,

     

       222
       222
       -
       		EntityType:   "pull",

     

       223
       223
       -
       		EntityId:     string(pull.RepoAt),

     

       224
       224
       -
       		RepoId:       &repo.Id,

     

       225
       225
       -
       		PullId:       func() *int64 { id := int64(pull.ID); return &id }(),

     

       226
       226
       -
       	}

     

       227
       227
       -
       

     

       228
       228
       -
       	err = db.CreateNotification(n.db, notification)

     

       229
       229
       -
       	if err != nil {

     

       230
       230
       -
       		log.Printf("NewPull: failed to create notification: %v", err)

     

       231
       231
       -
       		return

     

       232
       232
       -
       	}

     

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

     

       193
       193
       +
       		return

     

       194
       194
       +
       	}

     

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

     

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

     

       197
       197
       +
       	}

     

       198
       198
       +
       

     

       199
       199
       +
       	actorDid := syntax.DID(pull.OwnerDid)

     

       200
       200
       +
       	eventType := models.NotificationTypePullCreated

     

       201
       201
       +
       	entityType := "pull"

     

       202
       202
       +
       	entityId := pull.PullAt().String()

     

       203
       203
       +
       	repoId := &repo.Id

     

       204
       204
       +
       	var issueId *int64

     

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

     

       206
       206
       +
       	pullId := &p

     

       207
       207
       +
       

     

       208
       208
       +
       	n.notifyEvent(

     

       209
       209
       +
       		actorDid,

     

       210
       210
       +
       		recipients,

     

       211
       211
       +
       		eventType,

     

       212
       212
       +
       		entityType,

     

       213
       213
       +
       		entityId,

     

       214
       214
       +
       		repoId,

     

       215
       215
       +
       		issueId,

     

       216
       216
       +
       		pullId,

     

       217
       217
       +
       	)

     

       233
       218
        
       }

     

       234
       219
        
       

     

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

     

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

     

       237
       237
       -
       		db.FilterEq("repo_at", comment.RepoAt),

     

       238
       238
       -
       		db.FilterEq("pull_id", comment.PullId))

     

       221
       221
       +
       	pull, err := db.GetPull(n.db,

     

       222
       222
       +
       		syntax.ATURI(comment.RepoAt),

     

       223
       223
       +
       		comment.PullId,

     

       224
       224
       +
       	)

     

       239
       225
        
       	if err != nil {

     

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

     

       241
       227
        
       		return

     

       242
       228
        
       	}

     

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

     

       244
       244
       -
       		log.Printf("NewPullComment: no pull found for %s PR %d", comment.RepoAt, comment.PullId)

     

       245
       245
       -
       		return

     

       246
       246
       -
       	}

     

       247
       247
       -
       	pull := pulls[0]

     

       248
       229
        
       

     

       249
       230
        
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", comment.RepoAt))

     

       250
       231
        
       	if err != nil {

     
···

       252
       233
        
       		return

     

       253
       234
        
       	}

     

       254
       235
        
       

     

       255
       255
       -
       	recipients := make(map[string]bool)

     

       256
       256
       -
       

     

       257
       257
       -
       	// notify pull request author (if not the commenter)

     

       258
       258
       -
       	if pull.OwnerDid != comment.OwnerDid {

     

       259
       259
       -
       		prefs, err := db.GetNotificationPreference(n.db, pull.OwnerDid)

     

       260
       260
       -
       		if err == nil && prefs.PullCommented {

     

       261
       261
       -
       			recipients[pull.OwnerDid] = true

     

       262
       262
       -
       		} else if err != nil {

     

       263
       263
       -
       			log.Printf("NewPullComment: failed to get preferences for pull author %s: %v", pull.OwnerDid, err)

     

       264
       264
       -
       		}

     

       265
       265
       -
       	}

     

       266
       266
       -
       

     

       267
       267
       -
       	// notify repo owner (if not the commenter and not already added)

     

       268
       268
       -
       	if repo.Did != comment.OwnerDid && repo.Did != pull.OwnerDid {

     

       269
       269
       -
       		prefs, err := db.GetNotificationPreference(n.db, repo.Did)

     

       270
       270
       -
       		if err == nil && prefs.PullCommented {

     

       271
       271
       -
       			recipients[repo.Did] = true

     

       272
       272
       -
       		} else if err != nil {

     

       273
       273
       -
       			log.Printf("NewPullComment: failed to get preferences for repo owner %s: %v", repo.Did, err)

     

       274
       274
       -
       		}

     

       275
       275
       -
       	}

     

       276
       276
       -
       

     

       277
       277
       -
       	for recipientDid := range recipients {

     

       278
       278
       -
       		notification := &models.Notification{

     

       279
       279
       -
       			RecipientDid: recipientDid,

     

       280
       280
       -
       			ActorDid:     comment.OwnerDid,

     

       281
       281
       -
       			Type:         models.NotificationTypePullCommented,

     

       282
       282
       -
       			EntityType:   "pull",

     

       283
       283
       -
       			EntityId:     comment.RepoAt,

     

       284
       284
       -
       			RepoId:       &repo.Id,

     

       285
       285
       -
       			PullId:       func() *int64 { id := int64(pull.ID); return &id }(),

     

       286
       286
       -
       		}

     

       287
       287
       -
       

     

       288
       288
       -
       		err = db.CreateNotification(n.db, notification)

     

       289
       289
       -
       		if err != nil {

     

       290
       290
       -
       			log.Printf("NewPullComment: failed to create notification for %s: %v", recipientDid, err)

     

       291
       291
       -
       		}

     

       292
       292
       -
       	}

     

       236
       236
       +
       	// build up the recipients list:

     

       237
       237
       +
       	// - repo owner

     

       238
       238
       +
       	// - all pull participants

     

       239
       239
       +
       	var recipients []syntax.DID

     

       240
       240
       +
       	recipients = append(recipients, syntax.DID(repo.Did))

     

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

     

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

     

       243
       243
       +
       	}

     

       244
       244
       +
       

     

       245
       245
       +
       	actorDid := syntax.DID(comment.OwnerDid)

     

       246
       246
       +
       	eventType := models.NotificationTypePullCommented

     

       247
       247
       +
       	entityType := "pull"

     

       248
       248
       +
       	entityId := pull.PullAt().String()

     

       249
       249
       +
       	repoId := &repo.Id

     

       250
       250
       +
       	var issueId *int64

     

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

     

       252
       252
       +
       	pullId := &p

     

       253
       253
       +
       

     

       254
       254
       +
       	n.notifyEvent(

     

       255
       255
       +
       		actorDid,

     

       256
       256
       +
       		recipients,

     

       257
       257
       +
       		eventType,

     

       258
       258
       +
       		entityType,

     

       259
       259
       +
       		entityId,

     

       260
       260
       +
       		repoId,

     

       261
       261
       +
       		issueId,

     

       262
       262
       +
       		pullId,

     

       263
       263
       +
       	)

     

       293
       264
        
       }

     

       294
       265
        
       

     

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

     
···

       309
       280
        
       }

     

       310
       281
        
       

     

       311
       282
        
       func (n *databaseNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) {

     

       312
       312
       -
       	// Get repo details

     

       313
       313
       -
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       283
       283
       +
       	// build up the recipients list:

     

       284
       284
       +
       	// - repo owner

     

       285
       285
       +
       	// - repo collaborators

     

       286
       286
       +
       	// - all issue participants

     

       287
       287
       +
       	var recipients []syntax.DID

     

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

     

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

     

       314
       290
        
       	if err != nil {

     

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

     

       316
       316
       -
       		return

     

       317
       317
       -
       	}

     

       318
       318
       -
       

     

       319
       319
       -
       	// Don't notify yourself

     

       320
       320
       -
       	if repo.Did == issue.Did {

     

       321
       321
       -
       		return

     

       322
       322
       -
       	}

     

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

     

       292
       292
       +
       		return

     

       293
       293
       +
       	}

     

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

     

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

     

       296
       296
       +
       	}

     

       297
       297
       +
       	for _, p := range issue.Participants() {

     

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

     

       299
       299
       +
       	}

     

       300
       300
       +
       

     

       301
       301
       +
       	actorDid := syntax.DID(issue.Repo.Did)

     

       302
       302
       +
       	eventType := models.NotificationTypeIssueClosed

     

       303
       303
       +
       	entityType := "pull"

     

       304
       304
       +
       	entityId := issue.AtUri().String()

     

       305
       305
       +
       	repoId := &issue.Repo.Id

     

       306
       306
       +
       	issueId := &issue.Id

     

       307
       307
       +
       	var pullId *int64

     

       308
       308
       +
       

     

       309
       309
       +
       	n.notifyEvent(

     

       310
       310
       +
       		actorDid,

     

       311
       311
       +
       		recipients,

     

       312
       312
       +
       		eventType,

     

       313
       313
       +
       		entityType,

     

       314
       314
       +
       		entityId,

     

       315
       315
       +
       		repoId,

     

       316
       316
       +
       		issueId,

     

       317
       317
       +
       		pullId,

     

       318
       318
       +
       	)

     

       319
       319
       +
       }

     

       323
       320
        
       

     

       324
       324
       -
       	// Check if user wants these notifications

     

       325
       325
       -
       	prefs, err := db.GetNotificationPreference(n.db, repo.Did)

     

       321
       321
       +
       func (n *databaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       322
       322
       +
       	// Get repo details

     

       323
       323
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       326
       324
        
       	if err != nil {

     

       327
       327
       -
       		log.Printf("NewIssueClosed: failed to get notification preferences for %s: %v", repo.Did, err)

     

       328
       328
       -
       		return

     

       329
       329
       -
       	}

     

       330
       330
       -
       	if !prefs.IssueClosed {

     

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

     

       331
       326
        
       		return

     

       332
       327
        
       	}

     

       333
       328
        
       

     

       334
       334
       -
       	notification := &models.Notification{

     

       335
       335
       -
       		RecipientDid: repo.Did,

     

       336
       336
       -
       		ActorDid:     issue.Did,

     

       337
       337
       -
       		Type:         models.NotificationTypeIssueClosed,

     

       338
       338
       -
       		EntityType:   "issue",

     

       339
       339
       -
       		EntityId:     string(issue.AtUri()),

     

       340
       340
       -
       		RepoId:       &repo.Id,

     

       341
       341
       -
       		IssueId:      &issue.Id,

     

       342
       342
       -
       	}

     

       343
       343
       -
       

     

       344
       344
       -
       	err = db.CreateNotification(n.db, notification)

     

       329
       329
       +
       	// build up the recipients list:

     

       330
       330
       +
       	// - repo owner

     

       331
       331
       +
       	// - all pull participants

     

       332
       332
       +
       	var recipients []syntax.DID

     

       333
       333
       +
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       334
       334
       +
       	collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", repo.RepoAt()))

     

       345
       335
        
       	if err != nil {

     

       346
       346
       -
       		log.Printf("NewIssueClosed: failed to create notification: %v", err)

     

       347
       347
       -
       		return

     

       348
       348
       -
       	}

     

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

     

       337
       337
       +
       		return

     

       338
       338
       +
       	}

     

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

     

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

     

       341
       341
       +
       	}

     

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

     

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

     

       344
       344
       +
       	}

     

       345
       345
       +
       

     

       346
       346
       +
       	actorDid := syntax.DID(repo.Did)

     

       347
       347
       +
       	eventType := models.NotificationTypePullMerged

     

       348
       348
       +
       	entityType := "pull"

     

       349
       349
       +
       	entityId := pull.PullAt().String()

     

       350
       350
       +
       	repoId := &repo.Id

     

       351
       351
       +
       	var issueId *int64

     

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

     

       353
       353
       +
       	pullId := &p

     

       354
       354
       +
       

     

       355
       355
       +
       	n.notifyEvent(

     

       356
       356
       +
       		actorDid,

     

       357
       357
       +
       		recipients,

     

       358
       358
       +
       		eventType,

     

       359
       359
       +
       		entityType,

     

       360
       360
       +
       		entityId,

     

       361
       361
       +
       		repoId,

     

       362
       362
       +
       		issueId,

     

       363
       363
       +
       		pullId,

     

       364
       364
       +
       	)

     

       349
       365
        
       }

     

       350
       366
        
       

     

       351
       351
       -
       func (n *databaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       367
       367
       +
       func (n *databaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       352
       368
        
       	// Get repo details

     

       353
       369
        
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       354
       370
        
       	if err != nil {

     
···

       356
       372
        
       		return

     

       357
       373
        
       	}

     

       358
       374
        
       

     

       359
       359
       -
       	// Don't notify yourself

     

       360
       360
       -
       	if repo.Did == pull.OwnerDid {

     

       361
       361
       -
       		return

     

       362
       362
       -
       	}

     

       363
       363
       -
       

     

       364
       364
       -
       	// Check if user wants these notifications

     

       365
       365
       -
       	prefs, err := db.GetNotificationPreference(n.db, pull.OwnerDid)

     

       375
       375
       +
       	// build up the recipients list:

     

       376
       376
       +
       	// - repo owner

     

       377
       377
       +
       	// - all pull participants

     

       378
       378
       +
       	var recipients []syntax.DID

     

       379
       379
       +
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       380
       380
       +
       	collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", repo.RepoAt()))

     

       366
       381
        
       	if err != nil {

     

       367
       367
       -
       		log.Printf("NewPullMerged: failed to get notification preferences for %s: %v", pull.OwnerDid, err)

     

       368
       368
       -
       		return

     

       369
       369
       -
       	}

     

       370
       370
       -
       	if !prefs.PullMerged {

     

       371
       371
       -
       		return

     

       372
       372
       -
       	}

     

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

     

       383
       383
       +
       		return

     

       384
       384
       +
       	}

     

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

     

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

     

       387
       387
       +
       	}

     

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

     

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

     

       390
       390
       +
       	}

     

       391
       391
       +
       

     

       392
       392
       +
       	actorDid := syntax.DID(repo.Did)

     

       393
       393
       +
       	eventType := models.NotificationTypePullClosed

     

       394
       394
       +
       	entityType := "pull"

     

       395
       395
       +
       	entityId := pull.PullAt().String()

     

       396
       396
       +
       	repoId := &repo.Id

     

       397
       397
       +
       	var issueId *int64

     

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

     

       399
       399
       +
       	pullId := &p

     

       400
       400
       +
       

     

       401
       401
       +
       	n.notifyEvent(

     

       402
       402
       +
       		actorDid,

     

       403
       403
       +
       		recipients,

     

       404
       404
       +
       		eventType,

     

       405
       405
       +
       		entityType,

     

       406
       406
       +
       		entityId,

     

       407
       407
       +
       		repoId,

     

       408
       408
       +
       		issueId,

     

       409
       409
       +
       		pullId,

     

       410
       410
       +
       	)

     

       411
       411
       +
       }

     

       373
       412
        
       

     

       374
       374
       -
       	notification := &models.Notification{

     

       375
       375
       -
       		RecipientDid: pull.OwnerDid,

     

       376
       376
       -
       		ActorDid:     repo.Did,

     

       377
       377
       -
       		Type:         models.NotificationTypePullMerged,

     

       378
       378
       -
       		EntityType:   "pull",

     

       379
       379
       -
       		EntityId:     string(pull.RepoAt),

     

       380
       380
       -
       		RepoId:       &repo.Id,

     

       381
       381
       -
       		PullId:       func() *int64 { id := int64(pull.ID); return &id }(),

     

       413
       413
       +
       func (n *databaseNotifier) notifyEvent(

     

       414
       414
       +
       	actorDid syntax.DID,

     

       415
       415
       +
       	recipients []syntax.DID,

     

       416
       416
       +
       	eventType models.NotificationType,

     

       417
       417
       +
       	entityType string,

     

       418
       418
       +
       	entityId string,

     

       419
       419
       +
       	repoId *int64,

     

       420
       420
       +
       	issueId *int64,

     

       421
       421
       +
       	pullId *int64,

     

       422
       422
       +
       ) {

     

       423
       423
       +
       	recipientSet := make(map[syntax.DID]struct{})

     

       424
       424
       +
       	for _, did := range recipients {

     

       425
       425
       +
       		// everybody except actor themselves

     

       426
       426
       +
       		if did != actorDid {

     

       427
       427
       +
       			recipientSet[did] = struct{}{}

     

       428
       428
       +
       		}

     

       382
       429
        
       	}

     

       383
       430
        
       

     

       384
       384
       -
       	err = db.CreateNotification(n.db, notification)

     

       431
       431
       +
       	prefMap, err := db.GetNotificationPreferences(

     

       432
       432
       +
       		n.db,

     

       433
       433
       +
       		db.FilterIn("user_did", slices.Collect(maps.Keys(recipientSet))),

     

       434
       434
       +
       	)

     

       385
       435
        
       	if err != nil {

     

       386
       386
       -
       		log.Printf("NewPullMerged: failed to create notification: %v", err)

     

       436
       436
       +
       		// failed to get prefs for users

     

       387
       437
        
       		return

     

       388
       438
        
       	}

     

       389
       389
       -
       }

     

       390
       439
        
       

     

       391
       391
       -
       func (n *databaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       392
       392
       -
       	// Get repo details

     

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

     

       440
       440
       +
       	// create a transaction for bulk notification storage

     

       441
       441
       +
       	tx, err := n.db.Begin()

     

       394
       442
        
       	if err != nil {

     

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

     

       443
       443
       +
       		// failed to start tx

     

       396
       444
        
       		return

     

       397
       445
        
       	}

     

       446
       446
       +
       	defer tx.Rollback()

     

       398
       447
        
       

     

       399
       399
       -
       	// Don't notify yourself

     

       400
       400
       -
       	if repo.Did == pull.OwnerDid {

     

       401
       401
       -
       		return

     

       402
       402
       -
       	}

     

       448
       448
       +
       	// filter based on preferences

     

       449
       449
       +
       	for recipientDid := range recipientSet {

     

       450
       450
       +
       		prefs, ok := prefMap[recipientDid]

     

       451
       451
       +
       		if !ok {

     

       452
       452
       +
       			prefs = models.DefaultNotificationPreferences(recipientDid)

     

       453
       453
       +
       		}

     

       403
       454
        
       

     

       404
       404
       -
       	// Check if user wants these notifications - reuse pull_merged preference for now

     

       405
       405
       -
       	prefs, err := db.GetNotificationPreference(n.db, pull.OwnerDid)

     

       406
       406
       -
       	if err != nil {

     

       407
       407
       -
       		log.Printf("NewPullClosed: failed to get notification preferences for %s: %v", pull.OwnerDid, err)

     

       408
       408
       -
       		return

     

       409
       409
       -
       	}

     

       410
       410
       -
       	if !prefs.PullMerged {

     

       411
       411
       -
       		return

     

       412
       412
       -
       	}

     

       455
       455
       +
       		// skip users who don’t want this type

     

       456
       456
       +
       		if !prefs.ShouldNotify(eventType) {

     

       457
       457
       +
       			continue

     

       458
       458
       +
       		}

     

       413
       459
        
       

     

       414
       414
       -
       	notification := &models.Notification{

     

       415
       415
       -
       		RecipientDid: pull.OwnerDid,

     

       416
       416
       -
       		ActorDid:     repo.Did,

     

       417
       417
       -
       		Type:         models.NotificationTypePullClosed,

     

       418
       418
       -
       		EntityType:   "pull",

     

       419
       419
       -
       		EntityId:     string(pull.RepoAt),

     

       420
       420
       -
       		RepoId:       &repo.Id,

     

       421
       421
       -
       		PullId:       func() *int64 { id := int64(pull.ID); return &id }(),

     

       460
       460
       +
       		// create notification

     

       461
       461
       +
       		notif := &models.Notification{

     

       462
       462
       +
       			RecipientDid: recipientDid.String(),

     

       463
       463
       +
       			ActorDid:     actorDid.String(),

     

       464
       464
       +
       			Type:         eventType,

     

       465
       465
       +
       			EntityType:   entityType,

     

       466
       466
       +
       			EntityId:     entityId,

     

       467
       467
       +
       			RepoId:       repoId,

     

       468
       468
       +
       			IssueId:      issueId,

     

       469
       469
       +
       			PullId:       pullId,

     

       470
       470
       +
       		}

     

       471
       471
       +
       

     

       472
       472
       +
       		if err := db.CreateNotification(tx, notif); err != nil {

     

       473
       473
       +
       			log.Printf("notifyEvent: failed to create notification for %s: %v", recipientDid, err)

     

       474
       474
       +
       		}

     

       422
       475
        
       	}

     

       423
       476
        
       

     

       424
       424
       -
       	err = db.CreateNotification(n.db, notification)

     

       425
       425
       -
       	if err != nil {

     

       426
       426
       -
       		log.Printf("NewPullClosed: failed to create notification: %v", err)

     

       477
       477
       +
       	if err := tx.Commit(); err != nil {

     

       478
       478
       +
       		// failed to commit

     

       427
       479
        
       		return

     

       428
       480
        
       	}

     

       429
       481
        
       }

+1 -1

appview/pages/templates/notifications/fragments/item.html

···

       22
       22
        
       {{ define "notificationIcon" }}

     

       23
       23
        
         <div class="flex-shrink-0 max-h-full w-16 h-16 relative">

     

       24
       24
        
           <img class="object-cover rounded-full p-2" src="{{ fullAvatar .ActorDid }}" />

     

       25
       25
       -
           <div class="absolute border-2 border-white dark:border-gray-800 bg-gray-200 dark:bg-gray-700 bottom-1 right-1 rounded-full p-2 flex items-center justify-center z-10">

     

       25
       25
       +
           <div class="absolute border-2 border-white dark:border-gray-800 bg-gray-200 dark:bg-gray-700 bottom-1 right-1 rounded-full p-1 flex items-center justify-center z-10">

     

       26
       26
        
             {{ i .Icon "size-3 text-black dark:text-white" }}

     

       27
       27
        
           </div>

     

       28
       28
        
         </div>