appview: introduce email notifications for @ mentions on issue/pr comments #393

REVERTED

appview/middleware/middleware.go

··· 9 9 "slices" 10 10 "strconv" 11 11 "strings" 12 12 + "time" 12 13 13 14 "github.com/bluesky-social/indigo/atproto/identity" 14 15 "github.com/go-chi/chi/v5" ··· 221 222 return 222 223 } 223 224 225 225 + ctx := context.WithValue(req.Context(), "knot", repo.Knot) 226 226 + ctx = context.WithValue(ctx, "repoAt", repo.AtUri) 227 227 + ctx = context.WithValue(ctx, "repoDescription", repo.Description) 228 228 + ctx = context.WithValue(ctx, "repoSpindle", repo.Spindle) 229 229 + ctx = context.WithValue(ctx, "repoAddedAt", repo.Created.Format(time.RFC3339)) 224 224 - ctx := context.WithValue(req.Context(), "repo", repo) 225 230 next.ServeHTTP(w, req.WithContext(ctx)) 226 231 }) 227 232 } ··· 246 251 return 247 252 } 248 253 254 254 + pr, err := db.GetPull(mw.db, f.RepoAt, prIdInt) 249 249 - pr, err := db.GetPull(mw.db, f.RepoAt(), prIdInt) 250 255 if err != nil { 251 256 log.Println("failed to get pull and comments", err) 252 257 return ··· 287 292 return 288 293 } 289 294 295 295 + fullName := f.OwnerHandle() + "/" + f.RepoName 290 290 - fullName := f.OwnerHandle() + "/" + f.Name 291 296 292 297 if r.Header.Get("User-Agent") == "Go-http-client/1.1" { 293 298 if r.URL.Query().Get("go-get") == "1" {

REVERTED

appview/repo/artifact.go

··· 76 76 Artifact: uploadBlobResp.Blob, 77 77 CreatedAt: createdAt.Format(time.RFC3339), 78 78 Name: handler.Filename, 79 79 + Repo: f.RepoAt.String(), 79 79 - Repo: f.RepoAt().String(), 80 80 Tag: tag.Tag.Hash[:], 81 81 }, 82 82 }, ··· 100 100 artifact := db.Artifact{ 101 101 Did: user.Did, 102 102 Rkey: rkey, 103 103 + RepoAt: f.RepoAt, 103 103 - RepoAt: f.RepoAt(), 104 104 Tag: tag.Tag.Hash, 105 105 CreatedAt: createdAt, 106 106 BlobCid: cid.Cid(uploadBlobResp.Blob.Ref), ··· 155 155 156 156 artifacts, err := db.GetArtifact( 157 157 rp.db, 158 158 + db.FilterEq("repo_at", f.RepoAt), 158 158 - db.FilterEq("repo_at", f.RepoAt()), 159 159 db.FilterEq("tag", tag.Tag.Hash[:]), 160 160 db.FilterEq("name", filename), 161 161 ) ··· 197 197 198 198 artifacts, err := db.GetArtifact( 199 199 rp.db, 200 200 + db.FilterEq("repo_at", f.RepoAt), 200 200 - db.FilterEq("repo_at", f.RepoAt()), 201 201 db.FilterEq("tag", tag[:]), 202 202 db.FilterEq("name", filename), 203 203 ) ··· 239 239 defer tx.Rollback() 240 240 241 241 err = db.DeleteArtifact(tx, 242 242 + db.FilterEq("repo_at", f.RepoAt), 242 242 - db.FilterEq("repo_at", f.RepoAt()), 243 243 db.FilterEq("tag", artifact.Tag[:]), 244 244 db.FilterEq("name", filename), 245 245 ) ··· 270 270 return nil, err 271 271 } 272 272 273 273 + result, err := us.Tags(f.OwnerDid(), f.RepoName) 273 273 - result, err := us.Tags(f.OwnerDid(), f.Name) 274 274 if err != nil { 275 275 log.Println("failed to reach knotserver", err) 276 276 return nil, err

REVERTED

appview/repo/index.go

··· 37 37 return 38 38 } 39 39 40 40 + result, err := us.Index(f.OwnerDid(), f.RepoName, ref) 40 40 - result, err := us.Index(f.OwnerDid(), f.Name, ref) 41 41 if err != nil { 42 42 rp.pages.Error503(w) 43 43 log.Println("failed to reach knotserver", err) ··· 166 166 // first attempt to fetch from db 167 167 langs, err := db.GetRepoLanguages( 168 168 rp.db, 169 169 + db.FilterEq("repo_at", f.RepoAt), 169 169 - db.FilterEq("repo_at", f.RepoAt()), 170 170 db.FilterEq("ref", f.Ref), 171 171 ) 172 172 173 173 if err != nil || langs == nil { 174 174 // non-fatal, fetch langs from ks 175 175 + ls, err := signedClient.RepoLanguages(f.OwnerDid(), f.RepoName, f.Ref) 175 175 - ls, err := signedClient.RepoLanguages(f.OwnerDid(), f.Name, f.Ref) 176 176 if err != nil { 177 177 return nil, err 178 178 } ··· 182 182 183 183 for l, s := range ls.Languages { 184 184 langs = append(langs, db.RepoLanguage{ 185 185 + RepoAt: f.RepoAt, 185 185 - RepoAt: f.RepoAt(), 186 186 Ref: f.Ref, 187 187 IsDefaultRef: isDefaultRef, 188 188 Language: l, ··· 279 279 hiddenRef := fmt.Sprintf("hidden/%s/%s", f.Ref, f.Ref) 280 280 281 281 var status types.AncestorCheckResponse 282 282 + forkSyncableResp, err := signedClient.RepoForkAheadBehind(user.Did, string(f.RepoAt), repoInfo.Name, f.Ref, hiddenRef) 282 282 - forkSyncableResp, err := signedClient.RepoForkAheadBehind(user.Did, string(f.RepoAt()), repoInfo.Name, f.Ref, hiddenRef) 283 283 if err != nil { 284 284 log.Printf("failed to check if fork is ahead/behind: %s", err) 285 285 return nil, err

REVERTED

appview/reporesolver/resolver.go

··· 12 12 "strings" 13 13 14 14 "github.com/bluesky-social/indigo/atproto/identity" 15 15 + "github.com/bluesky-social/indigo/atproto/syntax" 15 16 securejoin "github.com/cyphar/filepath-securejoin" 16 17 "github.com/go-chi/chi/v5" 17 18 "tangled.sh/tangled.sh/core/appview/config" ··· 25 26 ) 26 27 27 28 type ResolvedRepo struct { 29 29 + Knot string 28 28 - db.Repo 29 30 OwnerId identity.Identity 31 31 + RepoName string 32 32 + RepoAt syntax.ATURI 33 33 + Description string 34 34 + Spindle string 35 35 + CreatedAt string 30 36 Ref string 31 37 CurrentDir string 32 38 ··· 45 51 } 46 52 47 53 func (rr *RepoResolver) Resolve(r *http.Request) (*ResolvedRepo, error) { 54 54 + repoName := chi.URLParam(r, "repo") 55 55 + knot, ok := r.Context().Value("knot").(string) 48 48 - repo, ok := r.Context().Value("repo").(*db.Repo) 49 56 if !ok { 57 57 + log.Println("malformed middleware") 50 50 - log.Println("malformed middleware: `repo` not exist in context") 51 58 return nil, fmt.Errorf("malformed middleware") 52 59 } 53 60 id, ok := r.Context().Value("resolvedId").(identity.Identity) ··· 56 63 return nil, fmt.Errorf("malformed middleware") 57 64 } 58 65 66 66 + repoAt, ok := r.Context().Value("repoAt").(string) 67 67 + if !ok { 68 68 + log.Println("malformed middleware") 69 69 + return nil, fmt.Errorf("malformed middleware") 70 70 + } 71 71 + 72 72 + parsedRepoAt, err := syntax.ParseATURI(repoAt) 73 73 + if err != nil { 74 74 + log.Println("malformed repo at-uri") 75 75 + return nil, fmt.Errorf("malformed middleware") 76 76 + } 77 77 + 59 78 ref := chi.URLParam(r, "ref") 60 79 61 80 if ref == "" { 81 81 + us, err := knotclient.NewUnsignedClient(knot, rr.config.Core.Dev) 62 62 - us, err := knotclient.NewUnsignedClient(repo.Knot, rr.config.Core.Dev) 63 82 if err != nil { 64 83 return nil, err 65 84 } 66 85 86 86 + defaultBranch, err := us.DefaultBranch(id.DID.String(), repoName) 67 67 - defaultBranch, err := us.DefaultBranch(id.DID.String(), repo.Name) 68 87 if err != nil { 69 88 return nil, err 70 89 } ··· 74 93 75 94 currentDir := path.Dir(extractPathAfterRef(r.URL.EscapedPath(), ref)) 76 95 96 96 + // pass through values from the middleware 97 97 + description, ok := r.Context().Value("repoDescription").(string) 98 98 + addedAt, ok := r.Context().Value("repoAddedAt").(string) 99 99 + spindle, ok := r.Context().Value("repoSpindle").(string) 100 100 + 77 101 return &ResolvedRepo{ 102 102 + Knot: knot, 103 103 + OwnerId: id, 104 104 + RepoName: repoName, 105 105 + RepoAt: parsedRepoAt, 106 106 + Description: description, 107 107 + CreatedAt: addedAt, 108 108 + Ref: ref, 109 109 + CurrentDir: currentDir, 110 110 + Spindle: spindle, 78 78 - Repo: *repo, 79 79 - OwnerId: id, 80 80 - Ref: ref, 81 81 - CurrentDir: currentDir, 82 111 83 112 rr: rr, 84 113 }, nil ··· 97 126 98 127 var p string 99 128 if handle != "" && !handle.IsInvalidHandle() { 129 129 + p, _ = securejoin.SecureJoin(fmt.Sprintf("@%s", handle), f.RepoName) 100 100 - p, _ = securejoin.SecureJoin(fmt.Sprintf("@%s", handle), f.Name) 101 130 } else { 131 131 + p, _ = securejoin.SecureJoin(f.OwnerDid(), f.RepoName) 102 102 - p, _ = securejoin.SecureJoin(f.OwnerDid(), f.Name) 103 132 } 104 133 105 134 return p 106 135 } 107 136 137 137 + func (f *ResolvedRepo) DidSlashRepo() string { 138 138 + p, _ := securejoin.SecureJoin(f.OwnerDid(), f.RepoName) 139 139 + return p 140 140 + } 141 141 + 108 142 func (f *ResolvedRepo) Collaborators(ctx context.Context) ([]pages.Collaborator, error) { 109 143 repoCollaborators, err := f.rr.enforcer.E.GetImplicitUsersForResourceByDomain(f.DidSlashRepo(), f.Knot) 110 144 if err != nil { ··· 153 187 // this function is a bit weird since it now returns RepoInfo from an entirely different 154 188 // package. we should refactor this or get rid of RepoInfo entirely. 155 189 func (f *ResolvedRepo) RepoInfo(user *oauth.User) repoinfo.RepoInfo { 156 156 - repoAt := f.RepoAt() 157 190 isStarred := false 158 191 if user != nil { 192 192 + isStarred = db.GetStarStatus(f.rr.execer, user.Did, syntax.ATURI(f.RepoAt)) 159 159 - isStarred = db.GetStarStatus(f.rr.execer, user.Did, repoAt) 160 193 } 161 194 195 195 + starCount, err := db.GetStarCount(f.rr.execer, f.RepoAt) 162 162 - starCount, err := db.GetStarCount(f.rr.execer, repoAt) 163 196 if err != nil { 197 197 + log.Println("failed to get star count for ", f.RepoAt) 164 164 - log.Println("failed to get star count for ", repoAt) 165 198 } 199 199 + issueCount, err := db.GetIssueCount(f.rr.execer, f.RepoAt) 166 166 - issueCount, err := db.GetIssueCount(f.rr.execer, repoAt) 167 200 if err != nil { 201 201 + log.Println("failed to get issue count for ", f.RepoAt) 168 168 - log.Println("failed to get issue count for ", repoAt) 169 202 } 203 203 + pullCount, err := db.GetPullCount(f.rr.execer, f.RepoAt) 170 170 - pullCount, err := db.GetPullCount(f.rr.execer, repoAt) 171 204 if err != nil { 205 205 + log.Println("failed to get issue count for ", f.RepoAt) 172 172 - log.Println("failed to get issue count for ", repoAt) 173 206 } 207 207 + source, err := db.GetRepoSource(f.rr.execer, f.RepoAt) 174 174 - source, err := db.GetRepoSource(f.rr.execer, repoAt) 175 208 if errors.Is(err, sql.ErrNoRows) { 176 209 source = "" 177 210 } else if err != nil { 211 211 + log.Println("failed to get repo source for ", f.RepoAt, err) 178 178 - log.Println("failed to get repo source for ", repoAt, err) 179 212 } 180 213 181 214 var sourceRepo *db.Repo ··· 200 233 if err != nil { 201 234 log.Printf("failed to create unsigned client for %s: %v", knot, err) 202 235 } else { 236 236 + result, err := us.Branches(f.OwnerDid(), f.RepoName) 203 203 - result, err := us.Branches(f.OwnerDid(), f.Name) 204 237 if err != nil { 238 238 + log.Printf("failed to get branches for %s/%s: %v", f.OwnerDid(), f.RepoName, err) 205 205 - log.Printf("failed to get branches for %s/%s: %v", f.OwnerDid(), f.Name, err) 206 239 } 207 240 208 241 if len(result.Branches) == 0 { ··· 213 246 repoInfo := repoinfo.RepoInfo{ 214 247 OwnerDid: f.OwnerDid(), 215 248 OwnerHandle: f.OwnerHandle(), 249 249 + Name: f.RepoName, 250 250 + RepoAt: f.RepoAt, 216 216 - Name: f.Name, 217 217 - RepoAt: repoAt, 218 251 Description: f.Description, 219 252 Ref: f.Ref, 220 253 IsStarred: isStarred,

REVERTED

appview/db/star.go

··· 196 196 r.name, 197 197 r.knot, 198 198 r.rkey, 199 199 + r.created, 200 200 + r.at_uri 199 199 - r.created 200 201 from stars s 201 202 join repos r on s.repo_at = r.at_uri 202 203 `) ··· 221 222 &repo.Knot, 222 223 &repo.Rkey, 223 224 &repoCreatedAt, 225 225 + &repo.AtUri, 224 226 ); err != nil { 225 227 return nil, err 226 228 }

ERROR

appview/pages/markup/markdown.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/markup/markdown_at_extension.go

Failed to calculate interdiff for this file.

REBASED

appview/pulls/pulls.go

This patch was likely rebased, as context lines do not match.

NEW

appview/issues/issues.go

··· 260 260 return 261 261 } 262 262 263 263 - commentId := mathrand.IntN(1000000) 264 264 - rkey := tid.TID() 265 265 - 266 266 - err := db.NewIssueComment(rp.db, &db.Comment{ 263 263 + comment := &db.Comment{ 267 264 OwnerDid: user.Did, 268 265 RepoAt: f.RepoAt(), 269 266 Issue: issueIdInt, 270 270 - CommentId: commentId, 267 267 + CommentId: mathrand.IntN(1000000), 271 268 Body: body, 272 272 - Rkey: rkey, 273 273 - }) 269 269 + Rkey: tid.TID(), 270 270 + } 271 271 + 272 272 + err := db.NewIssueComment(rp.db, comment) 274 273 if err != nil { 275 274 log.Println("failed to create comment", err) 276 275 rp.pages.Notice(w, "issue-comment", "Failed to create comment.") ··· 278 277 } 279 278 280 279 createdAt := time.Now().Format(time.RFC3339) 281 281 - commentIdInt64 := int64(commentId) 282 282 - ownerDid := user.Did 283 283 - issueAt, err := db.GetIssueAt(rp.db, f.RepoAt(), issueIdInt) 280 280 + commentIdInt64 := int64(comment.CommentId) 281 281 + issue, err := db.GetIssue(rp.db, f.RepoAt(), issueIdInt) 284 282 if err != nil { 285 285 - log.Println("failed to get issue at", err) 283 283 + log.Println("failed to get issue", err) 286 284 rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 287 285 return 288 286 } 289 287 290 290 - atUri := f.RepoAt().String() 288 288 + atUri := comment.RepoAt.String() 291 289 client, err := rp.oauth.AuthorizedClient(r) 292 290 if err != nil { 293 291 log.Println("failed to get authorized client", err) ··· 297 295 _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 298 296 Collection: tangled.RepoIssueCommentNSID, 299 297 Repo: user.Did, 300 300 - Rkey: rkey, 298 298 + Rkey: comment.Rkey, 301 299 Record: &lexutil.LexiconTypeDecoder{ 302 300 Val: &tangled.RepoIssueComment{ 303 301 Repo: &atUri, 304 304 - Issue: issueAt, 302 302 + Issue: issue.AtUri().String(), 305 303 CommentId: &commentIdInt64, 306 306 - Owner: &ownerDid, 304 304 + Owner: &comment.OwnerDid, 307 305 Body: body, 308 306 CreatedAt: createdAt, 309 307 }, ··· 315 313 return 316 314 } 317 315 318 318 - rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d#comment-%d", f.OwnerSlashRepo(), issueIdInt, commentId)) 316 316 + mentions := markup.FindUserMentions(comment.Body) 317 317 + 318 318 + rp.notifier.NewIssueComment(r.Context(), &f.Repo, issue, comment, mentions) 319 319 + 320 320 + rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d#comment-%d", f.OwnerSlashRepo(), comment.Issue, comment.CommentId)) 319 321 return 320 322 } 321 323 }

NEW

appview/email/email.go

··· 1 1 package email 2 2 3 3 import ( 4 4 - "fmt" 5 4 "net" 6 5 "regexp" 7 6 "strings" ··· 11 10 12 11 type Email struct { 13 12 From string 14 14 - To string 15 13 Subject string 16 14 Text string 17 15 Html string 18 16 APIKey string 19 17 } 20 18 21 21 - func SendEmail(email Email) error { 19 19 + func SendEmail(email Email, recipients ...string) error { 22 20 client := resend.NewClient(email.APIKey) 23 21 _, err := client.Emails.Send(&resend.SendEmailRequest{ 24 22 From: email.From, 25 25 - To: []string{email.To}, 23 23 + To: recipients, 26 24 Subject: email.Subject, 27 25 Text: email.Text, 28 26 Html: email.Html, 29 27 }) 30 30 - if err != nil { 31 31 - return fmt.Errorf("error sending email: %w", err) 32 32 - } 33 33 - return nil 28 28 + return err 34 29 } 35 30 36 31 func IsValidEmail(email string) bool {

NEW

appview/signup/signup.go

··· 149 149 em := email.Email{ 150 150 APIKey: s.config.Resend.ApiKey, 151 151 From: s.config.Resend.SentFrom, 152 152 - To: emailId, 153 152 Subject: "Verify your Tangled account", 154 153 Text: `Copy and paste this code below to verify your account on Tangled. 155 154 ` + code, ··· 157 156 <p><code>` + code + `</code></p>`, 158 157 } 159 158 160 160 - err = email.SendEmail(em) 159 159 + err = email.SendEmail(em, emailId) 161 160 if err != nil { 162 161 s.l.Error("failed to send email", "error", err) 163 162 s.pages.Notice(w, noticeId, "Failed to send email.")

NEW

appview/state/state.go

··· 20 20 "tangled.sh/tangled.sh/core/appview/cache/session" 21 21 "tangled.sh/tangled.sh/core/appview/config" 22 22 "tangled.sh/tangled.sh/core/appview/db" 23 23 + "tangled.sh/tangled.sh/core/appview/email" 23 24 "tangled.sh/tangled.sh/core/appview/notify" 24 25 "tangled.sh/tangled.sh/core/appview/oauth" 25 26 "tangled.sh/tangled.sh/core/appview/pages" ··· 133 134 spindlestream.Start(ctx) 134 135 135 136 var notifiers []notify.Notifier 137 137 + notifiers = append(notifiers, email.NewEmailNotifier(d, res, config)) 136 138 if !config.Core.Dev { 137 139 notifiers = append(notifiers, posthogService.NewPosthogNotifier(posthog)) 138 140 }

NEW

appview/db/db.go

··· 678 678 return err 679 679 }) 680 680 681 681 + runMigration(conn, "add-email-notif-preference-to-profile", func(tx *sql.Tx) error { 682 682 + _, err := tx.Exec(` 683 683 + alter table profile add column email_notif_preference integer not null default 0 check (email_notif_preference in (0, 1, 2)); -- disable, metion, enable 684 684 + `) 685 685 + return err 686 686 + }) 687 687 + 681 688 return &DB{db}, nil 682 689 } 683 690

NEW

appview/db/email.go

··· 299 299 _, err := e.Exec(query, code, did, email) 300 300 return err 301 301 } 302 302 + 303 303 + func GetUserEmailPreference(e Execer, did string) (EmailPreference, error) { 304 304 + var preference EmailPreference 305 305 + err := e.QueryRow(` 306 306 + select email_notif_preference 307 307 + from profile 308 308 + where did = ? 309 309 + `, did).Scan(&preference) 310 310 + if err != nil { 311 311 + return preference, err 312 312 + } 313 313 + return preference, nil 314 314 + } 315 315 + 316 316 + func UpdateSettingsEmailPreference(e Execer, did string, preference EmailPreference) error { 317 317 + _, err := e.Exec(` 318 318 + update profile 319 319 + set email_notif_preference = ? 320 320 + where did = ? 321 321 + `, preference, did) 322 322 + return err 323 323 + }

NEW

appview/db/profile.go

··· 183 183 Links [5]string 184 184 Stats [2]VanityStat 185 185 PinnedRepos [6]syntax.ATURI 186 186 + 187 187 + // settings 188 188 + EmailNotifPreference EmailPreference 189 189 + } 190 190 + 191 191 + type EmailPreference int 192 192 + 193 193 + const ( 194 194 + EmailNotifDisabled EmailPreference = iota 195 195 + EmailNotifMention 196 196 + EmailNotifEnabled 197 197 + ) 198 198 + 199 199 + func (p EmailPreference) IsDisabled() bool { 200 200 + return p == EmailNotifDisabled 201 201 + } 202 202 + 203 203 + func (p EmailPreference) IsMention() bool { 204 204 + return p == EmailNotifMention 205 205 + } 206 206 + 207 207 + func (p EmailPreference) IsEnabled() bool { 208 208 + return p == EmailNotifEnabled 186 209 } 187 210 188 211 func (p Profile) IsLinksEmpty() bool { ··· 280 303 did, 281 304 description, 282 305 include_bluesky, 283 283 - location 306 306 + location, 307 307 + email_notif_preference 284 308 ) 285 285 - values (?, ?, ?, ?)`, 309 309 + values (?, ?, ?, ?, ?)`, 286 310 profile.Did, 287 311 profile.Description, 288 312 includeBskyValue, 289 313 profile.Location, 314 314 + profile.EmailNotifPreference, 290 315 ) 291 316 292 317 if err != nil { ··· 367 392 did, 368 393 description, 369 394 include_bluesky, 370 370 - location 395 395 + location, 396 396 + email_notif_preference 371 397 from 372 398 profile 373 399 %s`, ··· 383 409 var profile Profile 384 410 var includeBluesky int 385 411 386 386 - err = rows.Scan(&profile.ID, &profile.Did, &profile.Description, &includeBluesky, &profile.Location) 412 412 + err = rows.Scan(&profile.ID, &profile.Did, &profile.Description, &includeBluesky, &profile.Location, &profile.EmailNotifPreference) 387 413 if err != nil { 388 414 return nil, err 389 415 } ··· 462 488 463 489 includeBluesky := 0 464 490 err := e.QueryRow( 465 465 - `select description, include_bluesky, location from profile where did = ?`, 491 491 + `select description, include_bluesky, location, email_notif_preference from profile where did = ?`, 466 492 did, 467 467 - ).Scan(&profile.Description, &includeBluesky, &profile.Location) 493 493 + ).Scan(&profile.Description, &includeBluesky, &profile.Location, &profile.EmailNotifPreference) 468 494 if err == sql.ErrNoRows { 469 495 profile := Profile{} 470 496 profile.Did = did

NEW

appview/pages/pages.go

··· 307 307 } 308 308 309 309 type SettingsParams struct { 310 310 - LoggedInUser *oauth.User 311 311 - PubKeys []db.PublicKey 312 312 - Emails []db.Email 310 310 + LoggedInUser *oauth.User 311 311 + PubKeys []db.PublicKey 312 312 + Emails []db.Email 313 313 + EmailNotifPreference db.EmailPreference 313 314 } 314 315 315 316 func (p *Pages) Settings(w io.Writer, params SettingsParams) error {

NEW

appview/pages/templates/settings.html

··· 93 93 {{ define "emails" }} 94 94 <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">email addresses</h2> 95 95 <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 96 96 + <form 97 97 + hx-post="/settings/email/preference" 98 98 + hx-swap="none" 99 99 + hx-indicator="#email-preference-spinner" 100 100 + > 101 101 + <select 102 102 + name="preference" 103 103 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 104 104 + > 105 105 + <option value="enable" {{ if .EmailNotifPreference.IsEnabled }}selected{{ end }}>Enable Email Notifications</option> 106 106 + <option value="mention" {{ if .EmailNotifPreference.IsMention }}selected{{ end }}>Only on Mentions</option> 107 107 + <option value="disable" {{ if .EmailNotifPreference.IsDisabled }}selected{{ end }}>Disable Email Notifications</option> 108 108 + </select> 109 109 + <button type="submit" class="btn text-base"> 110 110 + <span>Save Preference</span> 111 111 + <span id="email-preference-spinner" class="group"> 112 112 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 113 113 + </span> 114 114 + </button> 115 115 + </form> 96 116 <p class="mb-8 dark:text-gray-300">Commits authored using emails listed here will be associated with your Tangled profile.</p> 97 117 <div id="email-list" class="flex flex-col gap-6 mb-8"> 98 118 {{ range $index, $email := .Emails }}

NEW

appview/email/notifier.go

··· 69 69 }, nil 70 70 } 71 71 72 72 + func (n *EmailNotifier) buildPullEmail(ctx context.Context, repo *db.Repo, pull *db.Pull, comment *db.PullComment) (Email, error) { 73 73 + commentOwner, err := n.idResolver.ResolveIdent(ctx, comment.OwnerDid) 74 74 + if err != nil || commentOwner.Handle.IsInvalidHandle() { 75 75 + return Email{}, fmt.Errorf("resolve comment owner did: %w", err) 76 76 + } 77 77 + repoOwnerSlashName, err := n.repoOwnerSlashName(ctx, repo) 78 78 + if err != nil { 79 79 + return Email{}, nil 80 80 + } 81 81 + baseUrl := n.Config.Core.AppviewHost 82 82 + url := fmt.Sprintf("%s/%s/pulls/%d#comment-%d", baseUrl, repoOwnerSlashName, comment.PullId, comment.ID) 83 83 + return Email{ 84 84 + APIKey: n.Config.Resend.ApiKey, 85 85 + From: n.Config.Resend.SentFrom, 86 86 + Subject: fmt.Sprintf("[%s] %s (pr#%d)", repoOwnerSlashName, pull.Title, pull.PullId), 87 87 + Html: fmt.Sprintf(`<p><b>@%s</b> mentioned you</p><a href="%s">View it on tangled.sh</a>.`, commentOwner.Handle.String(), url), 88 88 + }, nil 89 89 + } 90 90 + 72 91 func (n *EmailNotifier) gatherRecipientEmails(ctx context.Context, handles []string) []string { 73 92 recipients := []string{} 74 93 for _, handle := range handles { ··· 109 128 } 110 129 } 111 130 112 112 - // func (n *EmailNotifier) NewPullComment(ctx context.Context, comment *db.PullComment, []string) { 113 113 - // n.usersMentioned(ctx, mentions) 114 114 - // } 131 131 + func (n *EmailNotifier) NewPullComment(ctx context.Context, repo *db.Repo, pull *db.Pull, comment *db.PullComment, mentions []string) { 132 132 + email, err := n.buildPullEmail(ctx, repo, pull, comment) 133 133 + if err != nil { 134 134 + log.Println("failed to create pull-email:", err) 135 135 + } 136 136 + recipients := n.gatherRecipientEmails(ctx, mentions) 137 137 + log.Println("sending email to:", recipients) 138 138 + if err = SendEmail(email); err != nil { 139 139 + log.Println("error sending email:", err) 140 140 + } 141 141 + }