-34

api/tangled/pipelinecancelPipeline.go

··· 1 1 - // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 - 3 3 - package tangled 4 4 - 5 5 - // schema: sh.tangled.pipeline.cancelPipeline 6 6 - 7 7 - import ( 8 8 - "context" 9 9 - 10 10 - "github.com/bluesky-social/indigo/lex/util" 11 11 - ) 12 12 - 13 13 - const ( 14 14 - PipelineCancelPipelineNSID = "sh.tangled.pipeline.cancelPipeline" 15 15 - ) 16 16 - 17 17 - // PipelineCancelPipeline_Input is the input argument to a sh.tangled.pipeline.cancelPipeline call. 18 18 - type PipelineCancelPipeline_Input struct { 19 19 - // pipeline: pipeline at-uri 20 20 - Pipeline string `json:"pipeline" cborgen:"pipeline"` 21 21 - // repo: repo at-uri, spindle can't resolve repo from pipeline at-uri yet 22 22 - Repo string `json:"repo" cborgen:"repo"` 23 23 - // workflow: workflow name 24 24 - Workflow string `json:"workflow" cborgen:"workflow"` 25 25 - } 26 26 - 27 27 - // PipelineCancelPipeline calls the XRPC method "sh.tangled.pipeline.cancelPipeline". 28 28 - func PipelineCancelPipeline(ctx context.Context, c util.LexClient, input *PipelineCancelPipeline_Input) error { 29 29 - if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.pipeline.cancelPipeline", nil, input, nil); err != nil { 30 30 - return err 31 31 - } 32 32 - 33 33 - return nil 34 34 - }

+56

appview/db/issues.go

··· 295 295 return GetIssuesPaginated(e, pagination.Page{}, filters...) 296 296 } 297 297 298 298 + // GetIssueIDs gets list of all existing issue's IDs 299 299 + func GetIssueIDs(e Execer, opts models.IssueSearchOptions) ([]int64, error) { 300 300 + var ids []int64 301 301 + 302 302 + var filters []orm.Filter 303 303 + openValue := 0 304 304 + if opts.IsOpen { 305 305 + openValue = 1 306 306 + } 307 307 + filters = append(filters, orm.FilterEq("open", openValue)) 308 308 + if opts.RepoAt != "" { 309 309 + filters = append(filters, orm.FilterEq("repo_at", opts.RepoAt)) 310 310 + } 311 311 + 312 312 + var conditions []string 313 313 + var args []any 314 314 + 315 315 + for _, filter := range filters { 316 316 + conditions = append(conditions, filter.Condition()) 317 317 + args = append(args, filter.Arg()...) 318 318 + } 319 319 + 320 320 + whereClause := "" 321 321 + if conditions != nil { 322 322 + whereClause = " where " + strings.Join(conditions, " and ") 323 323 + } 324 324 + query := fmt.Sprintf( 325 325 + ` 326 326 + select 327 327 + id 328 328 + from 329 329 + issues 330 330 + %s 331 331 + limit ? offset ?`, 332 332 + whereClause, 333 333 + ) 334 334 + args = append(args, opts.Page.Limit, opts.Page.Offset) 335 335 + rows, err := e.Query(query, args...) 336 336 + if err != nil { 337 337 + return nil, err 338 338 + } 339 339 + defer rows.Close() 340 340 + 341 341 + for rows.Next() { 342 342 + var id int64 343 343 + err := rows.Scan(&id) 344 344 + if err != nil { 345 345 + return nil, err 346 346 + } 347 347 + 348 348 + ids = append(ids, id) 349 349 + } 350 350 + 351 351 + return ids, nil 352 352 + } 353 353 + 298 354 func AddIssueComment(tx *sql.Tx, c models.IssueComment) (int64, error) { 299 355 result, err := tx.Exec( 300 356 `insert into issue_comments (

+6 -6

appview/db/pipeline.go

··· 6 6 "strings" 7 7 "time" 8 8 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 9 "tangled.org/core/appview/models" 11 10 "tangled.org/core/orm" 12 11 ) ··· 217 216 } 218 217 defer rows.Close() 219 218 220 220 - pipelines := make(map[syntax.ATURI]models.Pipeline) 219 219 + pipelines := make(map[string]models.Pipeline) 221 220 for rows.Next() { 222 221 var p models.Pipeline 223 222 var t models.Trigger ··· 254 253 p.Trigger = &t 255 254 p.Statuses = make(map[string]models.WorkflowStatus) 256 255 257 257 - pipelines[p.AtUri()] = p 256 256 + k := fmt.Sprintf("%s/%s", p.Knot, p.Rkey) 257 257 + pipelines[k] = p 258 258 } 259 259 260 260 // get all statuses ··· 314 314 return nil, fmt.Errorf("invalid status created timestamp %q: %w", created, err) 315 315 } 316 316 317 317 - pipelineAt := ps.PipelineAt() 317 317 + key := fmt.Sprintf("%s/%s", ps.PipelineKnot, ps.PipelineRkey) 318 318 319 319 // extract 320 320 - pipeline, ok := pipelines[pipelineAt] 320 320 + pipeline, ok := pipelines[key] 321 321 if !ok { 322 322 continue 323 323 } ··· 331 331 332 332 // reassign 333 333 pipeline.Statuses[ps.Workflow] = statuses 334 334 - pipelines[pipelineAt] = pipeline 334 334 + pipelines[key] = pipeline 335 335 } 336 336 337 337 var all []models.Pipeline

+68 -12

appview/db/pulls.go

··· 13 13 14 14 "github.com/bluesky-social/indigo/atproto/syntax" 15 15 "tangled.org/core/appview/models" 16 16 - "tangled.org/core/appview/pagination" 17 16 "tangled.org/core/orm" 18 17 ) 19 18 ··· 120 119 return pullId - 1, err 121 120 } 122 121 123 123 - func GetPullsPaginated(e Execer, page pagination.Page, filters ...orm.Filter) ([]*models.Pull, error) { 122 122 + func GetPullsWithLimit(e Execer, limit int, filters ...orm.Filter) ([]*models.Pull, error) { 124 123 pulls := make(map[syntax.ATURI]*models.Pull) 125 124 126 125 var conditions []string ··· 134 133 if conditions != nil { 135 134 whereClause = " where " + strings.Join(conditions, " and ") 136 135 } 137 137 - pageClause := "" 138 138 - if page.Limit != 0 { 139 139 - pageClause = fmt.Sprintf( 140 140 - " limit %d offset %d ", 141 141 - page.Limit, 142 142 - page.Offset, 143 143 - ) 136 136 + limitClause := "" 137 137 + if limit != 0 { 138 138 + limitClause = fmt.Sprintf(" limit %d ", limit) 144 139 } 145 140 146 141 query := fmt.Sprintf(` ··· 166 161 order by 167 162 created desc 168 163 %s 169 169 - `, whereClause, pageClause) 164 164 + `, whereClause, limitClause) 170 165 171 166 rows, err := e.Query(query, args...) 172 167 if err != nil { ··· 302 297 } 303 298 304 299 func GetPulls(e Execer, filters ...orm.Filter) ([]*models.Pull, error) { 305 305 - return GetPullsPaginated(e, pagination.Page{}, filters...) 300 300 + return GetPullsWithLimit(e, 0, filters...) 301 301 + } 302 302 + 303 303 + func GetPullIDs(e Execer, opts models.PullSearchOptions) ([]int64, error) { 304 304 + var ids []int64 305 305 + 306 306 + var filters []orm.Filter 307 307 + filters = append(filters, orm.FilterEq("state", opts.State)) 308 308 + if opts.RepoAt != "" { 309 309 + filters = append(filters, orm.FilterEq("repo_at", opts.RepoAt)) 310 310 + } 311 311 + 312 312 + var conditions []string 313 313 + var args []any 314 314 + 315 315 + for _, filter := range filters { 316 316 + conditions = append(conditions, filter.Condition()) 317 317 + args = append(args, filter.Arg()...) 318 318 + } 319 319 + 320 320 + whereClause := "" 321 321 + if conditions != nil { 322 322 + whereClause = " where " + strings.Join(conditions, " and ") 323 323 + } 324 324 + pageClause := "" 325 325 + if opts.Page.Limit != 0 { 326 326 + pageClause = fmt.Sprintf( 327 327 + " limit %d offset %d ", 328 328 + opts.Page.Limit, 329 329 + opts.Page.Offset, 330 330 + ) 331 331 + } 332 332 + 333 333 + query := fmt.Sprintf( 334 334 + ` 335 335 + select 336 336 + id 337 337 + from 338 338 + pulls 339 339 + %s 340 340 + %s`, 341 341 + whereClause, 342 342 + pageClause, 343 343 + ) 344 344 + args = append(args, opts.Page.Limit, opts.Page.Offset) 345 345 + rows, err := e.Query(query, args...) 346 346 + if err != nil { 347 347 + return nil, err 348 348 + } 349 349 + defer rows.Close() 350 350 + 351 351 + for rows.Next() { 352 352 + var id int64 353 353 + err := rows.Scan(&id) 354 354 + if err != nil { 355 355 + return nil, err 356 356 + } 357 357 + 358 358 + ids = append(ids, id) 359 359 + } 360 360 + 361 361 + return ids, nil 306 362 } 307 363 308 364 func GetPull(e Execer, repoAt syntax.ATURI, pullId int) (*models.Pull, error) { 309 309 - pulls, err := GetPullsPaginated(e, pagination.Page{Limit: 1}, orm.FilterEq("repo_at", repoAt), orm.FilterEq("pull_id", pullId)) 365 365 + pulls, err := GetPullsWithLimit(e, 1, orm.FilterEq("repo_at", repoAt), orm.FilterEq("pull_id", pullId)) 310 366 if err != nil { 311 367 return nil, err 312 368 }

+32 -32

appview/issues/issues.go

··· 81 81 82 82 func (rp *Issues) RepoSingleIssue(w http.ResponseWriter, r *http.Request) { 83 83 l := rp.logger.With("handler", "RepoSingleIssue") 84 84 - user := rp.oauth.GetMultiAccountUser(r) 84 84 + user := rp.oauth.GetUser(r) 85 85 f, err := rp.repoResolver.Resolve(r) 86 86 if err != nil { 87 87 l.Error("failed to get repo and knot", "err", err) ··· 102 102 103 103 userReactions := map[models.ReactionKind]bool{} 104 104 if user != nil { 105 105 - userReactions = db.GetReactionStatusMap(rp.db, user.Active.Did, issue.AtUri()) 105 105 + userReactions = db.GetReactionStatusMap(rp.db, user.Did, issue.AtUri()) 106 106 } 107 107 108 108 backlinks, err := db.GetBacklinks(rp.db, issue.AtUri()) ··· 143 143 144 144 func (rp *Issues) EditIssue(w http.ResponseWriter, r *http.Request) { 145 145 l := rp.logger.With("handler", "EditIssue") 146 146 - user := rp.oauth.GetMultiAccountUser(r) 146 146 + user := rp.oauth.GetUser(r) 147 147 148 148 issue, ok := r.Context().Value("issue").(*models.Issue) 149 149 if !ok { ··· 182 182 return 183 183 } 184 184 185 185 - ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueNSID, user.Active.Did, newIssue.Rkey) 185 185 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueNSID, user.Did, newIssue.Rkey) 186 186 if err != nil { 187 187 l.Error("failed to get record", "err", err) 188 188 rp.pages.Notice(w, noticeId, "Failed to edit issue, no record found on PDS.") ··· 191 191 192 192 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 193 193 Collection: tangled.RepoIssueNSID, 194 194 - Repo: user.Active.Did, 194 194 + Repo: user.Did, 195 195 Rkey: newIssue.Rkey, 196 196 SwapRecord: ex.Cid, 197 197 Record: &lexutil.LexiconTypeDecoder{ ··· 292 292 293 293 func (rp *Issues) CloseIssue(w http.ResponseWriter, r *http.Request) { 294 294 l := rp.logger.With("handler", "CloseIssue") 295 295 - user := rp.oauth.GetMultiAccountUser(r) 295 295 + user := rp.oauth.GetUser(r) 296 296 f, err := rp.repoResolver.Resolve(r) 297 297 if err != nil { 298 298 l.Error("failed to get repo and knot", "err", err) ··· 306 306 return 307 307 } 308 308 309 309 - roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 309 309 + roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 310 310 isRepoOwner := roles.IsOwner() 311 311 isCollaborator := roles.IsCollaborator() 312 312 - isIssueOwner := user.Active.Did == issue.Did 312 312 + isIssueOwner := user.Did == issue.Did 313 313 314 314 // TODO: make this more granular 315 315 if isIssueOwner || isRepoOwner || isCollaborator { ··· 326 326 issue.Open = false 327 327 328 328 // notify about the issue closure 329 329 - rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Active.Did), issue) 329 329 + rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Did), issue) 330 330 331 331 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 332 332 rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", ownerSlashRepo, issue.IssueId)) ··· 340 340 341 341 func (rp *Issues) ReopenIssue(w http.ResponseWriter, r *http.Request) { 342 342 l := rp.logger.With("handler", "ReopenIssue") 343 343 - user := rp.oauth.GetMultiAccountUser(r) 343 343 + user := rp.oauth.GetUser(r) 344 344 f, err := rp.repoResolver.Resolve(r) 345 345 if err != nil { 346 346 l.Error("failed to get repo and knot", "err", err) ··· 354 354 return 355 355 } 356 356 357 357 - roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 357 357 + roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 358 358 isRepoOwner := roles.IsOwner() 359 359 isCollaborator := roles.IsCollaborator() 360 360 - isIssueOwner := user.Active.Did == issue.Did 360 360 + isIssueOwner := user.Did == issue.Did 361 361 362 362 if isCollaborator || isRepoOwner || isIssueOwner { 363 363 err := db.ReopenIssues( ··· 373 373 issue.Open = true 374 374 375 375 // notify about the issue reopen 376 376 - rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Active.Did), issue) 376 376 + rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Did), issue) 377 377 378 378 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 379 379 rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", ownerSlashRepo, issue.IssueId)) ··· 387 387 388 388 func (rp *Issues) NewIssueComment(w http.ResponseWriter, r *http.Request) { 389 389 l := rp.logger.With("handler", "NewIssueComment") 390 390 - user := rp.oauth.GetMultiAccountUser(r) 390 390 + user := rp.oauth.GetUser(r) 391 391 f, err := rp.repoResolver.Resolve(r) 392 392 if err != nil { 393 393 l.Error("failed to get repo and knot", "err", err) ··· 416 416 mentions, references := rp.mentionsResolver.Resolve(r.Context(), body) 417 417 418 418 comment := models.IssueComment{ 419 419 - Did: user.Active.Did, 419 419 + Did: user.Did, 420 420 Rkey: tid.TID(), 421 421 IssueAt: issue.AtUri().String(), 422 422 ReplyTo: replyTo, ··· 495 495 496 496 func (rp *Issues) IssueComment(w http.ResponseWriter, r *http.Request) { 497 497 l := rp.logger.With("handler", "IssueComment") 498 498 - user := rp.oauth.GetMultiAccountUser(r) 498 498 + user := rp.oauth.GetUser(r) 499 499 500 500 issue, ok := r.Context().Value("issue").(*models.Issue) 501 501 if !ok { ··· 531 531 532 532 func (rp *Issues) EditIssueComment(w http.ResponseWriter, r *http.Request) { 533 533 l := rp.logger.With("handler", "EditIssueComment") 534 534 - user := rp.oauth.GetMultiAccountUser(r) 534 534 + user := rp.oauth.GetUser(r) 535 535 536 536 issue, ok := r.Context().Value("issue").(*models.Issue) 537 537 if !ok { ··· 557 557 } 558 558 comment := comments[0] 559 559 560 560 - if comment.Did != user.Active.Did { 561 561 - l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Active.Did) 560 560 + if comment.Did != user.Did { 561 561 + l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Did) 562 562 http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 563 563 return 564 564 } ··· 608 608 // rkey is optional, it was introduced later 609 609 if newComment.Rkey != "" { 610 610 // update the record on pds 611 611 - ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueCommentNSID, user.Active.Did, comment.Rkey) 611 611 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueCommentNSID, user.Did, comment.Rkey) 612 612 if err != nil { 613 613 l.Error("failed to get record", "err", err, "did", newComment.Did, "rkey", newComment.Rkey) 614 614 rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "Failed to update description, no record found on PDS.") ··· 617 617 618 618 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 619 619 Collection: tangled.RepoIssueCommentNSID, 620 620 - Repo: user.Active.Did, 620 620 + Repo: user.Did, 621 621 Rkey: newComment.Rkey, 622 622 SwapRecord: ex.Cid, 623 623 Record: &lexutil.LexiconTypeDecoder{ ··· 641 641 642 642 func (rp *Issues) ReplyIssueCommentPlaceholder(w http.ResponseWriter, r *http.Request) { 643 643 l := rp.logger.With("handler", "ReplyIssueCommentPlaceholder") 644 644 - user := rp.oauth.GetMultiAccountUser(r) 644 644 + user := rp.oauth.GetUser(r) 645 645 646 646 issue, ok := r.Context().Value("issue").(*models.Issue) 647 647 if !ok { ··· 677 677 678 678 func (rp *Issues) ReplyIssueComment(w http.ResponseWriter, r *http.Request) { 679 679 l := rp.logger.With("handler", "ReplyIssueComment") 680 680 - user := rp.oauth.GetMultiAccountUser(r) 680 680 + user := rp.oauth.GetUser(r) 681 681 682 682 issue, ok := r.Context().Value("issue").(*models.Issue) 683 683 if !ok { ··· 713 713 714 714 func (rp *Issues) DeleteIssueComment(w http.ResponseWriter, r *http.Request) { 715 715 l := rp.logger.With("handler", "DeleteIssueComment") 716 716 - user := rp.oauth.GetMultiAccountUser(r) 716 716 + user := rp.oauth.GetUser(r) 717 717 718 718 issue, ok := r.Context().Value("issue").(*models.Issue) 719 719 if !ok { ··· 739 739 } 740 740 comment := comments[0] 741 741 742 742 - if comment.Did != user.Active.Did { 743 743 - l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Active.Did) 742 742 + if comment.Did != user.Did { 743 743 + l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Did) 744 744 http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 745 745 return 746 746 } ··· 769 769 } 770 770 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 771 771 Collection: tangled.RepoIssueCommentNSID, 772 772 - Repo: user.Active.Did, 772 772 + Repo: user.Did, 773 773 Rkey: comment.Rkey, 774 774 }) 775 775 if err != nil { ··· 807 807 808 808 page := pagination.FromContext(r.Context()) 809 809 810 810 - user := rp.oauth.GetMultiAccountUser(r) 810 810 + user := rp.oauth.GetUser(r) 811 811 f, err := rp.repoResolver.Resolve(r) 812 812 if err != nil { 813 813 l.Error("failed to get repo and knot", "err", err) ··· 884 884 } 885 885 886 886 rp.pages.RepoIssues(w, pages.RepoIssuesParams{ 887 887 - LoggedInUser: rp.oauth.GetMultiAccountUser(r), 887 887 + LoggedInUser: rp.oauth.GetUser(r), 888 888 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 889 889 Issues: issues, 890 890 IssueCount: totalIssues, ··· 897 897 898 898 func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { 899 899 l := rp.logger.With("handler", "NewIssue") 900 900 - user := rp.oauth.GetMultiAccountUser(r) 900 900 + user := rp.oauth.GetUser(r) 901 901 902 902 f, err := rp.repoResolver.Resolve(r) 903 903 if err != nil { ··· 921 921 Title: r.FormValue("title"), 922 922 Body: body, 923 923 Open: true, 924 924 - Did: user.Active.Did, 924 924 + Did: user.Did, 925 925 Created: time.Now(), 926 926 Mentions: mentions, 927 927 References: references, ··· 945 945 } 946 946 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 947 947 Collection: tangled.RepoIssueNSID, 948 948 - Repo: user.Active.Did, 948 948 + Repo: user.Did, 949 949 Rkey: issue.Rkey, 950 950 Record: &lexutil.LexiconTypeDecoder{ 951 951 Val: &record,

+31 -31

appview/knots/knots.go

··· 70 70 } 71 71 72 72 func (k *Knots) knots(w http.ResponseWriter, r *http.Request) { 73 73 - user := k.OAuth.GetMultiAccountUser(r) 73 73 + user := k.OAuth.GetUser(r) 74 74 registrations, err := db.GetRegistrations( 75 75 k.Db, 76 76 - orm.FilterEq("did", user.Active.Did), 76 76 + orm.FilterEq("did", user.Did), 77 77 ) 78 78 if err != nil { 79 79 k.Logger.Error("failed to fetch knot registrations", "err", err) ··· 92 92 func (k *Knots) dashboard(w http.ResponseWriter, r *http.Request) { 93 93 l := k.Logger.With("handler", "dashboard") 94 94 95 95 - user := k.OAuth.GetMultiAccountUser(r) 96 96 - l = l.With("user", user.Active.Did) 95 95 + user := k.OAuth.GetUser(r) 96 96 + l = l.With("user", user.Did) 97 97 98 98 domain := chi.URLParam(r, "domain") 99 99 if domain == "" { ··· 103 103 104 104 registrations, err := db.GetRegistrations( 105 105 k.Db, 106 106 - orm.FilterEq("did", user.Active.Did), 106 106 + orm.FilterEq("did", user.Did), 107 107 orm.FilterEq("domain", domain), 108 108 ) 109 109 if err != nil { ··· 154 154 } 155 155 156 156 func (k *Knots) register(w http.ResponseWriter, r *http.Request) { 157 157 - user := k.OAuth.GetMultiAccountUser(r) 157 157 + user := k.OAuth.GetUser(r) 158 158 l := k.Logger.With("handler", "register") 159 159 160 160 noticeId := "register-error" ··· 175 175 return 176 176 } 177 177 l = l.With("domain", domain) 178 178 - l = l.With("user", user.Active.Did) 178 178 + l = l.With("user", user.Did) 179 179 180 180 tx, err := k.Db.Begin() 181 181 if err != nil { ··· 188 188 k.Enforcer.E.LoadPolicy() 189 189 }() 190 190 191 191 - err = db.AddKnot(tx, domain, user.Active.Did) 191 191 + err = db.AddKnot(tx, domain, user.Did) 192 192 if err != nil { 193 193 l.Error("failed to insert", "err", err) 194 194 fail() ··· 210 210 return 211 211 } 212 212 213 213 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Active.Did, domain) 213 213 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Did, domain) 214 214 var exCid *string 215 215 if ex != nil { 216 216 exCid = ex.Cid ··· 219 219 // re-announce by registering under same rkey 220 220 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 221 221 Collection: tangled.KnotNSID, 222 222 - Repo: user.Active.Did, 222 222 + Repo: user.Did, 223 223 Rkey: domain, 224 224 Record: &lexutil.LexiconTypeDecoder{ 225 225 Val: &tangled.Knot{ ··· 250 250 } 251 251 252 252 // begin verification 253 253 - err = serververify.RunVerification(r.Context(), domain, user.Active.Did, k.Config.Core.Dev) 253 253 + err = serververify.RunVerification(r.Context(), domain, user.Did, k.Config.Core.Dev) 254 254 if err != nil { 255 255 l.Error("verification failed", "err", err) 256 256 k.Pages.HxRefresh(w) 257 257 return 258 258 } 259 259 260 260 - err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Active.Did) 260 260 + err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Did) 261 261 if err != nil { 262 262 l.Error("failed to mark verified", "err", err) 263 263 k.Pages.HxRefresh(w) ··· 275 275 } 276 276 277 277 func (k *Knots) delete(w http.ResponseWriter, r *http.Request) { 278 278 - user := k.OAuth.GetMultiAccountUser(r) 278 278 + user := k.OAuth.GetUser(r) 279 279 l := k.Logger.With("handler", "delete") 280 280 281 281 noticeId := "operation-error" ··· 294 294 // get record from db first 295 295 registrations, err := db.GetRegistrations( 296 296 k.Db, 297 297 - orm.FilterEq("did", user.Active.Did), 297 297 + orm.FilterEq("did", user.Did), 298 298 orm.FilterEq("domain", domain), 299 299 ) 300 300 if err != nil { ··· 322 322 323 323 err = db.DeleteKnot( 324 324 tx, 325 325 - orm.FilterEq("did", user.Active.Did), 325 325 + orm.FilterEq("did", user.Did), 326 326 orm.FilterEq("domain", domain), 327 327 ) 328 328 if err != nil { ··· 350 350 351 351 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 352 352 Collection: tangled.KnotNSID, 353 353 - Repo: user.Active.Did, 353 353 + Repo: user.Did, 354 354 Rkey: domain, 355 355 }) 356 356 if err != nil { ··· 382 382 } 383 383 384 384 func (k *Knots) retry(w http.ResponseWriter, r *http.Request) { 385 385 - user := k.OAuth.GetMultiAccountUser(r) 385 385 + user := k.OAuth.GetUser(r) 386 386 l := k.Logger.With("handler", "retry") 387 387 388 388 noticeId := "operation-error" ··· 398 398 return 399 399 } 400 400 l = l.With("domain", domain) 401 401 - l = l.With("user", user.Active.Did) 401 401 + l = l.With("user", user.Did) 402 402 403 403 // get record from db first 404 404 registrations, err := db.GetRegistrations( 405 405 k.Db, 406 406 - orm.FilterEq("did", user.Active.Did), 406 406 + orm.FilterEq("did", user.Did), 407 407 orm.FilterEq("domain", domain), 408 408 ) 409 409 if err != nil { ··· 419 419 registration := registrations[0] 420 420 421 421 // begin verification 422 422 - err = serververify.RunVerification(r.Context(), domain, user.Active.Did, k.Config.Core.Dev) 422 422 + err = serververify.RunVerification(r.Context(), domain, user.Did, k.Config.Core.Dev) 423 423 if err != nil { 424 424 l.Error("verification failed", "err", err) 425 425 ··· 437 437 return 438 438 } 439 439 440 440 - err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Active.Did) 440 440 + err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Did) 441 441 if err != nil { 442 442 l.Error("failed to mark verified", "err", err) 443 443 k.Pages.Notice(w, noticeId, err.Error()) ··· 456 456 return 457 457 } 458 458 459 459 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Active.Did, domain) 459 459 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Did, domain) 460 460 var exCid *string 461 461 if ex != nil { 462 462 exCid = ex.Cid ··· 465 465 // ignore the error here 466 466 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 467 467 Collection: tangled.KnotNSID, 468 468 - Repo: user.Active.Did, 468 468 + Repo: user.Did, 469 469 Rkey: domain, 470 470 Record: &lexutil.LexiconTypeDecoder{ 471 471 Val: &tangled.Knot{ ··· 494 494 // Get updated registration to show 495 495 registrations, err = db.GetRegistrations( 496 496 k.Db, 497 497 - orm.FilterEq("did", user.Active.Did), 497 497 + orm.FilterEq("did", user.Did), 498 498 orm.FilterEq("domain", domain), 499 499 ) 500 500 if err != nil { ··· 516 516 } 517 517 518 518 func (k *Knots) addMember(w http.ResponseWriter, r *http.Request) { 519 519 - user := k.OAuth.GetMultiAccountUser(r) 519 519 + user := k.OAuth.GetUser(r) 520 520 l := k.Logger.With("handler", "addMember") 521 521 522 522 domain := chi.URLParam(r, "domain") ··· 526 526 return 527 527 } 528 528 l = l.With("domain", domain) 529 529 - l = l.With("user", user.Active.Did) 529 529 + l = l.With("user", user.Did) 530 530 531 531 registrations, err := db.GetRegistrations( 532 532 k.Db, 533 533 - orm.FilterEq("did", user.Active.Did), 533 533 + orm.FilterEq("did", user.Did), 534 534 orm.FilterEq("domain", domain), 535 535 orm.FilterIsNot("registered", "null"), 536 536 ) ··· 583 583 584 584 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 585 585 Collection: tangled.KnotMemberNSID, 586 586 - Repo: user.Active.Did, 586 586 + Repo: user.Did, 587 587 Rkey: rkey, 588 588 Record: &lexutil.LexiconTypeDecoder{ 589 589 Val: &tangled.KnotMember{ ··· 618 618 } 619 619 620 620 func (k *Knots) removeMember(w http.ResponseWriter, r *http.Request) { 621 621 - user := k.OAuth.GetMultiAccountUser(r) 621 621 + user := k.OAuth.GetUser(r) 622 622 l := k.Logger.With("handler", "removeMember") 623 623 624 624 noticeId := "operation-error" ··· 634 634 return 635 635 } 636 636 l = l.With("domain", domain) 637 637 - l = l.With("user", user.Active.Did) 637 637 + l = l.With("user", user.Did) 638 638 639 639 registrations, err := db.GetRegistrations( 640 640 k.Db, 641 641 - orm.FilterEq("did", user.Active.Did), 641 641 + orm.FilterEq("did", user.Did), 642 642 orm.FilterEq("domain", domain), 643 643 orm.FilterIsNot("registered", "null"), 644 644 )

+2 -2

appview/labels/labels.go

··· 68 68 // - this handler should calculate the diff in order to create the labelop record 69 69 // - we need the diff in order to maintain a "history" of operations performed by users 70 70 func (l *Labels) PerformLabelOp(w http.ResponseWriter, r *http.Request) { 71 71 - user := l.oauth.GetMultiAccountUser(r) 71 71 + user := l.oauth.GetUser(r) 72 72 73 73 noticeId := "add-label-error" 74 74 ··· 82 82 return 83 83 } 84 84 85 85 - did := user.Active.Did 85 85 + did := user.Did 86 86 rkey := tid.TID() 87 87 performedAt := time.Now() 88 88 indexedAt := time.Now()

+8 -6

appview/middleware/middleware.go

··· 115 115 return func(next http.Handler) http.Handler { 116 116 return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 117 117 // requires auth also 118 118 - actor := mw.oauth.GetMultiAccountUser(r) 118 118 + actor := mw.oauth.GetUser(r) 119 119 if actor == nil { 120 120 // we need a logged in user 121 121 log.Printf("not logged in, redirecting") ··· 128 128 return 129 129 } 130 130 131 131 - ok, err := mw.enforcer.E.HasGroupingPolicy(actor.Active.Did, group, domain) 131 131 + ok, err := mw.enforcer.E.HasGroupingPolicy(actor.Did, group, domain) 132 132 if err != nil || !ok { 133 133 - log.Printf("%s does not have perms of a %s in domain %s", actor.Active.Did, group, domain) 133 133 + // we need a logged in user 134 134 + log.Printf("%s does not have perms of a %s in domain %s", actor.Did, group, domain) 134 135 http.Error(w, "Forbiden", http.StatusUnauthorized) 135 136 return 136 137 } ··· 148 149 return func(next http.Handler) http.Handler { 149 150 return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 150 151 // requires auth also 151 151 - actor := mw.oauth.GetMultiAccountUser(r) 152 152 + actor := mw.oauth.GetUser(r) 152 153 if actor == nil { 153 154 // we need a logged in user 154 155 log.Printf("not logged in, redirecting") ··· 161 162 return 162 163 } 163 164 164 164 - ok, err := mw.enforcer.E.Enforce(actor.Active.Did, f.Knot, f.DidSlashRepo(), requiredPerm) 165 165 + ok, err := mw.enforcer.E.Enforce(actor.Did, f.Knot, f.DidSlashRepo(), requiredPerm) 165 166 if err != nil || !ok { 166 166 - log.Printf("%s does not have perms of a %s in repo %s", actor.Active.Did, requiredPerm, f.DidSlashRepo()) 167 167 + // we need a logged in user 168 168 + log.Printf("%s does not have perms of a %s in repo %s", actor.Did, requiredPerm, f.DidSlashRepo()) 167 169 http.Error(w, "Forbiden", http.StatusUnauthorized) 168 170 return 169 171 }

-48

appview/models/pipeline.go

··· 1 1 package models 2 2 3 3 import ( 4 4 - "fmt" 5 4 "slices" 6 6 - "strings" 7 5 "time" 8 6 9 7 "github.com/bluesky-social/indigo/atproto/syntax" 10 8 "github.com/go-git/go-git/v5/plumbing" 11 11 - "tangled.org/core/api/tangled" 12 9 spindle "tangled.org/core/spindle/models" 13 10 "tangled.org/core/workflow" 14 11 ) ··· 28 25 Statuses map[string]WorkflowStatus 29 26 } 30 27 31 31 - func (p *Pipeline) AtUri() syntax.ATURI { 32 32 - return syntax.ATURI(fmt.Sprintf("at://did:web:%s/%s/%s", p.Knot, tangled.PipelineNSID, p.Rkey)) 33 33 - } 34 34 - 35 28 type WorkflowStatus struct { 36 29 Data []PipelineStatus 37 30 } ··· 59 52 return 0 60 53 } 61 54 62 62 - // produces short summary of successes: 63 63 - // - "0/4" when zero successes of 4 workflows 64 64 - // - "4/4" when all successes of 4 workflows 65 65 - // - "0/0" when no workflows run in this pipeline 66 66 - func (p Pipeline) ShortStatusSummary() string { 67 67 - counts := make(map[spindle.StatusKind]int) 68 68 - for _, w := range p.Statuses { 69 69 - counts[w.Latest().Status] += 1 70 70 - } 71 71 - 72 72 - total := len(p.Statuses) 73 73 - successes := counts[spindle.StatusKindSuccess] 74 74 - 75 75 - return fmt.Sprintf("%d/%d", successes, total) 76 76 - } 77 77 - 78 78 - // produces a string of the form "3/4 success, 2/4 failed, 1/4 pending" 79 79 - func (p Pipeline) LongStatusSummary() string { 80 80 - counts := make(map[spindle.StatusKind]int) 81 81 - for _, w := range p.Statuses { 82 82 - counts[w.Latest().Status] += 1 83 83 - } 84 84 - 85 85 - total := len(p.Statuses) 86 86 - 87 87 - var result []string 88 88 - // finish states first, followed by start states 89 89 - states := append(spindle.FinishStates[:], spindle.StartStates[:]...) 90 90 - for _, state := range states { 91 91 - if count, ok := counts[state]; ok { 92 92 - result = append(result, fmt.Sprintf("%d/%d %s", count, total, state.String())) 93 93 - } 94 94 - } 95 95 - 96 96 - return strings.Join(result, ", ") 97 97 - } 98 98 - 99 55 func (p Pipeline) Counts() map[string]int { 100 56 m := make(map[string]int) 101 57 for _, w := range p.Statuses { ··· 172 128 Error *string 173 129 ExitCode int 174 130 } 175 175 - 176 176 - func (ps *PipelineStatus) PipelineAt() syntax.ATURI { 177 177 - return syntax.ATURI(fmt.Sprintf("at://did:web:%s/%s/%s", ps.PipelineKnot, tangled.PipelineNSID, ps.PipelineRkey)) 178 178 - }

+17 -7

appview/models/pull.go

··· 171 171 return syntax.ATURI(p.CommentAt) 172 172 } 173 173 174 174 - func (p *Pull) TotalComments() int { 175 175 - total := 0 176 176 - for _, s := range p.Submissions { 177 177 - total += len(s.Comments) 178 178 - } 179 179 - return total 180 180 - } 174 174 + // func (p *PullComment) AsRecord() tangled.RepoPullComment { 175 175 + // mentions := make([]string, len(p.Mentions)) 176 176 + // for i, did := range p.Mentions { 177 177 + // mentions[i] = string(did) 178 178 + // } 179 179 + // references := make([]string, len(p.References)) 180 180 + // for i, uri := range p.References { 181 181 + // references[i] = string(uri) 182 182 + // } 183 183 + // return tangled.RepoPullComment{ 184 184 + // Pull: p.PullAt, 185 185 + // Body: p.Body, 186 186 + // Mentions: mentions, 187 187 + // References: references, 188 188 + // CreatedAt: p.Created.Format(time.RFC3339), 189 189 + // } 190 190 + // } 181 191 182 192 func (p *Pull) LastRoundNumber() int { 183 193 return len(p.Submissions) - 1

+6 -7

appview/notifications/notifications.go

··· 48 48 49 49 func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) { 50 50 l := n.logger.With("handler", "notificationsPage") 51 51 - user := n.oauth.GetMultiAccountUser(r) 51 51 + user := n.oauth.GetUser(r) 52 52 53 53 page := pagination.FromContext(r.Context()) 54 54 55 55 total, err := db.CountNotifications( 56 56 n.db, 57 57 - orm.FilterEq("recipient_did", user.Active.Did), 57 57 + orm.FilterEq("recipient_did", user.Did), 58 58 ) 59 59 if err != nil { 60 60 l.Error("failed to get total notifications", "err", err) ··· 65 65 notifications, err := db.GetNotificationsWithEntities( 66 66 n.db, 67 67 page, 68 68 - orm.FilterEq("recipient_did", user.Active.Did), 68 68 + orm.FilterEq("recipient_did", user.Did), 69 69 ) 70 70 if err != nil { 71 71 l.Error("failed to get notifications", "err", err) ··· 73 73 return 74 74 } 75 75 76 76 - err = db.MarkAllNotificationsRead(n.db, user.Active.Did) 76 76 + err = db.MarkAllNotificationsRead(n.db, user.Did) 77 77 if err != nil { 78 78 l.Error("failed to mark notifications as read", "err", err) 79 79 } ··· 90 90 } 91 91 92 92 func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) { 93 93 - user := n.oauth.GetMultiAccountUser(r) 93 93 + user := n.oauth.GetUser(r) 94 94 if user == nil { 95 95 - http.Error(w, "Forbidden", http.StatusUnauthorized) 96 95 return 97 96 } 98 97 99 98 count, err := db.CountNotifications( 100 99 n.db, 101 101 - orm.FilterEq("recipient_did", user.Active.Did), 100 100 + orm.FilterEq("recipient_did", user.Did), 102 101 orm.FilterEq("read", 0), 103 102 ) 104 103 if err != nil {

-191

appview/oauth/accounts.go

··· 1 1 - package oauth 2 2 - 3 3 - import ( 4 4 - "encoding/json" 5 5 - "errors" 6 6 - "net/http" 7 7 - "time" 8 8 - ) 9 9 - 10 10 - const MaxAccounts = 20 11 11 - 12 12 - var ErrMaxAccountsReached = errors.New("maximum number of linked accounts reached") 13 13 - 14 14 - type AccountInfo struct { 15 15 - Did string `json:"did"` 16 16 - Handle string `json:"handle"` 17 17 - SessionId string `json:"session_id"` 18 18 - AddedAt int64 `json:"added_at"` 19 19 - } 20 20 - 21 21 - type AccountRegistry struct { 22 22 - Accounts []AccountInfo `json:"accounts"` 23 23 - } 24 24 - 25 25 - type MultiAccountUser struct { 26 26 - Active *User 27 27 - Accounts []AccountInfo 28 28 - } 29 29 - 30 30 - func (m *MultiAccountUser) Did() string { 31 31 - if m.Active == nil { 32 32 - return "" 33 33 - } 34 34 - return m.Active.Did 35 35 - } 36 36 - 37 37 - func (m *MultiAccountUser) Pds() string { 38 38 - if m.Active == nil { 39 39 - return "" 40 40 - } 41 41 - return m.Active.Pds 42 42 - } 43 43 - 44 44 - func (o *OAuth) GetAccounts(r *http.Request) *AccountRegistry { 45 45 - session, err := o.SessStore.Get(r, AccountsName) 46 46 - if err != nil || session.IsNew { 47 47 - return &AccountRegistry{Accounts: []AccountInfo{}} 48 48 - } 49 49 - 50 50 - data, ok := session.Values["accounts"].(string) 51 51 - if !ok { 52 52 - return &AccountRegistry{Accounts: []AccountInfo{}} 53 53 - } 54 54 - 55 55 - var registry AccountRegistry 56 56 - if err := json.Unmarshal([]byte(data), &registry); err != nil { 57 57 - return &AccountRegistry{Accounts: []AccountInfo{}} 58 58 - } 59 59 - 60 60 - return &registry 61 61 - } 62 62 - 63 63 - func (o *OAuth) SaveAccounts(w http.ResponseWriter, r *http.Request, registry *AccountRegistry) error { 64 64 - session, err := o.SessStore.Get(r, AccountsName) 65 65 - if err != nil { 66 66 - return err 67 67 - } 68 68 - 69 69 - data, err := json.Marshal(registry) 70 70 - if err != nil { 71 71 - return err 72 72 - } 73 73 - 74 74 - session.Values["accounts"] = string(data) 75 75 - session.Options.MaxAge = 60 * 60 * 24 * 365 76 76 - session.Options.HttpOnly = true 77 77 - session.Options.Secure = !o.Config.Core.Dev 78 78 - session.Options.SameSite = http.SameSiteLaxMode 79 79 - 80 80 - return session.Save(r, w) 81 81 - } 82 82 - 83 83 - func (r *AccountRegistry) AddAccount(did, handle, sessionId string) error { 84 84 - for i, acc := range r.Accounts { 85 85 - if acc.Did == did { 86 86 - r.Accounts[i].SessionId = sessionId 87 87 - r.Accounts[i].Handle = handle 88 88 - return nil 89 89 - } 90 90 - } 91 91 - 92 92 - if len(r.Accounts) >= MaxAccounts { 93 93 - return ErrMaxAccountsReached 94 94 - } 95 95 - 96 96 - r.Accounts = append(r.Accounts, AccountInfo{ 97 97 - Did: did, 98 98 - Handle: handle, 99 99 - SessionId: sessionId, 100 100 - AddedAt: time.Now().Unix(), 101 101 - }) 102 102 - return nil 103 103 - } 104 104 - 105 105 - func (r *AccountRegistry) RemoveAccount(did string) { 106 106 - filtered := make([]AccountInfo, 0, len(r.Accounts)) 107 107 - for _, acc := range r.Accounts { 108 108 - if acc.Did != did { 109 109 - filtered = append(filtered, acc) 110 110 - } 111 111 - } 112 112 - r.Accounts = filtered 113 113 - } 114 114 - 115 115 - func (r *AccountRegistry) FindAccount(did string) *AccountInfo { 116 116 - for i := range r.Accounts { 117 117 - if r.Accounts[i].Did == did { 118 118 - return &r.Accounts[i] 119 119 - } 120 120 - } 121 121 - return nil 122 122 - } 123 123 - 124 124 - func (r *AccountRegistry) OtherAccounts(activeDid string) []AccountInfo { 125 125 - result := make([]AccountInfo, 0, len(r.Accounts)) 126 126 - for _, acc := range r.Accounts { 127 127 - if acc.Did != activeDid { 128 128 - result = append(result, acc) 129 129 - } 130 130 - } 131 131 - return result 132 132 - } 133 133 - 134 134 - func (o *OAuth) GetMultiAccountUser(r *http.Request) *MultiAccountUser { 135 135 - user := o.GetUser(r) 136 136 - if user == nil { 137 137 - return nil 138 138 - } 139 139 - 140 140 - registry := o.GetAccounts(r) 141 141 - return &MultiAccountUser{ 142 142 - Active: user, 143 143 - Accounts: registry.Accounts, 144 144 - } 145 145 - } 146 146 - 147 147 - type AuthReturnInfo struct { 148 148 - ReturnURL string 149 149 - AddAccount bool 150 150 - } 151 151 - 152 152 - func (o *OAuth) SetAuthReturn(w http.ResponseWriter, r *http.Request, returnURL string, addAccount bool) error { 153 153 - session, err := o.SessStore.Get(r, AuthReturnName) 154 154 - if err != nil { 155 155 - return err 156 156 - } 157 157 - 158 158 - session.Values[AuthReturnURL] = returnURL 159 159 - session.Values[AuthAddAccount] = addAccount 160 160 - session.Options.MaxAge = 60 * 30 161 161 - session.Options.HttpOnly = true 162 162 - session.Options.Secure = !o.Config.Core.Dev 163 163 - session.Options.SameSite = http.SameSiteLaxMode 164 164 - 165 165 - return session.Save(r, w) 166 166 - } 167 167 - 168 168 - func (o *OAuth) GetAuthReturn(r *http.Request) *AuthReturnInfo { 169 169 - session, err := o.SessStore.Get(r, AuthReturnName) 170 170 - if err != nil || session.IsNew { 171 171 - return &AuthReturnInfo{} 172 172 - } 173 173 - 174 174 - returnURL, _ := session.Values[AuthReturnURL].(string) 175 175 - addAccount, _ := session.Values[AuthAddAccount].(bool) 176 176 - 177 177 - return &AuthReturnInfo{ 178 178 - ReturnURL: returnURL, 179 179 - AddAccount: addAccount, 180 180 - } 181 181 - } 182 182 - 183 183 - func (o *OAuth) ClearAuthReturn(w http.ResponseWriter, r *http.Request) error { 184 184 - session, err := o.SessStore.Get(r, AuthReturnName) 185 185 - if err != nil { 186 186 - return err 187 187 - } 188 188 - 189 189 - session.Options.MaxAge = -1 190 190 - return session.Save(r, w) 191 191 - }

-265

appview/oauth/accounts_test.go

··· 1 1 - package oauth 2 2 - 3 3 - import ( 4 4 - "testing" 5 5 - ) 6 6 - 7 7 - func TestAccountRegistry_AddAccount(t *testing.T) { 8 8 - tests := []struct { 9 9 - name string 10 10 - initial []AccountInfo 11 11 - addDid string 12 12 - addHandle string 13 13 - addSessionId string 14 14 - wantErr error 15 15 - wantLen int 16 16 - wantSessionId string 17 17 - }{ 18 18 - { 19 19 - name: "add first account", 20 20 - initial: []AccountInfo{}, 21 21 - addDid: "did:plc:abc123", 22 22 - addHandle: "alice.bsky.social", 23 23 - addSessionId: "session-1", 24 24 - wantErr: nil, 25 25 - wantLen: 1, 26 26 - wantSessionId: "session-1", 27 27 - }, 28 28 - { 29 29 - name: "add second account", 30 30 - initial: []AccountInfo{ 31 31 - {Did: "did:plc:abc123", Handle: "alice.bsky.social", SessionId: "session-1", AddedAt: 1000}, 32 32 - }, 33 33 - addDid: "did:plc:def456", 34 34 - addHandle: "bob.bsky.social", 35 35 - addSessionId: "session-2", 36 36 - wantErr: nil, 37 37 - wantLen: 2, 38 38 - wantSessionId: "session-2", 39 39 - }, 40 40 - { 41 41 - name: "update existing account session", 42 42 - initial: []AccountInfo{ 43 43 - {Did: "did:plc:abc123", Handle: "alice.bsky.social", SessionId: "old-session", AddedAt: 1000}, 44 44 - }, 45 45 - addDid: "did:plc:abc123", 46 46 - addHandle: "alice.bsky.social", 47 47 - addSessionId: "new-session", 48 48 - wantErr: nil, 49 49 - wantLen: 1, 50 50 - wantSessionId: "new-session", 51 51 - }, 52 52 - } 53 53 - 54 54 - for _, tt := range tests { 55 55 - t.Run(tt.name, func(t *testing.T) { 56 56 - registry := &AccountRegistry{Accounts: tt.initial} 57 57 - err := registry.AddAccount(tt.addDid, tt.addHandle, tt.addSessionId) 58 58 - 59 59 - if err != tt.wantErr { 60 60 - t.Errorf("AddAccount() error = %v, want %v", err, tt.wantErr) 61 61 - } 62 62 - 63 63 - if len(registry.Accounts) != tt.wantLen { 64 64 - t.Errorf("AddAccount() len = %d, want %d", len(registry.Accounts), tt.wantLen) 65 65 - } 66 66 - 67 67 - found := registry.FindAccount(tt.addDid) 68 68 - if found == nil { 69 69 - t.Errorf("AddAccount() account not found after add") 70 70 - return 71 71 - } 72 72 - 73 73 - if found.SessionId != tt.wantSessionId { 74 74 - t.Errorf("AddAccount() sessionId = %s, want %s", found.SessionId, tt.wantSessionId) 75 75 - } 76 76 - }) 77 77 - } 78 78 - } 79 79 - 80 80 - func TestAccountRegistry_AddAccount_MaxLimit(t *testing.T) { 81 81 - registry := &AccountRegistry{Accounts: make([]AccountInfo, 0, MaxAccounts)} 82 82 - 83 83 - for i := range MaxAccounts { 84 84 - err := registry.AddAccount("did:plc:user"+string(rune('a'+i)), "handle", "session") 85 85 - if err != nil { 86 86 - t.Fatalf("AddAccount() unexpected error on account %d: %v", i, err) 87 87 - } 88 88 - } 89 89 - 90 90 - if len(registry.Accounts) != MaxAccounts { 91 91 - t.Errorf("expected %d accounts, got %d", MaxAccounts, len(registry.Accounts)) 92 92 - } 93 93 - 94 94 - err := registry.AddAccount("did:plc:overflow", "overflow", "session-overflow") 95 95 - if err != ErrMaxAccountsReached { 96 96 - t.Errorf("AddAccount() error = %v, want %v", err, ErrMaxAccountsReached) 97 97 - } 98 98 - 99 99 - if len(registry.Accounts) != MaxAccounts { 100 100 - t.Errorf("account added despite max limit, got %d", len(registry.Accounts)) 101 101 - } 102 102 - } 103 103 - 104 104 - func TestAccountRegistry_RemoveAccount(t *testing.T) { 105 105 - tests := []struct { 106 106 - name string 107 107 - initial []AccountInfo 108 108 - removeDid string 109 109 - wantLen int 110 110 - wantDids []string 111 111 - }{ 112 112 - { 113 113 - name: "remove existing account", 114 114 - initial: []AccountInfo{ 115 115 - {Did: "did:plc:abc123", Handle: "alice", SessionId: "s1"}, 116 116 - {Did: "did:plc:def456", Handle: "bob", SessionId: "s2"}, 117 117 - }, 118 118 - removeDid: "did:plc:abc123", 119 119 - wantLen: 1, 120 120 - wantDids: []string{"did:plc:def456"}, 121 121 - }, 122 122 - { 123 123 - name: "remove non-existing account", 124 124 - initial: []AccountInfo{ 125 125 - {Did: "did:plc:abc123", Handle: "alice", SessionId: "s1"}, 126 126 - }, 127 127 - removeDid: "did:plc:notfound", 128 128 - wantLen: 1, 129 129 - wantDids: []string{"did:plc:abc123"}, 130 130 - }, 131 131 - { 132 132 - name: "remove last account", 133 133 - initial: []AccountInfo{ 134 134 - {Did: "did:plc:abc123", Handle: "alice", SessionId: "s1"}, 135 135 - }, 136 136 - removeDid: "did:plc:abc123", 137 137 - wantLen: 0, 138 138 - wantDids: []string{}, 139 139 - }, 140 140 - { 141 141 - name: "remove from empty registry", 142 142 - initial: []AccountInfo{}, 143 143 - removeDid: "did:plc:abc123", 144 144 - wantLen: 0, 145 145 - wantDids: []string{}, 146 146 - }, 147 147 - } 148 148 - 149 149 - for _, tt := range tests { 150 150 - t.Run(tt.name, func(t *testing.T) { 151 151 - registry := &AccountRegistry{Accounts: tt.initial} 152 152 - registry.RemoveAccount(tt.removeDid) 153 153 - 154 154 - if len(registry.Accounts) != tt.wantLen { 155 155 - t.Errorf("RemoveAccount() len = %d, want %d", len(registry.Accounts), tt.wantLen) 156 156 - } 157 157 - 158 158 - for _, wantDid := range tt.wantDids { 159 159 - if registry.FindAccount(wantDid) == nil { 160 160 - t.Errorf("RemoveAccount() expected %s to remain", wantDid) 161 161 - } 162 162 - } 163 163 - 164 164 - if registry.FindAccount(tt.removeDid) != nil && tt.wantLen < len(tt.initial) { 165 165 - t.Errorf("RemoveAccount() %s should have been removed", tt.removeDid) 166 166 - } 167 167 - }) 168 168 - } 169 169 - } 170 170 - 171 171 - func TestAccountRegistry_FindAccount(t *testing.T) { 172 172 - registry := &AccountRegistry{ 173 173 - Accounts: []AccountInfo{ 174 174 - {Did: "did:plc:first", Handle: "first", SessionId: "s1", AddedAt: 1000}, 175 175 - {Did: "did:plc:second", Handle: "second", SessionId: "s2", AddedAt: 2000}, 176 176 - {Did: "did:plc:third", Handle: "third", SessionId: "s3", AddedAt: 3000}, 177 177 - }, 178 178 - } 179 179 - 180 180 - t.Run("find existing account", func(t *testing.T) { 181 181 - found := registry.FindAccount("did:plc:second") 182 182 - if found == nil { 183 183 - t.Fatal("FindAccount() returned nil for existing account") 184 184 - } 185 185 - if found.Handle != "second" { 186 186 - t.Errorf("FindAccount() handle = %s, want second", found.Handle) 187 187 - } 188 188 - if found.SessionId != "s2" { 189 189 - t.Errorf("FindAccount() sessionId = %s, want s2", found.SessionId) 190 190 - } 191 191 - }) 192 192 - 193 193 - t.Run("find non-existing account", func(t *testing.T) { 194 194 - found := registry.FindAccount("did:plc:notfound") 195 195 - if found != nil { 196 196 - t.Errorf("FindAccount() = %v, want nil", found) 197 197 - } 198 198 - }) 199 199 - 200 200 - t.Run("returned pointer is mutable", func(t *testing.T) { 201 201 - found := registry.FindAccount("did:plc:first") 202 202 - if found == nil { 203 203 - t.Fatal("FindAccount() returned nil") 204 204 - } 205 205 - found.SessionId = "modified" 206 206 - 207 207 - refetch := registry.FindAccount("did:plc:first") 208 208 - if refetch.SessionId != "modified" { 209 209 - t.Errorf("FindAccount() pointer not referencing original, got %s", refetch.SessionId) 210 210 - } 211 211 - }) 212 212 - } 213 213 - 214 214 - func TestAccountRegistry_OtherAccounts(t *testing.T) { 215 215 - registry := &AccountRegistry{ 216 216 - Accounts: []AccountInfo{ 217 217 - {Did: "did:plc:active", Handle: "active", SessionId: "s1"}, 218 218 - {Did: "did:plc:other1", Handle: "other1", SessionId: "s2"}, 219 219 - {Did: "did:plc:other2", Handle: "other2", SessionId: "s3"}, 220 220 - }, 221 221 - } 222 222 - 223 223 - others := registry.OtherAccounts("did:plc:active") 224 224 - 225 225 - if len(others) != 2 { 226 226 - t.Errorf("OtherAccounts() len = %d, want 2", len(others)) 227 227 - } 228 228 - 229 229 - for _, acc := range others { 230 230 - if acc.Did == "did:plc:active" { 231 231 - t.Errorf("OtherAccounts() should not include active account") 232 232 - } 233 233 - } 234 234 - 235 235 - hasDid := func(did string) bool { 236 236 - for _, acc := range others { 237 237 - if acc.Did == did { 238 238 - return true 239 239 - } 240 240 - } 241 241 - return false 242 242 - } 243 243 - 244 244 - if !hasDid("did:plc:other1") || !hasDid("did:plc:other2") { 245 245 - t.Errorf("OtherAccounts() missing expected accounts") 246 246 - } 247 247 - } 248 248 - 249 249 - func TestMultiAccountUser_Did(t *testing.T) { 250 250 - t.Run("with active user", func(t *testing.T) { 251 251 - user := &MultiAccountUser{ 252 252 - Active: &User{Did: "did:plc:test", Pds: "https://bsky.social"}, 253 253 - } 254 254 - if user.Did() != "did:plc:test" { 255 255 - t.Errorf("Did() = %s, want did:plc:test", user.Did()) 256 256 - } 257 257 - }) 258 258 - 259 259 - t.Run("with nil active", func(t *testing.T) { 260 260 - user := &MultiAccountUser{Active: nil} 261 261 - if user.Did() != "" { 262 262 - t.Errorf("Did() = %s, want empty string", user.Did()) 263 263 - } 264 264 - }) 265 265 - }

-4

appview/oauth/consts.go

··· 2 2 3 3 const ( 4 4 SessionName = "appview-session-v2" 5 5 - AccountsName = "appview-accounts-v2" 6 6 - AuthReturnName = "appview-auth-return" 7 7 - AuthReturnURL = "return_url" 8 8 - AuthAddAccount = "add_account" 9 5 SessionHandle = "handle" 10 6 SessionDid = "did" 11 7 SessionId = "id"

+2 -14

appview/oauth/handler.go

··· 55 55 ctx := r.Context() 56 56 l := o.Logger.With("query", r.URL.Query()) 57 57 58 58 - authReturn := o.GetAuthReturn(r) 59 59 - _ = o.ClearAuthReturn(w, r) 60 60 - 61 58 sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query()) 62 59 if err != nil { 63 60 var callbackErr *oauth.AuthRequestCallbackError ··· 73 70 74 71 if err := o.SaveSession(w, r, sessData); err != nil { 75 72 l.Error("failed to save session", "data", sessData, "err", err) 76 76 - errorCode := "session" 77 77 - if errors.Is(err, ErrMaxAccountsReached) { 78 78 - errorCode = "max_accounts" 79 79 - } 80 80 - http.Redirect(w, r, fmt.Sprintf("/login?error=%s", errorCode), http.StatusFound) 73 73 + http.Redirect(w, r, "/login?error=session", http.StatusFound) 81 74 return 82 75 } 83 76 ··· 95 88 } 96 89 } 97 90 98 98 - redirectURL := "/" 99 99 - if authReturn.ReturnURL != "" { 100 100 - redirectURL = authReturn.ReturnURL 101 101 - } 102 102 - 103 103 - http.Redirect(w, r, redirectURL, http.StatusFound) 91 91 + http.Redirect(w, r, "/", http.StatusFound) 104 92 } 105 93 106 94 func (o *OAuth) addToDefaultSpindle(did string) {

+4 -66

appview/oauth/oauth.go

··· 98 98 } 99 99 100 100 func (o *OAuth) SaveSession(w http.ResponseWriter, r *http.Request, sessData *oauth.ClientSessionData) error { 101 101 + // first we save the did in the user session 101 102 userSession, err := o.SessStore.Get(r, SessionName) 102 103 if err != nil { 103 104 return err ··· 107 108 userSession.Values[SessionPds] = sessData.HostURL 108 109 userSession.Values[SessionId] = sessData.SessionID 109 110 userSession.Values[SessionAuthenticated] = true 110 110 - 111 111 - if err := userSession.Save(r, w); err != nil { 112 112 - return err 113 113 - } 114 114 - 115 115 - handle := "" 116 116 - resolved, err := o.IdResolver.ResolveIdent(r.Context(), sessData.AccountDID.String()) 117 117 - if err == nil && resolved.Handle.String() != "" { 118 118 - handle = resolved.Handle.String() 119 119 - } 120 120 - 121 121 - registry := o.GetAccounts(r) 122 122 - if err := registry.AddAccount(sessData.AccountDID.String(), handle, sessData.SessionID); err != nil { 123 123 - return err 124 124 - } 125 125 - return o.SaveAccounts(w, r, registry) 111 111 + return userSession.Save(r, w) 126 112 } 127 113 128 114 func (o *OAuth) ResumeSession(r *http.Request) (*oauth.ClientSession, error) { ··· 177 163 return errors.Join(err1, err2) 178 164 } 179 165 180 180 - func (o *OAuth) SwitchAccount(w http.ResponseWriter, r *http.Request, targetDid string) error { 181 181 - registry := o.GetAccounts(r) 182 182 - account := registry.FindAccount(targetDid) 183 183 - if account == nil { 184 184 - return fmt.Errorf("account not found in registry: %s", targetDid) 185 185 - } 186 186 - 187 187 - did, err := syntax.ParseDID(targetDid) 188 188 - if err != nil { 189 189 - return fmt.Errorf("invalid DID: %w", err) 190 190 - } 191 191 - 192 192 - sess, err := o.ClientApp.ResumeSession(r.Context(), did, account.SessionId) 193 193 - if err != nil { 194 194 - registry.RemoveAccount(targetDid) 195 195 - _ = o.SaveAccounts(w, r, registry) 196 196 - return fmt.Errorf("session expired for account: %w", err) 197 197 - } 198 198 - 199 199 - userSession, err := o.SessStore.Get(r, SessionName) 200 200 - if err != nil { 201 201 - return err 202 202 - } 203 203 - 204 204 - userSession.Values[SessionDid] = sess.Data.AccountDID.String() 205 205 - userSession.Values[SessionPds] = sess.Data.HostURL 206 206 - userSession.Values[SessionId] = sess.Data.SessionID 207 207 - userSession.Values[SessionAuthenticated] = true 208 208 - 209 209 - return userSession.Save(r, w) 210 210 - } 211 211 - 212 212 - func (o *OAuth) RemoveAccount(w http.ResponseWriter, r *http.Request, targetDid string) error { 213 213 - registry := o.GetAccounts(r) 214 214 - account := registry.FindAccount(targetDid) 215 215 - if account == nil { 216 216 - return nil 217 217 - } 218 218 - 219 219 - did, err := syntax.ParseDID(targetDid) 220 220 - if err == nil { 221 221 - _ = o.ClientApp.Logout(r.Context(), did, account.SessionId) 222 222 - } 223 223 - 224 224 - registry.RemoveAccount(targetDid) 225 225 - return o.SaveAccounts(w, r, registry) 226 226 - } 227 227 - 228 166 type User struct { 229 167 Did string 230 168 Pds string ··· 243 181 } 244 182 245 183 func (o *OAuth) GetDid(r *http.Request) string { 246 246 - if u := o.GetMultiAccountUser(r); u != nil { 247 247 - return u.Did() 184 184 + if u := o.GetUser(r); u != nil { 185 185 + return u.Did 248 186 } 249 187 250 188 return ""

+9 -30

appview/pages/funcmap.go

··· 26 26 "github.com/go-enry/go-enry/v2" 27 27 "github.com/yuin/goldmark" 28 28 emoji "github.com/yuin/goldmark-emoji" 29 29 + "tangled.org/core/appview/filetree" 29 30 "tangled.org/core/appview/models" 30 30 - "tangled.org/core/appview/oauth" 31 31 "tangled.org/core/appview/pages/markup" 32 32 "tangled.org/core/crypto" 33 33 ) ··· 334 334 }, 335 335 "deref": func(v any) any { 336 336 val := reflect.ValueOf(v) 337 337 - if val.Kind() == reflect.Pointer && !val.IsNil() { 337 337 + if val.Kind() == reflect.Ptr && !val.IsNil() { 338 338 return val.Elem().Interface() 339 339 } 340 340 return nil ··· 348 348 return template.HTML(data) 349 349 }, 350 350 "cssContentHash": p.CssContentHash, 351 351 + "fileTree": filetree.FileTree, 351 352 "pathEscape": func(s string) string { 352 353 return url.PathEscape(s) 353 354 }, ··· 365 366 return p.AvatarUrl(handle, "") 366 367 }, 367 368 "langColor": enry.GetColor, 368 368 - "reverse": func(s any) any { 369 369 - if s == nil { 370 370 - return nil 371 371 - } 372 372 - 373 373 - v := reflect.ValueOf(s) 374 374 - 375 375 - if v.Kind() != reflect.Slice { 376 376 - return s 377 377 - } 369 369 + "layoutSide": func() string { 370 370 + return "col-span-1 md:col-span-2 lg:col-span-3" 371 371 + }, 372 372 + "layoutCenter": func() string { 373 373 + return "col-span-1 md:col-span-8 lg:col-span-6" 374 374 + }, 378 375 379 379 - length := v.Len() 380 380 - reversed := reflect.MakeSlice(v.Type(), length, length) 381 381 - 382 382 - for i := range length { 383 383 - reversed.Index(i).Set(v.Index(length - 1 - i)) 384 384 - } 385 385 - 386 386 - return reversed.Interface() 387 387 - }, 388 376 "normalizeForHtmlId": func(s string) string { 389 377 normalized := strings.ReplaceAll(s, ":", "_") 390 378 normalized = strings.ReplaceAll(normalized, ".", "_") ··· 396 384 return "error" 397 385 } 398 386 return fp 399 399 - }, 400 400 - "otherAccounts": func(activeDid string, accounts []oauth.AccountInfo) []oauth.AccountInfo { 401 401 - result := make([]oauth.AccountInfo, 0, len(accounts)) 402 402 - for _, acc := range accounts { 403 403 - if acc.Did != activeDid { 404 404 - result = append(result, acc) 405 405 - } 406 406 - } 407 407 - return result 408 387 }, 409 388 } 410 389 }

+66 -72

appview/pages/pages.go

··· 226 226 } 227 227 228 228 type LoginParams struct { 229 229 - ReturnUrl string 230 230 - ErrorCode string 231 231 - AddAccount bool 232 232 - LoggedInUser *oauth.MultiAccountUser 229 229 + ReturnUrl string 230 230 + ErrorCode string 233 231 } 234 232 235 233 func (p *Pages) Login(w io.Writer, params LoginParams) error { ··· 249 247 } 250 248 251 249 type TermsOfServiceParams struct { 252 252 - LoggedInUser *oauth.MultiAccountUser 250 250 + LoggedInUser *oauth.User 253 251 Content template.HTML 254 252 } 255 253 ··· 277 275 } 278 276 279 277 type PrivacyPolicyParams struct { 280 280 - LoggedInUser *oauth.MultiAccountUser 278 278 + LoggedInUser *oauth.User 281 279 Content template.HTML 282 280 } 283 281 ··· 305 303 } 306 304 307 305 type BrandParams struct { 308 308 - LoggedInUser *oauth.MultiAccountUser 306 306 + LoggedInUser *oauth.User 309 307 } 310 308 311 309 func (p *Pages) Brand(w io.Writer, params BrandParams) error { ··· 313 311 } 314 312 315 313 type TimelineParams struct { 316 316 - LoggedInUser *oauth.MultiAccountUser 314 314 + LoggedInUser *oauth.User 317 315 Timeline []models.TimelineEvent 318 316 Repos []models.Repo 319 317 GfiLabel *models.LabelDefinition ··· 324 322 } 325 323 326 324 type GoodFirstIssuesParams struct { 327 327 - LoggedInUser *oauth.MultiAccountUser 325 325 + LoggedInUser *oauth.User 328 326 Issues []models.Issue 329 327 RepoGroups []*models.RepoGroup 330 328 LabelDefs map[string]*models.LabelDefinition ··· 337 335 } 338 336 339 337 type UserProfileSettingsParams struct { 340 340 - LoggedInUser *oauth.MultiAccountUser 338 338 + LoggedInUser *oauth.User 341 339 Tabs []map[string]any 342 340 Tab string 343 341 } ··· 347 345 } 348 346 349 347 type NotificationsParams struct { 350 350 - LoggedInUser *oauth.MultiAccountUser 348 348 + LoggedInUser *oauth.User 351 349 Notifications []*models.NotificationWithEntity 352 350 UnreadCount int 353 351 Page pagination.Page ··· 375 373 } 376 374 377 375 type UserKeysSettingsParams struct { 378 378 - LoggedInUser *oauth.MultiAccountUser 376 376 + LoggedInUser *oauth.User 379 377 PubKeys []models.PublicKey 380 378 Tabs []map[string]any 381 379 Tab string ··· 386 384 } 387 385 388 386 type UserEmailsSettingsParams struct { 389 389 - LoggedInUser *oauth.MultiAccountUser 387 387 + LoggedInUser *oauth.User 390 388 Emails []models.Email 391 389 Tabs []map[string]any 392 390 Tab string ··· 397 395 } 398 396 399 397 type UserNotificationSettingsParams struct { 400 400 - LoggedInUser *oauth.MultiAccountUser 398 398 + LoggedInUser *oauth.User 401 399 Preferences *models.NotificationPreferences 402 400 Tabs []map[string]any 403 401 Tab string ··· 417 415 } 418 416 419 417 type KnotsParams struct { 420 420 - LoggedInUser *oauth.MultiAccountUser 418 418 + LoggedInUser *oauth.User 421 419 Registrations []models.Registration 422 420 Tabs []map[string]any 423 421 Tab string ··· 428 426 } 429 427 430 428 type KnotParams struct { 431 431 - LoggedInUser *oauth.MultiAccountUser 429 429 + LoggedInUser *oauth.User 432 430 Registration *models.Registration 433 431 Members []string 434 432 Repos map[string][]models.Repo ··· 450 448 } 451 449 452 450 type SpindlesParams struct { 453 453 - LoggedInUser *oauth.MultiAccountUser 451 451 + LoggedInUser *oauth.User 454 452 Spindles []models.Spindle 455 453 Tabs []map[string]any 456 454 Tab string ··· 471 469 } 472 470 473 471 type SpindleDashboardParams struct { 474 474 - LoggedInUser *oauth.MultiAccountUser 472 472 + LoggedInUser *oauth.User 475 473 Spindle models.Spindle 476 474 Members []string 477 475 Repos map[string][]models.Repo ··· 484 482 } 485 483 486 484 type NewRepoParams struct { 487 487 - LoggedInUser *oauth.MultiAccountUser 485 485 + LoggedInUser *oauth.User 488 486 Knots []string 489 487 } 490 488 ··· 493 491 } 494 492 495 493 type ForkRepoParams struct { 496 496 - LoggedInUser *oauth.MultiAccountUser 494 494 + LoggedInUser *oauth.User 497 495 Knots []string 498 496 RepoInfo repoinfo.RepoInfo 499 497 } ··· 531 529 } 532 530 533 531 type ProfileOverviewParams struct { 534 534 - LoggedInUser *oauth.MultiAccountUser 532 532 + LoggedInUser *oauth.User 535 533 Repos []models.Repo 536 534 CollaboratingRepos []models.Repo 537 535 ProfileTimeline *models.ProfileTimeline ··· 545 543 } 546 544 547 545 type ProfileReposParams struct { 548 548 - LoggedInUser *oauth.MultiAccountUser 546 546 + LoggedInUser *oauth.User 549 547 Repos []models.Repo 550 548 Card *ProfileCard 551 549 Active string ··· 557 555 } 558 556 559 557 type ProfileStarredParams struct { 560 560 - LoggedInUser *oauth.MultiAccountUser 558 558 + LoggedInUser *oauth.User 561 559 Repos []models.Repo 562 560 Card *ProfileCard 563 561 Active string ··· 569 567 } 570 568 571 569 type ProfileStringsParams struct { 572 572 - LoggedInUser *oauth.MultiAccountUser 570 570 + LoggedInUser *oauth.User 573 571 Strings []models.String 574 572 Card *ProfileCard 575 573 Active string ··· 582 580 583 581 type FollowCard struct { 584 582 UserDid string 585 585 - LoggedInUser *oauth.MultiAccountUser 583 583 + LoggedInUser *oauth.User 586 584 FollowStatus models.FollowStatus 587 585 FollowersCount int64 588 586 FollowingCount int64 ··· 590 588 } 591 589 592 590 type ProfileFollowersParams struct { 593 593 - LoggedInUser *oauth.MultiAccountUser 591 591 + LoggedInUser *oauth.User 594 592 Followers []FollowCard 595 593 Card *ProfileCard 596 594 Active string ··· 602 600 } 603 601 604 602 type ProfileFollowingParams struct { 605 605 - LoggedInUser *oauth.MultiAccountUser 603 603 + LoggedInUser *oauth.User 606 604 Following []FollowCard 607 605 Card *ProfileCard 608 606 Active string ··· 624 622 } 625 623 626 624 type EditBioParams struct { 627 627 - LoggedInUser *oauth.MultiAccountUser 625 625 + LoggedInUser *oauth.User 628 626 Profile *models.Profile 629 627 } 630 628 ··· 633 631 } 634 632 635 633 type EditPinsParams struct { 636 636 - LoggedInUser *oauth.MultiAccountUser 634 634 + LoggedInUser *oauth.User 637 635 Profile *models.Profile 638 636 AllRepos []PinnedRepo 639 637 } ··· 660 658 } 661 659 662 660 type RepoIndexParams struct { 663 663 - LoggedInUser *oauth.MultiAccountUser 661 661 + LoggedInUser *oauth.User 664 662 RepoInfo repoinfo.RepoInfo 665 663 Active string 666 664 TagMap map[string][]string ··· 709 707 } 710 708 711 709 type RepoLogParams struct { 712 712 - LoggedInUser *oauth.MultiAccountUser 710 710 + LoggedInUser *oauth.User 713 711 RepoInfo repoinfo.RepoInfo 714 712 TagMap map[string][]string 715 713 Active string ··· 726 724 } 727 725 728 726 type RepoCommitParams struct { 729 729 - LoggedInUser *oauth.MultiAccountUser 727 727 + LoggedInUser *oauth.User 730 728 RepoInfo repoinfo.RepoInfo 731 729 Active string 732 730 EmailToDid map[string]string ··· 745 743 } 746 744 747 745 type RepoTreeParams struct { 748 748 - LoggedInUser *oauth.MultiAccountUser 746 746 + LoggedInUser *oauth.User 749 747 RepoInfo repoinfo.RepoInfo 750 748 Active string 751 749 BreadCrumbs [][]string ··· 800 798 } 801 799 802 800 type RepoBranchesParams struct { 803 803 - LoggedInUser *oauth.MultiAccountUser 801 801 + LoggedInUser *oauth.User 804 802 RepoInfo repoinfo.RepoInfo 805 803 Active string 806 804 types.RepoBranchesResponse ··· 812 810 } 813 811 814 812 type RepoTagsParams struct { 815 815 - LoggedInUser *oauth.MultiAccountUser 813 813 + LoggedInUser *oauth.User 816 814 RepoInfo repoinfo.RepoInfo 817 815 Active string 818 816 types.RepoTagsResponse ··· 826 824 } 827 825 828 826 type RepoArtifactParams struct { 829 829 - LoggedInUser *oauth.MultiAccountUser 827 827 + LoggedInUser *oauth.User 830 828 RepoInfo repoinfo.RepoInfo 831 829 Artifact models.Artifact 832 830 } ··· 836 834 } 837 835 838 836 type RepoBlobParams struct { 839 839 - LoggedInUser *oauth.MultiAccountUser 837 837 + LoggedInUser *oauth.User 840 838 RepoInfo repoinfo.RepoInfo 841 839 Active string 842 840 BreadCrumbs [][]string ··· 860 858 } 861 859 862 860 type RepoSettingsParams struct { 863 863 - LoggedInUser *oauth.MultiAccountUser 861 861 + LoggedInUser *oauth.User 864 862 RepoInfo repoinfo.RepoInfo 865 863 Collaborators []Collaborator 866 864 Active string ··· 879 877 } 880 878 881 879 type RepoGeneralSettingsParams struct { 882 882 - LoggedInUser *oauth.MultiAccountUser 880 880 + LoggedInUser *oauth.User 883 881 RepoInfo repoinfo.RepoInfo 884 882 Labels []models.LabelDefinition 885 883 DefaultLabels []models.LabelDefinition ··· 897 895 } 898 896 899 897 type RepoAccessSettingsParams struct { 900 900 - LoggedInUser *oauth.MultiAccountUser 898 898 + LoggedInUser *oauth.User 901 899 RepoInfo repoinfo.RepoInfo 902 900 Active string 903 901 Tabs []map[string]any ··· 911 909 } 912 910 913 911 type RepoPipelineSettingsParams struct { 914 914 - LoggedInUser *oauth.MultiAccountUser 912 912 + LoggedInUser *oauth.User 915 913 RepoInfo repoinfo.RepoInfo 916 914 Active string 917 915 Tabs []map[string]any ··· 927 925 } 928 926 929 927 type RepoIssuesParams struct { 930 930 - LoggedInUser *oauth.MultiAccountUser 928 928 + LoggedInUser *oauth.User 931 929 RepoInfo repoinfo.RepoInfo 932 930 Active string 933 931 Issues []models.Issue ··· 944 942 } 945 943 946 944 type RepoSingleIssueParams struct { 947 947 - LoggedInUser *oauth.MultiAccountUser 945 945 + LoggedInUser *oauth.User 948 946 RepoInfo repoinfo.RepoInfo 949 947 Active string 950 948 Issue *models.Issue ··· 963 961 } 964 962 965 963 type EditIssueParams struct { 966 966 - LoggedInUser *oauth.MultiAccountUser 964 964 + LoggedInUser *oauth.User 967 965 RepoInfo repoinfo.RepoInfo 968 966 Issue *models.Issue 969 967 Action string ··· 987 985 } 988 986 989 987 type RepoNewIssueParams struct { 990 990 - LoggedInUser *oauth.MultiAccountUser 988 988 + LoggedInUser *oauth.User 991 989 RepoInfo repoinfo.RepoInfo 992 990 Issue *models.Issue // existing issue if any -- passed when editing 993 991 Active string ··· 1001 999 } 1002 1000 1003 1001 type EditIssueCommentParams struct { 1004 1004 - LoggedInUser *oauth.MultiAccountUser 1002 1002 + LoggedInUser *oauth.User 1005 1003 RepoInfo repoinfo.RepoInfo 1006 1004 Issue *models.Issue 1007 1005 Comment *models.IssueComment ··· 1012 1010 } 1013 1011 1014 1012 type ReplyIssueCommentPlaceholderParams struct { 1015 1015 - LoggedInUser *oauth.MultiAccountUser 1013 1013 + LoggedInUser *oauth.User 1016 1014 RepoInfo repoinfo.RepoInfo 1017 1015 Issue *models.Issue 1018 1016 Comment *models.IssueComment ··· 1023 1021 } 1024 1022 1025 1023 type ReplyIssueCommentParams struct { 1026 1026 - LoggedInUser *oauth.MultiAccountUser 1024 1024 + LoggedInUser *oauth.User 1027 1025 RepoInfo repoinfo.RepoInfo 1028 1026 Issue *models.Issue 1029 1027 Comment *models.IssueComment ··· 1034 1032 } 1035 1033 1036 1034 type IssueCommentBodyParams struct { 1037 1037 - LoggedInUser *oauth.MultiAccountUser 1035 1035 + LoggedInUser *oauth.User 1038 1036 RepoInfo repoinfo.RepoInfo 1039 1037 Issue *models.Issue 1040 1038 Comment *models.IssueComment ··· 1045 1043 } 1046 1044 1047 1045 type RepoNewPullParams struct { 1048 1048 - LoggedInUser *oauth.MultiAccountUser 1046 1046 + LoggedInUser *oauth.User 1049 1047 RepoInfo repoinfo.RepoInfo 1050 1048 Branches []types.Branch 1051 1049 Strategy string ··· 1062 1060 } 1063 1061 1064 1062 type RepoPullsParams struct { 1065 1065 - LoggedInUser *oauth.MultiAccountUser 1063 1063 + LoggedInUser *oauth.User 1066 1064 RepoInfo repoinfo.RepoInfo 1067 1065 Pulls []*models.Pull 1068 1066 Active string ··· 1099 1097 } 1100 1098 1101 1099 type RepoSinglePullParams struct { 1102 1102 - LoggedInUser *oauth.MultiAccountUser 1100 1100 + LoggedInUser *oauth.User 1103 1101 RepoInfo repoinfo.RepoInfo 1104 1102 Active string 1105 1103 Pull *models.Pull ··· 1110 1108 MergeCheck types.MergeCheckResponse 1111 1109 ResubmitCheck ResubmitResult 1112 1110 Pipelines map[string]models.Pipeline 1113 1113 - Diff types.DiffRenderer 1114 1114 - DiffOpts types.DiffOpts 1115 1115 - ActiveRound int 1116 1116 - IsInterdiff bool 1117 1111 1118 1112 OrderedReactionKinds []models.ReactionKind 1119 1113 Reactions map[models.ReactionKind]models.ReactionDisplayData ··· 1128 1122 } 1129 1123 1130 1124 type RepoPullPatchParams struct { 1131 1131 - LoggedInUser *oauth.MultiAccountUser 1125 1125 + LoggedInUser *oauth.User 1132 1126 RepoInfo repoinfo.RepoInfo 1133 1127 Pull *models.Pull 1134 1128 Stack models.Stack ··· 1145 1139 } 1146 1140 1147 1141 type RepoPullInterdiffParams struct { 1148 1148 - LoggedInUser *oauth.MultiAccountUser 1142 1142 + LoggedInUser *oauth.User 1149 1143 RepoInfo repoinfo.RepoInfo 1150 1144 Pull *models.Pull 1151 1145 Round int ··· 1198 1192 } 1199 1193 1200 1194 type PullResubmitParams struct { 1201 1201 - LoggedInUser *oauth.MultiAccountUser 1195 1195 + LoggedInUser *oauth.User 1202 1196 RepoInfo repoinfo.RepoInfo 1203 1197 Pull *models.Pull 1204 1198 SubmissionId int ··· 1209 1203 } 1210 1204 1211 1205 type PullActionsParams struct { 1212 1212 - LoggedInUser *oauth.MultiAccountUser 1206 1206 + LoggedInUser *oauth.User 1213 1207 RepoInfo repoinfo.RepoInfo 1214 1208 Pull *models.Pull 1215 1209 RoundNumber int ··· 1224 1218 } 1225 1219 1226 1220 type PullNewCommentParams struct { 1227 1227 - LoggedInUser *oauth.MultiAccountUser 1221 1221 + LoggedInUser *oauth.User 1228 1222 RepoInfo repoinfo.RepoInfo 1229 1223 Pull *models.Pull 1230 1224 RoundNumber int ··· 1235 1229 } 1236 1230 1237 1231 type RepoCompareParams struct { 1238 1238 - LoggedInUser *oauth.MultiAccountUser 1232 1232 + LoggedInUser *oauth.User 1239 1233 RepoInfo repoinfo.RepoInfo 1240 1234 Forks []models.Repo 1241 1235 Branches []types.Branch ··· 1254 1248 } 1255 1249 1256 1250 type RepoCompareNewParams struct { 1257 1257 - LoggedInUser *oauth.MultiAccountUser 1251 1251 + LoggedInUser *oauth.User 1258 1252 RepoInfo repoinfo.RepoInfo 1259 1253 Forks []models.Repo 1260 1254 Branches []types.Branch ··· 1271 1265 } 1272 1266 1273 1267 type RepoCompareAllowPullParams struct { 1274 1274 - LoggedInUser *oauth.MultiAccountUser 1268 1268 + LoggedInUser *oauth.User 1275 1269 RepoInfo repoinfo.RepoInfo 1276 1270 Base string 1277 1271 Head string ··· 1291 1285 } 1292 1286 1293 1287 type LabelPanelParams struct { 1294 1294 - LoggedInUser *oauth.MultiAccountUser 1288 1288 + LoggedInUser *oauth.User 1295 1289 RepoInfo repoinfo.RepoInfo 1296 1290 Defs map[string]*models.LabelDefinition 1297 1291 Subject string ··· 1303 1297 } 1304 1298 1305 1299 type EditLabelPanelParams struct { 1306 1306 - LoggedInUser *oauth.MultiAccountUser 1300 1300 + LoggedInUser *oauth.User 1307 1301 RepoInfo repoinfo.RepoInfo 1308 1302 Defs map[string]*models.LabelDefinition 1309 1303 Subject string ··· 1315 1309 } 1316 1310 1317 1311 type PipelinesParams struct { 1318 1318 - LoggedInUser *oauth.MultiAccountUser 1312 1312 + LoggedInUser *oauth.User 1319 1313 RepoInfo repoinfo.RepoInfo 1320 1314 Pipelines []models.Pipeline 1321 1315 Active string ··· 1358 1352 } 1359 1353 1360 1354 type WorkflowParams struct { 1361 1361 - LoggedInUser *oauth.MultiAccountUser 1355 1355 + LoggedInUser *oauth.User 1362 1356 RepoInfo repoinfo.RepoInfo 1363 1357 Pipeline models.Pipeline 1364 1358 Workflow string ··· 1372 1366 } 1373 1367 1374 1368 type PutStringParams struct { 1375 1375 - LoggedInUser *oauth.MultiAccountUser 1369 1369 + LoggedInUser *oauth.User 1376 1370 Action string 1377 1371 1378 1372 // this is supplied in the case of editing an existing string ··· 1384 1378 } 1385 1379 1386 1380 type StringsDashboardParams struct { 1387 1387 - LoggedInUser *oauth.MultiAccountUser 1381 1381 + LoggedInUser *oauth.User 1388 1382 Card ProfileCard 1389 1383 Strings []models.String 1390 1384 } ··· 1394 1388 } 1395 1389 1396 1390 type StringTimelineParams struct { 1397 1397 - LoggedInUser *oauth.MultiAccountUser 1391 1391 + LoggedInUser *oauth.User 1398 1392 Strings []models.String 1399 1393 } 1400 1394 ··· 1403 1397 } 1404 1398 1405 1399 type SingleStringParams struct { 1406 1406 - LoggedInUser *oauth.MultiAccountUser 1400 1400 + LoggedInUser *oauth.User 1407 1401 ShowRendered bool 1408 1402 RenderToggle bool 1409 1403 RenderedContents template.HTML

+1 -1

appview/pages/templates/banner.html

··· 30 30 <div class="mx-6"> 31 31 These services may not be fully accessible until upgraded. 32 32 <a class="underline text-red-800 dark:text-red-200" 33 33 - href="https://docs.tangled.org/migrating-knots-and-spindles.html"> 33 33 + href="https://docs.tangled.org/migrating-knots-spindles.html#migrating-knots-spindles"> 34 34 Click to read the upgrade guide</a>. 35 35 </div> 36 36 </details>

+5 -7

appview/pages/templates/fragments/tinyAvatarList.html

··· 5 5 <div class="inline-flex items-center -space-x-3"> 6 6 {{ $c := "z-50 z-40 z-30 z-20 z-10" }} 7 7 {{ range $i, $p := $ps }} 8 8 - <a href="/{{ resolve . }}" title="{{ resolve . }}"> 9 9 - <img 10 10 - src="{{ tinyAvatar . }}" 11 11 - alt="" 12 12 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0 {{ $classes }}" 13 13 - /> 14 14 - </a> 8 8 + <img 9 9 + src="{{ tinyAvatar . }}" 10 10 + alt="" 11 11 + class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0 {{ $classes }}" 12 12 + /> 15 13 {{ end }} 16 14 17 15 {{ if gt (len $all) 5 }}

+17 -30

appview/pages/templates/labels/fragments/label.html

··· 2 2 {{ $d := .def }} 3 3 {{ $v := .val }} 4 4 {{ $withPrefix := .withPrefix }} 5 5 + <span class="w-fit flex items-center gap-2 font-normal normal-case rounded py-1 px-2 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 text-sm"> 6 6 + {{ template "repo/fragments/colorBall" (dict "color" $d.GetColor) }} 5 7 6 6 - {{ $lhs := printf "%s" $d.Name }} 7 7 - {{ $rhs := "" }} 8 8 - {{ $isDid := false }} 9 9 - {{ $resolvedVal := "" }} 8 8 + {{ $lhs := printf "%s" $d.Name }} 9 9 + {{ $rhs := "" }} 10 10 11 11 - {{ if not $d.ValueType.IsNull }} 12 12 - {{ $isDid = $d.ValueType.IsDidFormat }} 13 13 - {{ if $isDid }} 14 14 - {{ $resolvedVal = resolve $v }} 15 15 - {{ $v = $resolvedVal }} 16 16 - {{ end }} 11 11 + {{ if not $d.ValueType.IsNull }} 12 12 + {{ if $d.ValueType.IsDidFormat }} 13 13 + {{ $v = resolve $v }} 14 14 + {{ end }} 15 15 + 16 16 + {{ if not $withPrefix }} 17 17 + {{ $lhs = "" }} 18 18 + {{ else }} 19 19 + {{ $lhs = printf "%s/" $d.Name }} 20 20 + {{ end }} 17 21 18 18 - {{ if not $withPrefix }} 19 19 - {{ $lhs = "" }} 20 20 - {{ else }} 21 21 - {{ $lhs = printf "%s/" $d.Name }} 22 22 + {{ $rhs = printf "%s" $v }} 22 23 {{ end }} 23 24 24 24 - {{ $rhs = printf "%s" $v }} 25 25 - {{ end }} 26 26 - 27 27 - {{ $chipClasses := "w-fit flex items-center gap-2 font-normal normal-case rounded py-1 px-2 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 text-sm text-inherit" }} 28 28 - 29 29 - {{ if $isDid }} 30 30 - <a href="/{{ $resolvedVal }}" class="{{ $chipClasses }} no-underline hover:underline"> 31 31 - {{ template "repo/fragments/colorBall" (dict "color" $d.GetColor) }} 32 32 - {{ printf "%s%s" $lhs $rhs }} 33 33 - </a> 34 34 - {{ else }} 35 35 - <span class="{{ $chipClasses }}"> 36 36 - {{ template "repo/fragments/colorBall" (dict "color" $d.GetColor) }} 37 37 - {{ printf "%s%s" $lhs $rhs }} 38 38 - </span> 39 39 - {{ end }} 25 25 + {{ printf "%s%s" $lhs $rhs }} 26 26 + </span> 40 27 {{ end }} 41 28 42 29

+11 -49

appview/pages/templates/layouts/fragments/topbar.html

··· 45 45 {{ define "profileDropdown" }} 46 46 <details class="relative inline-block text-left nav-dropdown"> 47 47 <summary class="cursor-pointer list-none flex items-center gap-1"> 48 48 - {{ $user := .Active.Did }} 48 48 + {{ $user := .Did }} 49 49 <img 50 50 src="{{ tinyAvatar $user }}" 51 51 alt="" ··· 53 53 /> 54 54 <span class="hidden md:inline">{{ $user | resolve | truncateAt30 }}</span> 55 55 </summary> 56 56 - <div class="absolute right-0 mt-4 p-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg z-50" style="width: 14rem;"> 57 57 - {{ $active := .Active.Did }} 58 58 - 59 59 - <div class="pb-2 mb-2 border-b border-gray-200 dark:border-gray-700"> 60 60 - <div class="flex items-center gap-2"> 61 61 - <img src="{{ tinyAvatar $active }}" alt="" class="rounded-full h-8 w-8 flex-shrink-0 border border-gray-300 dark:border-gray-700" /> 62 62 - <div class="flex-1 overflow-hidden"> 63 63 - <p class="font-medium text-sm truncate">{{ $active | resolve }}</p> 64 64 - <p class="text-xs text-green-600 dark:text-green-400">active</p> 65 65 - </div> 66 66 - </div> 67 67 - </div> 68 68 - 69 69 - {{ $others := .Accounts | otherAccounts $active }} 70 70 - {{ if $others }} 71 71 - <div class="pb-2 mb-2 border-b border-gray-200 dark:border-gray-700"> 72 72 - <p class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-wide mb-1">Switch Account</p> 73 73 - {{ range $others }} 74 74 - <button 75 75 - type="button" 76 76 - hx-post="/account/switch" 77 77 - hx-vals='{"did": "{{ .Did }}"}' 78 78 - hx-swap="none" 79 79 - class="flex items-center gap-2 w-full py-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 text-left" 80 80 - > 81 81 - <img src="{{ tinyAvatar .Did }}" alt="" class="rounded-full h-6 w-6 flex-shrink-0 border border-gray-300 dark:border-gray-700" /> 82 82 - <span class="text-sm truncate flex-1">{{ .Did | resolve }}</span> 83 83 - </button> 84 84 - {{ end }} 85 85 - </div> 86 86 - {{ end }} 87 87 - 88 88 - <a href="/login?mode=add_account" class="flex items-center gap-2 py-1 text-sm"> 89 89 - {{ i "plus" "w-4 h-4 flex-shrink-0" }} 90 90 - <span>Add another account</span> 56 56 + <div class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"> 57 57 + <a href="/{{ $user }}">profile</a> 58 58 + <a href="/{{ $user }}?tab=repos">repositories</a> 59 59 + <a href="/{{ $user }}?tab=strings">strings</a> 60 60 + <a href="/settings">settings</a> 61 61 + <a href="#" 62 62 + hx-post="/logout" 63 63 + hx-swap="none" 64 64 + class="text-red-400 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 65 65 + logout 91 66 </a> 92 92 - 93 93 - <div class="pt-2 mt-2 border-t border-gray-200 dark:border-gray-700 space-y-1"> 94 94 - <a href="/{{ $active }}" class="block py-1 text-sm">profile</a> 95 95 - <a href="/{{ $active }}?tab=repos" class="block py-1 text-sm">repositories</a> 96 96 - <a href="/{{ $active }}?tab=strings" class="block py-1 text-sm">strings</a> 97 97 - <a href="/settings" class="block py-1 text-sm">settings</a> 98 98 - <a href="#" 99 99 - hx-post="/logout" 100 100 - hx-swap="none" 101 101 - class="block py-1 text-sm text-red-400 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 102 102 - logout 103 103 - </a> 104 104 - </div> 105 67 </div> 106 68 </details> 107 69

+1 -1

appview/pages/templates/layouts/repobase.html

··· 1 1 {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <section id="repo-header" class="mb-2 py-2 px-4 dark:text-white"> 4 4 + <section id="repo-header" class="mb-4 p-2 dark:text-white"> 5 5 <div class="text-lg flex flex-col sm:flex-row items-start gap-4 justify-between"> 6 6 <!-- left items --> 7 7 <div class="flex flex-col gap-2">

+18 -1

appview/pages/templates/repo/commit.html

··· 116 116 {{ block "content" . }}{{ end }} 117 117 {{ end }} 118 118 119 119 - {{ block "contentAfter" . }}{{ end }} 119 119 + {{ block "contentAfterLayout" . }} 120 120 + <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4"> 121 121 + <div class="flex flex-col gap-4 col-span-1 md:col-span-2"> 122 122 + {{ block "contentAfterLeft" . }} {{ end }} 123 123 + </div> 124 124 + <main class="col-span-1 md:col-span-10"> 125 125 + {{ block "contentAfter" . }}{{ end }} 126 126 + </main> 127 127 + </div> 128 128 + {{ end }} 120 129 </div> 121 130 {{ end }} 122 131 ··· 130 139 {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 131 140 {{end}} 132 141 142 142 + {{ define "contentAfterLeft" }} 143 143 + <div class="flex flex-col gap-4 col-span-1 md:col-span-2"> 144 144 + {{ template "repo/fragments/diffOpts" .DiffOpts }} 145 145 + </div> 146 146 + <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto"> 147 147 + {{ template "repo/fragments/diffChangedFiles" .Diff }} 148 148 + </div> 149 149 + {{end}}

+19 -1

appview/pages/templates/repo/compare/compare.html

··· 22 22 {{ block "content" . }}{{ end }} 23 23 {{ end }} 24 24 25 25 - {{ block "contentAfter" . }}{{ end }} 25 25 + {{ block "contentAfterLayout" . }} 26 26 + <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4"> 27 27 + <div class="flex flex-col gap-4 col-span-1 md:col-span-2"> 28 28 + {{ block "contentAfterLeft" . }} {{ end }} 29 29 + </div> 30 30 + <main class="col-span-1 md:col-span-10"> 31 31 + {{ block "contentAfter" . }}{{ end }} 32 32 + </main> 33 33 + </div> 34 34 + {{ end }} 26 35 </div> 27 36 {{ end }} 28 37 ··· 35 44 {{ define "contentAfter" }} 36 45 {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 37 46 {{end}} 47 47 + 48 48 + {{ define "contentAfterLeft" }} 49 49 + <div class="flex flex-col gap-4 col-span-1 md:col-span-2"> 50 50 + {{ template "repo/fragments/diffOpts" .DiffOpts }} 51 51 + </div> 52 52 + <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto"> 53 53 + {{ template "repo/fragments/diffChangedFiles" .Diff }} 54 54 + </div> 55 55 + {{end}}

+96 -81

appview/pages/templates/repo/fragments/cloneDropdown.html

··· 1 1 {{ define "repo/fragments/cloneDropdown" }} 2 2 - {{ $knot := .RepoInfo.Knot }} 3 3 - {{ if eq $knot "knot1.tangled.sh" }} 4 4 - {{ $knot = "tangled.org" }} 5 5 - {{ end }} 2 2 + {{ $knot := .RepoInfo.Knot }} 3 3 + {{ if eq $knot "knot1.tangled.sh" }} 4 4 + {{ $knot = "tangled.org" }} 5 5 + {{ end }} 6 6 + 7 7 + <details id="clone-dropdown" class="relative inline-block text-left group"> 8 8 + <summary class="btn-create cursor-pointer list-none flex items-center gap-2"> 9 9 + {{ i "download" "w-4 h-4" }} 10 10 + <span class="hidden md:inline">code</span> 11 11 + <span class="group-open:hidden"> 12 12 + {{ i "chevron-down" "w-4 h-4" }} 13 13 + </span> 14 14 + <span class="hidden group-open:flex"> 15 15 + {{ i "chevron-up" "w-4 h-4" }} 16 16 + </span> 17 17 + </summary> 18 18 + 19 19 + <div class="absolute right-0 mt-2 w-96 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 drop-shadow-sm dark:text-white z-[9999]"> 20 20 + <div class="p-4"> 21 21 + <div class="mb-3"> 22 22 + <h3 class="text-sm font-semibold text-gray-900 dark:text-white mb-2">Clone this repository</h3> 23 23 + </div> 24 24 + 25 25 + <!-- HTTPS Clone --> 26 26 + <div class="mb-3"> 27 27 + <label class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">HTTPS</label> 28 28 + <div class="flex items-center border border-gray-300 dark:border-gray-600 rounded"> 29 29 + <code 30 30 + class="flex-1 px-3 py-2 text-sm bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-gray-100 rounded-l select-all cursor-pointer whitespace-nowrap overflow-x-auto" 31 31 + onclick="window.getSelection().selectAllChildren(this)" 32 32 + data-url="https://tangled.org/{{ resolve .RepoInfo.OwnerDid }}/{{ .RepoInfo.Name }}" 33 33 + >https://tangled.org/{{ resolve .RepoInfo.OwnerDid }}/{{ .RepoInfo.Name }}</code> 34 34 + <button 35 35 + onclick="copyToClipboard(this, this.previousElementSibling.getAttribute('data-url'))" 36 36 + class="px-3 py-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 border-l border-gray-300 dark:border-gray-600" 37 37 + title="Copy to clipboard" 38 38 + > 39 39 + {{ i "copy" "w-4 h-4" }} 40 40 + </button> 41 41 + </div> 42 42 + </div> 6 43 7 7 - <button 8 8 - popovertarget="clone-dropdown" 9 9 - popovertargetaction="toggle" 10 10 - class="btn-create cursor-pointer list-none flex items-center gap-2 px-4"> 11 11 - {{ i "download" "w-4 h-4" }} 12 12 - <span class="hidden md:inline">code</span> 13 13 - </button> 14 14 - <div 15 15 - popover 16 16 - id="clone-dropdown" 17 17 - class=" 18 18 - bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 19 19 - dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50 20 20 - w-96 p-4 rounded drop-shadow overflow-visible"> 21 21 - <h3 class="text-sm font-semibold text-gray-900 dark:text-white mb-5">Clone this repository</h3> 44 44 + <!-- SSH Clone --> 45 45 + <div class="mb-3"> 46 46 + {{ $repoOwnerHandle := resolve .RepoInfo.OwnerDid }} 47 47 + <label class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">SSH</label> 48 48 + <div class="flex items-center border border-gray-300 dark:border-gray-600 rounded"> 49 49 + <code 50 50 + class="flex-1 px-3 py-2 text-sm bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-gray-100 rounded-l select-all cursor-pointer whitespace-nowrap overflow-x-auto" 51 51 + onclick="window.getSelection().selectAllChildren(this)" 52 52 + data-url="git@{{ $knot | stripPort }}:{{ $repoOwnerHandle }}/{{ .RepoInfo.Name }}" 53 53 + >git@{{ $knot | stripPort }}:{{ $repoOwnerHandle }}/{{ .RepoInfo.Name }}</code> 54 54 + <button 55 55 + onclick="copyToClipboard(this, this.previousElementSibling.getAttribute('data-url'))" 56 56 + class="px-3 py-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 border-l border-gray-300 dark:border-gray-600" 57 57 + title="Copy to clipboard" 58 58 + > 59 59 + {{ i "copy" "w-4 h-4" }} 60 60 + </button> 61 61 + </div> 62 62 + </div> 22 63 23 23 - <!-- HTTPS Clone --> 24 24 - <div class="mb-3"> 25 25 - <label class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">HTTPS</label> 26 26 - <div class="flex items-center border border-gray-300 dark:border-gray-600 rounded"> 27 27 - <code 28 28 - class="flex-1 px-3 py-2 text-sm bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-gray-100 rounded-l select-all cursor-pointer whitespace-nowrap overflow-x-auto" 29 29 - onclick="window.getSelection().selectAllChildren(this)" 30 30 - data-url="https://tangled.org/{{ resolve .RepoInfo.OwnerDid }}/{{ .RepoInfo.Name }}" 31 31 - >https://tangled.org/{{ resolve .RepoInfo.OwnerDid }}/{{ .RepoInfo.Name }}</code> 32 32 - <button 33 33 - onclick="copyToClipboard(this, this.previousElementSibling.getAttribute('data-url'))" 34 34 - class="px-3 py-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 border-l border-gray-300 dark:border-gray-600" 35 35 - title="Copy to clipboard" 36 36 - > 37 37 - {{ i "copy" "w-4 h-4" }} 38 38 - </button> 39 39 - </div> 40 40 - </div> 64 64 + <!-- Note for self-hosted --> 65 65 + <p class="text-xs text-gray-500 dark:text-gray-400"> 66 66 + For self-hosted knots, clone URLs may differ based on your setup. 67 67 + </p> 41 68 42 42 - <!-- SSH Clone --> 43 43 - <div class="mb-3"> 44 44 - {{ $repoOwnerHandle := resolve .RepoInfo.OwnerDid }} 45 45 - <label class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-1">SSH</label> 46 46 - <div class="flex items-center border border-gray-300 dark:border-gray-600 rounded"> 47 47 - <code 48 48 - class="flex-1 px-3 py-2 text-sm bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-gray-100 rounded-l select-all cursor-pointer whitespace-nowrap overflow-x-auto" 49 49 - onclick="window.getSelection().selectAllChildren(this)" 50 50 - data-url="git@{{ $knot | stripPort }}:{{ $repoOwnerHandle }}/{{ .RepoInfo.Name }}" 51 51 - >git@{{ $knot | stripPort }}:{{ $repoOwnerHandle }}/{{ .RepoInfo.Name }}</code> 52 52 - <button 53 53 - onclick="copyToClipboard(this, this.previousElementSibling.getAttribute('data-url'))" 54 54 - class="px-3 py-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 border-l border-gray-300 dark:border-gray-600" 55 55 - title="Copy to clipboard" 56 56 - > 57 57 - {{ i "copy" "w-4 h-4" }} 58 58 - </button> 59 59 - </div> 60 60 - </div> 69 69 + <!-- Download Archive --> 70 70 + <div class="pt-2 mt-2 border-t border-gray-200 dark:border-gray-700"> 71 71 + <a 72 72 + href="/{{ .RepoInfo.FullName }}/archive/{{ .Ref | urlquery }}" 73 73 + class="flex items-center gap-2 px-3 py-2 text-sm" 74 74 + > 75 75 + {{ i "download" "w-4 h-4" }} 76 76 + Download tar.gz 77 77 + </a> 78 78 + </div> 61 79 62 62 - <!-- Note for self-hosted --> 63 63 - <p class="text-xs text-gray-500 dark:text-gray-400"> 64 64 - For self-hosted knots, clone URLs may differ based on your setup. 65 65 - </p> 80 80 + </div> 81 81 + </div> 82 82 + </details> 66 83 67 67 - <!-- Download Archive --> 68 68 - <div class="pt-2 mt-2 border-t border-gray-200 dark:border-gray-700"> 69 69 - <a 70 70 - href="/{{ .RepoInfo.FullName }}/archive/{{ .Ref | urlquery }}" 71 71 - class="flex items-center gap-2 px-3 py-2 text-sm" 72 72 - > 73 73 - {{ i "download" "w-4 h-4" }} 74 74 - Download tar.gz 75 75 - </a> 76 76 - </div> 77 77 - </div> 84 84 + <script> 85 85 + function copyToClipboard(button, text) { 86 86 + navigator.clipboard.writeText(text).then(() => { 87 87 + const originalContent = button.innerHTML; 88 88 + button.innerHTML = `{{ i "check" "w-4 h-4" }}`; 89 89 + setTimeout(() => { 90 90 + button.innerHTML = originalContent; 91 91 + }, 2000); 92 92 + }); 93 93 + } 78 94 79 79 - <script> 80 80 - function copyToClipboard(button, text) { 81 81 - navigator.clipboard.writeText(text).then(() => { 82 82 - const originalContent = button.innerHTML; 83 83 - button.innerHTML = `{{ i "check" "w-4 h-4" }}`; 84 84 - setTimeout(() => { 85 85 - button.innerHTML = originalContent; 86 86 - }, 2000); 95 95 + // Close clone dropdown when clicking outside 96 96 + document.addEventListener('click', function(event) { 97 97 + const cloneDropdown = document.getElementById('clone-dropdown'); 98 98 + if (cloneDropdown && cloneDropdown.hasAttribute('open')) { 99 99 + if (!cloneDropdown.contains(event.target)) { 100 100 + cloneDropdown.removeAttribute('open'); 101 101 + } 102 102 + } 87 103 }); 88 88 - } 89 89 - </script> 104 104 + </script> 90 105 {{ end }}

+43 -200

appview/pages/templates/repo/fragments/diff.html

··· 1 1 {{ define "repo/fragments/diff" }} 2 2 - <style> 3 3 - #filesToggle:checked ~ div label[for="filesToggle"] .show-text { display: none; } 4 4 - #filesToggle:checked ~ div label[for="filesToggle"] .hide-text { display: inline; } 5 5 - #filesToggle:not(:checked) ~ div label[for="filesToggle"] .hide-text { display: none; } 6 6 - #filesToggle:checked ~ div div#files { width: fit-content; max-width: 15vw; margin-right: 1rem; } 7 7 - #filesToggle:not(:checked) ~ div div#files { width: 0; display: none; margin-right: 0; } 8 8 - </style> 9 9 - 10 10 - {{ template "diffTopbar" . }} 11 11 - {{ block "diffLayout" . }} {{ end }} 12 12 - {{ end }} 13 13 - 14 14 - {{ define "diffTopbar" }} 15 2 {{ $diff := index . 0 }} 16 3 {{ $opts := index . 1 }} 17 17 - {{ $root := "" }} 18 18 - {{ if gt (len .) 2 }} 19 19 - {{ $root = index . 2 }} 20 20 - {{ end }} 21 21 - 22 22 - {{ block "filesCheckbox" $ }} {{ end }} 23 23 - {{ block "subsCheckbox" $ }} {{ end }} 24 24 - 25 25 - <!-- top bar --> 26 26 - <div class="sticky top-0 z-30 flex items-center gap-2 col-span-full h-12 p-2 {{ if $root }}mt-4{{ end }}"> 27 27 - <!-- left panel toggle --> 28 28 - {{ template "filesToggle" . }} 29 29 - 30 30 - <!-- stats --> 31 31 - {{ $stat := $diff.Stats }} 32 32 - {{ $count := len $diff.ChangedFiles }} 33 33 - {{ template "repo/fragments/diffStatPill" $stat }} 34 34 - <span class="text-xs text-gray-600 dark:text-gray-400">{{ $count }} changed file{{ if ne $count 1 }}s{{ end }}</span> 35 35 - 36 36 - {{ if $root }} 37 37 - {{ if $root.IsInterdiff }} 38 38 - <!-- interdiff indicator --> 39 39 - <div class="flex items-center gap-2 before:content-['|'] before:text-gray-300 dark:before:text-gray-600 before:mr-2"> 40 40 - <span class="text-xs text-gray-600 dark:text-gray-400 uppercase tracking-wide">Interdiff</span> 41 41 - <a 42 42 - href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ sub $root.ActiveRound 1 }}" 43 43 - class="px-2 py-0.5 bg-white dark:bg-gray-700 rounded font-mono text-xs hover:bg-gray-50 dark:hover:bg-gray-600 border border-gray-300 dark:border-gray-600" 44 44 - > 45 45 - #{{ sub $root.ActiveRound 1 }} 46 46 - </a> 47 47 - <span class="text-gray-400 text-xs">→</span> 48 48 - <a 49 49 - href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $root.ActiveRound }}" 50 50 - class="px-2 py-0.5 bg-white dark:bg-gray-700 rounded font-mono text-xs hover:bg-gray-50 dark:hover:bg-gray-600 border border-gray-300 dark:border-gray-600" 51 51 - > 52 52 - #{{ $root.ActiveRound }} 53 53 - </a> 54 54 - </div> 55 55 - {{ else if ne $root.ActiveRound nil }} 56 56 - <!-- diff round indicator --> 57 57 - <div class="flex items-center gap-2 before:content-['|'] before:text-gray-300 dark:before:text-gray-600 before:mr-2"> 58 58 - <span class="text-xs text-gray-600 dark:text-gray-400 uppercase tracking-wide">Diff</span> 59 59 - <span class="px-2 py-0.5 bg-white dark:bg-gray-700 rounded font-mono text-xs border border-gray-300 dark:border-gray-600"> 60 60 - <span class="hidden md:inline">round </span>#{{ $root.ActiveRound }} 61 61 - </span> 62 62 - </div> 63 63 - {{ end }} 64 64 - {{ end }} 65 4 66 66 - <!-- spacer --> 67 67 - <div class="flex-grow"></div> 68 68 - 69 69 - <!-- collapse diffs --> 70 70 - {{ template "collapseToggle" }} 71 71 - 72 72 - <!-- diff options --> 73 73 - <div class="hidden md:block"> 74 74 - {{ template "repo/fragments/diffOpts" $opts }} 75 75 - </div> 5 5 + {{ $commit := $diff.Commit }} 6 6 + {{ $diff := $diff.Diff }} 7 7 + {{ $isSplit := $opts.Split }} 8 8 + {{ $this := $commit.This }} 9 9 + {{ $parent := $commit.Parent }} 10 10 + {{ $last := sub (len $diff) 1 }} 76 11 77 77 - <!-- right panel toggle --> 78 78 - {{ block "subsToggle" $ }} {{ end }} 79 79 - </div> 80 80 - 81 81 - {{ end }} 82 82 - 83 83 - {{ define "diffLayout" }} 84 84 - {{ $diff := index . 0 }} 85 85 - {{ $opts := index . 1 }} 86 86 - 87 87 - <div class="flex col-span-full flex-grow"> 88 88 - <!-- left panel --> 89 89 - <div id="files" class="w-0 hidden md:block overflow-hidden sticky top-12 max-h-screen overflow-y-auto pb-12"> 90 90 - <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 91 91 - {{ template "repo/fragments/fileTree" $diff.FileTree }} 92 92 - </section> 93 93 - </div> 94 94 - 95 95 - <!-- main content --> 96 96 - <div class="flex-1 min-w-0 sticky top-12 pb-12"> 97 97 - {{ template "diffFiles" (list $diff $opts) }} 98 98 - </div> 99 99 - 100 100 - </div> 101 101 - {{ end }} 102 102 - 103 103 - {{ define "diffFiles" }} 104 104 - {{ $diff := index . 0 }} 105 105 - {{ $opts := index . 1 }} 106 106 - {{ $files := $diff.ChangedFiles }} 107 107 - {{ $isSplit := $opts.Split }} 108 12 <div class="flex flex-col gap-4"> 109 109 - {{ if eq (len $files) 0 }} 13 13 + {{ if eq (len $diff) 0 }} 110 14 <div class="text-center text-gray-500 dark:text-gray-400 py-8"> 111 15 <p>No differences found between the selected revisions.</p> 112 16 </div> 113 17 {{ else }} 114 114 - {{ range $idx, $file := $files }} 115 115 - {{ template "diffFile" (list $idx $file $isSplit) }} 116 116 - {{ end }} 117 117 - {{ end }} 118 118 - </div> 119 119 - {{ end }} 18 18 + {{ range $idx, $hunk := $diff }} 19 19 + {{ with $hunk }} 20 20 + <details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 21 21 + <summary class="list-none cursor-pointer sticky top-0"> 22 22 + <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 23 23 + <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto"> 24 24 + <span class="group-open:hidden inline">{{ i "chevron-right" "w-4 h-4" }}</span> 25 25 + <span class="hidden group-open:inline">{{ i "chevron-down" "w-4 h-4" }}</span> 26 26 + {{ template "repo/fragments/diffStatPill" .Stats }} 120 27 121 121 - {{ define "diffFile" }} 122 122 - {{ $idx := index . 0 }} 123 123 - {{ $file := index . 1 }} 124 124 - {{ $isSplit := index . 2 }} 125 125 - {{ with $file }} 126 126 - <details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 127 127 - <summary class="list-none cursor-pointer sticky top-12 group-open:border-b border-gray-200 dark:border-gray-700"> 128 128 - <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 129 129 - <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto"> 130 130 - <span class="group-open:hidden inline">{{ i "chevron-right" "w-4 h-4" }}</span> 131 131 - <span class="hidden group-open:inline">{{ i "chevron-down" "w-4 h-4" }}</span> 132 132 - {{ template "repo/fragments/diffStatPill" .Stats }} 28 28 + <div class="flex gap-2 items-center overflow-x-auto"> 29 29 + {{ if .IsDelete }} 30 30 + {{ .Name.Old }} 31 31 + {{ else if (or .IsCopy .IsRename) }} 32 32 + {{ .Name.Old }} {{ i "arrow-right" "w-4 h-4" }} {{ .Name.New }} 33 33 + {{ else }} 34 34 + {{ .Name.New }} 35 35 + {{ end }} 36 36 + </div> 37 37 + </div> 38 38 + </div> 39 39 + </summary> 133 40 134 134 - <div class="flex gap-2 items-center overflow-x-auto"> 135 135 - {{ $n := .Names }} 136 136 - {{ if and $n.New $n.Old (ne $n.New $n.Old)}} 137 137 - {{ $n.Old }} {{ i "arrow-right" "w-4 h-4" }} {{ $n.New }} 138 138 - {{ else if $n.New }} 139 139 - {{ $n.New }} 41 41 + <div class="transition-all duration-700 ease-in-out"> 42 42 + {{ if .IsBinary }} 43 43 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 44 44 + This is a binary file and will not be displayed. 45 45 + </p> 46 46 + {{ else }} 47 47 + {{ if $isSplit }} 48 48 + {{- template "repo/fragments/splitDiff" .Split -}} 140 49 {{ else }} 141 141 - {{ $n.Old }} 50 50 + {{- template "repo/fragments/unifiedDiff" . -}} 142 51 {{ end }} 143 143 - </div> 52 52 + {{- end -}} 144 53 </div> 145 145 - </div> 146 146 - </summary> 147 147 - 148 148 - <div class="transition-all duration-700 ease-in-out"> 149 149 - {{ $reason := .CanRender }} 150 150 - {{ if $reason }} 151 151 - <p class="text-center text-gray-400 dark:text-gray-500 p-4">{{ $reason }}</p> 152 152 - {{ else }} 153 153 - {{ if $isSplit }} 154 154 - {{- template "repo/fragments/splitDiff" .Split -}} 155 155 - {{ else }} 156 156 - {{- template "repo/fragments/unifiedDiff" . -}} 157 157 - {{ end }} 158 158 - {{- end -}} 159 159 - </div> 160 160 - </details> 161 161 - {{ end }} 162 162 - {{ end }} 163 163 - 164 164 - {{ define "filesCheckbox" }} 165 165 - <input type="checkbox" id="filesToggle" class="peer/files hidden" checked/> 166 166 - {{ end }} 167 167 - 168 168 - {{ define "filesToggle" }} 169 169 - <label title="Toggle filetree panel" for="filesToggle" class="hidden md:inline-flex items-center justify-center rounded cursor-pointer text-normal font-normal normalcase"> 170 170 - <span class="show-text">{{ i "panel-left-open" "size-4" }}</span> 171 171 - <span class="hide-text">{{ i "panel-left-close" "size-4" }}</span> 172 172 - </label> 173 173 - {{ end }} 174 174 - 175 175 - {{ define "collapseToggle" }} 176 176 - <label 177 177 - title="Expand/Collapse diffs" 178 178 - for="collapseToggle" 179 179 - class="btn font-normal normal-case p-2" 180 180 - > 181 181 - <input type="checkbox" id="collapseToggle" class="peer/collapse hidden" checked/> 182 182 - <span class="peer-checked/collapse:hidden inline-flex items-center gap-2"> 183 183 - {{ i "fold-vertical" "w-4 h-4" }} 184 184 - <span class="hidden md:inline">expand all</span> 185 185 - </span> 186 186 - <span class="peer-checked/collapse:inline-flex hidden flex items-center gap-2"> 187 187 - {{ i "unfold-vertical" "w-4 h-4" }} 188 188 - <span class="hidden md:inline">collapse all</span> 189 189 - </span> 190 190 - </label> 191 191 - <script> 192 192 - document.addEventListener('DOMContentLoaded', function() { 193 193 - const checkbox = document.getElementById('collapseToggle'); 194 194 - const details = document.querySelectorAll('details[id^="file-"]'); 195 195 - 196 196 - checkbox.addEventListener('change', function() { 197 197 - details.forEach(detail => { 198 198 - detail.open = checkbox.checked; 199 199 - }); 200 200 - }); 201 201 - 202 202 - details.forEach(detail => { 203 203 - detail.addEventListener('toggle', function() { 204 204 - const allOpen = Array.from(details).every(d => d.open); 205 205 - const allClosed = Array.from(details).every(d => !d.open); 206 206 - 207 207 - if (allOpen) { 208 208 - checkbox.checked = true; 209 209 - } else if (allClosed) { 210 210 - checkbox.checked = false; 211 211 - } 212 212 - }); 213 213 - }); 214 214 - }); 215 215 - </script> 54 54 + </details> 55 55 + {{ end }} 56 56 + {{ end }} 57 57 + {{ end }} 58 58 + </div> 216 59 {{ end }}

+13

appview/pages/templates/repo/fragments/diffChangedFiles.html

··· 1 1 + {{ define "repo/fragments/diffChangedFiles" }} 2 2 + {{ $stat := .Stat }} 3 3 + {{ $fileTree := fileTree .ChangedFiles }} 4 4 + <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 5 5 + <div class="diff-stat"> 6 6 + <div class="flex gap-2 items-center"> 7 7 + <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong> 8 8 + {{ template "repo/fragments/diffStatPill" $stat }} 9 9 + </div> 10 10 + {{ template "repo/fragments/fileTree" $fileTree }} 11 11 + </div> 12 12 + </section> 13 13 + {{ end }}

+25 -22

appview/pages/templates/repo/fragments/diffOpts.html

··· 1 1 {{ define "repo/fragments/diffOpts" }} 2 2 - {{ $active := "unified" }} 3 3 - {{ if .Split }} 4 4 - {{ $active = "split" }} 5 5 - {{ end }} 2 2 + <section class="flex flex-col gap-2 overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 3 3 + <strong class="text-sm uppercase dark:text-gray-200">options</strong> 4 4 + {{ $active := "unified" }} 5 5 + {{ if .Split }} 6 6 + {{ $active = "split" }} 7 7 + {{ end }} 6 8 7 7 - {{ $unified := 8 8 - (dict 9 9 - "Key" "unified" 10 10 - "Value" "unified" 11 11 - "Icon" "square-split-vertical" 12 12 - "Meta" "") }} 13 13 - {{ $split := 14 14 - (dict 15 15 - "Key" "split" 16 16 - "Value" "split" 17 17 - "Icon" "square-split-horizontal" 18 18 - "Meta" "") }} 19 19 - {{ $values := list $unified $split }} 9 9 + {{ $unified := 10 10 + (dict 11 11 + "Key" "unified" 12 12 + "Value" "unified" 13 13 + "Icon" "square-split-vertical" 14 14 + "Meta" "") }} 15 15 + {{ $split := 16 16 + (dict 17 17 + "Key" "split" 18 18 + "Value" "split" 19 19 + "Icon" "square-split-horizontal" 20 20 + "Meta" "") }} 21 21 + {{ $values := list $unified $split }} 20 22 21 21 - {{ template "fragments/tabSelector" 22 22 - (dict 23 23 - "Name" "diff" 24 24 - "Values" $values 25 25 - "Active" $active) }} 23 23 + {{ template "fragments/tabSelector" 24 24 + (dict 25 25 + "Name" "diff" 26 26 + "Values" $values 27 27 + "Active" $active) }} 28 28 + </section> 26 29 {{ end }} 27 30

+67

appview/pages/templates/repo/fragments/interdiff.html

··· 1 1 + {{ define "repo/fragments/interdiff" }} 2 2 + {{ $repo := index . 0 }} 3 3 + {{ $x := index . 1 }} 4 4 + {{ $opts := index . 2 }} 5 5 + {{ $fileTree := fileTree $x.AffectedFiles }} 6 6 + {{ $diff := $x.Files }} 7 7 + {{ $last := sub (len $diff) 1 }} 8 8 + {{ $isSplit := $opts.Split }} 9 9 + 10 10 + <div class="flex flex-col gap-4"> 11 11 + {{ range $idx, $hunk := $diff }} 12 12 + {{ with $hunk }} 13 13 + <details {{ if not (.Status.IsOnlyInOne) }}open{{end}} id="file-{{ .Name }}" class="border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 14 14 + <summary class="list-none cursor-pointer sticky top-0"> 15 15 + <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 16 16 + <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto"> 17 17 + <div class="flex gap-1 items-center" style="direction: ltr;"> 18 18 + {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }} 19 19 + {{ if .Status.IsOk }} 20 20 + <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">CHANGED</span> 21 21 + {{ else if .Status.IsUnchanged }} 22 22 + <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">UNCHANGED</span> 23 23 + {{ else if .Status.IsOnlyInOne }} 24 24 + <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">REVERTED</span> 25 25 + {{ else if .Status.IsOnlyInTwo }} 26 26 + <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">NEW</span> 27 27 + {{ else if .Status.IsRebased }} 28 28 + <span class="bg-amber-100 text-amber-700 dark:bg-amber-800/50 dark:text-amber-400 {{ $markerstyle }}">REBASED</span> 29 29 + {{ else }} 30 30 + <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">ERROR</span> 31 31 + {{ end }} 32 32 + </div> 33 33 + 34 34 + <div class="flex gap-2 items-center overflow-x-auto" style="direction: rtl;">{{ .Name }}</div> 35 35 + </div> 36 36 + 37 37 + </div> 38 38 + </summary> 39 39 + 40 40 + <div class="transition-all duration-700 ease-in-out"> 41 41 + {{ if .Status.IsUnchanged }} 42 42 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 43 43 + This file has not been changed. 44 44 + </p> 45 45 + {{ else if .Status.IsRebased }} 46 46 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 47 47 + This patch was likely rebased, as context lines do not match. 48 48 + </p> 49 49 + {{ else if .Status.IsError }} 50 50 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 51 51 + Failed to calculate interdiff for this file. 52 52 + </p> 53 53 + {{ else }} 54 54 + {{ if $isSplit }} 55 55 + {{- template "repo/fragments/splitDiff" .Split -}} 56 56 + {{ else }} 57 57 + {{- template "repo/fragments/unifiedDiff" . -}} 58 58 + {{ end }} 59 59 + {{- end -}} 60 60 + </div> 61 61 + 62 62 + </details> 63 63 + {{ end }} 64 64 + {{ end }} 65 65 + </div> 66 66 + {{ end }} 67 67 +

+11

appview/pages/templates/repo/fragments/interdiffFiles.html

··· 1 1 + {{ define "repo/fragments/interdiffFiles" }} 2 2 + {{ $fileTree := fileTree .AffectedFiles }} 3 3 + <section class="px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm min-h-full text-sm"> 4 4 + <div class="diff-stat"> 5 5 + <div class="flex gap-2 items-center"> 6 6 + <strong class="text-sm uppercase dark:text-gray-200">files</strong> 7 7 + </div> 8 8 + {{ template "repo/fragments/fileTree" $fileTree }} 9 9 + </div> 10 10 + </section> 11 11 + {{ end }}

+1 -1

appview/pages/templates/repo/fragments/splitDiff.html

··· 3 3 {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800" -}} 4 4 {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 5 5 {{- $lineNrSepStyle := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 6 6 - {{- $containerStyle := "inline-flex w-full items-center target:bg-yellow-200 target:dark:bg-yellow-700 scroll-mt-48" -}} 6 6 + {{- $containerStyle := "inline-flex w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 7 7 {{- $emptyStyle := "bg-gray-200/30 dark:bg-gray-700/30" -}} 8 8 {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400" -}} 9 9 {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}}

+1 -1

appview/pages/templates/repo/fragments/unifiedDiff.html

··· 7 7 {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 8 8 {{- $lineNrSepStyle1 := "" -}} 9 9 {{- $lineNrSepStyle2 := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 10 10 - {{- $containerStyle := "inline-flex w-full items-center target:bg-yellow-200 target:dark:bg-yellow-700 scroll-mt-48" -}} 10 10 + {{- $containerStyle := "inline-flex w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 11 11 {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 " -}} 12 12 {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 13 13 {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}}

+9 -4

appview/pages/templates/repo/index.html

··· 14 14 {{ end }} 15 15 <div class="flex items-center justify-between pb-5"> 16 16 {{ block "branchSelector" . }}{{ end }} 17 17 - <div class="flex items-center gap-3"> 18 18 - <a href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" class="inline-flex md:hidden items-center text-sm gap-1 font-bold"> 17 17 + <div class="flex md:hidden items-center gap-3"> 18 18 + <a href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" class="inline-flex items-center text-sm gap-1 font-bold"> 19 19 {{ i "git-commit-horizontal" "w-4" "h-4" }} {{ .TotalCommits }} 20 20 </a> 21 21 - <a href="/{{ .RepoInfo.FullName }}/branches" class="inline-flex md:hidden items-center text-sm gap-1 font-bold"> 21 21 + <a href="/{{ .RepoInfo.FullName }}/branches" class="inline-flex items-center text-sm gap-1 font-bold"> 22 22 {{ i "git-branch" "w-4" "h-4" }} {{ len .Branches }} 23 23 </a> 24 24 - <a href="/{{ .RepoInfo.FullName }}/tags" class="inline-flex md:hidden items-center text-sm gap-1 font-bold"> 24 24 + <a href="/{{ .RepoInfo.FullName }}/tags" class="inline-flex items-center text-sm gap-1 font-bold"> 25 25 {{ i "tags" "w-4" "h-4" }} {{ len .Tags }} 26 26 </a> 27 27 {{ template "repo/fragments/cloneDropdown" . }} ··· 109 109 {{ i "git-compare" "w-4 h-4" }} 110 110 </a> 111 111 </div> 112 112 + </div> 113 113 + 114 114 + <!-- Clone dropdown in top right --> 115 115 + <div class="hidden md:flex items-center "> 116 116 + {{ template "repo/fragments/cloneDropdown" . }} 112 117 </div> 113 118 </div> 114 119 {{ end }}

+22 -35

appview/pages/templates/repo/issues/fragments/commentList.html

··· 1 1 {{ define "repo/issues/fragments/commentList" }} 2 2 - <div class="flex flex-col gap-4"> 2 2 + <div class="flex flex-col gap-8"> 3 3 {{ range $item := .CommentList }} 4 4 {{ template "commentListing" (list $ .) }} 5 5 {{ end }} ··· 19 19 <div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50"> 20 20 {{ template "topLevelComment" $params }} 21 21 22 22 - <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 22 22 + <div class="relative ml-4 border-l-2 border-gray-200 dark:border-gray-700"> 23 23 {{ range $index, $reply := $comment.Replies }} 24 24 - <div class="-ml-4"> 25 25 - {{ 26 26 - template "replyComment" 27 27 - (dict 28 28 - "RepoInfo" $root.RepoInfo 29 29 - "LoggedInUser" $root.LoggedInUser 30 30 - "Issue" $root.Issue 31 31 - "Comment" $reply) 32 32 - }} 24 24 + <div class="relative "> 25 25 + <!-- Horizontal connector --> 26 26 + <div class="absolute left-0 top-6 w-4 h-1 bg-gray-200 dark:bg-gray-700"></div> 27 27 + 28 28 + <div class="pl-2"> 29 29 + {{ 30 30 + template "replyComment" 31 31 + (dict 32 32 + "RepoInfo" $root.RepoInfo 33 33 + "LoggedInUser" $root.LoggedInUser 34 34 + "Issue" $root.Issue 35 35 + "Comment" $reply) 36 36 + }} 37 37 + </div> 33 38 </div> 34 39 {{ end }} 35 40 </div> ··· 39 44 {{ end }} 40 45 41 46 {{ define "topLevelComment" }} 42 42 - <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2 "> 43 43 - <div class="flex-shrink-0"> 44 44 - <img 45 45 - src="{{ tinyAvatar .Comment.Did }}" 46 46 - alt="" 47 47 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 48 48 - /> 49 49 - </div> 50 50 - <div class="flex-1 min-w-0"> 51 51 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 52 52 - {{ template "repo/issues/fragments/issueCommentBody" . }} 53 53 - </div> 47 47 + <div class="rounded px-6 py-4 bg-white dark:bg-gray-800"> 48 48 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 49 49 + {{ template "repo/issues/fragments/issueCommentBody" . }} 54 50 </div> 55 51 {{ end }} 56 52 57 53 {{ define "replyComment" }} 58 58 - <div class="py-4 pr-4 w-full mx-auto overflow-hidden flex gap-2 "> 59 59 - <div class="flex-shrink-0"> 60 60 - <img 61 61 - src="{{ tinyAvatar .Comment.Did }}" 62 62 - alt="" 63 63 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 64 64 - /> 65 65 - </div> 66 66 - <div class="flex-1 min-w-0"> 67 67 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 68 68 - {{ template "repo/issues/fragments/issueCommentBody" . }} 69 69 - </div> 54 54 + <div class="p-4 w-full mx-auto overflow-hidden"> 55 55 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 56 56 + {{ template "repo/issues/fragments/issueCommentBody" . }} 70 57 </div> 71 58 {{ end }}

+63

appview/pages/templates/repo/issues/fragments/globalIssueListing.html

··· 1 1 + {{ define "repo/issues/fragments/globalIssueListing" }} 2 2 + <div class="flex flex-col gap-2"> 3 3 + {{ range .Issues }} 4 4 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 5 + <div class="pb-2 mb-3"> 6 6 + <div class="flex items-center gap-3 mb-2"> 7 7 + <a 8 8 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" 9 9 + class="text-blue-600 dark:text-blue-400 font-medium hover:underline text-sm" 10 10 + > 11 11 + {{ resolve .Repo.Did }}/{{ .Repo.Name }} 12 12 + </a> 13 13 + </div> 14 14 + <a 15 15 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" 16 16 + class="no-underline hover:underline" 17 17 + > 18 18 + {{ .Title | description }} 19 19 + <span class="text-gray-500">#{{ .IssueId }}</span> 20 20 + </a> 21 21 + </div> 22 22 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 23 23 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 24 24 + {{ $icon := "ban" }} 25 25 + {{ $state := "closed" }} 26 26 + {{ if .Open }} 27 27 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 28 28 + {{ $icon = "circle-dot" }} 29 29 + {{ $state = "open" }} 30 30 + {{ end }} 31 31 + 32 32 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 33 33 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 34 34 + <span class="text-white dark:text-white">{{ $state }}</span> 35 35 + </span> 36 36 + 37 37 + <span class="ml-1"> 38 38 + {{ template "user/fragments/picHandleLink" .Did }} 39 39 + </span> 40 40 + 41 41 + <span class="before:content-['·']"> 42 42 + {{ template "repo/fragments/time" .Created }} 43 43 + </span> 44 44 + 45 45 + <span class="before:content-['·']"> 46 46 + {{ $s := "s" }} 47 47 + {{ if eq (len .Comments) 1 }} 48 48 + {{ $s = "" }} 49 49 + {{ end }} 50 50 + <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 51 51 + </span> 52 52 + 53 53 + {{ $state := .Labels }} 54 54 + {{ range $k, $d := $.LabelDefs }} 55 55 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 56 56 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 57 57 + {{ end }} 58 58 + {{ end }} 59 59 + </div> 60 60 + </div> 61 61 + {{ end }} 62 62 + </div> 63 63 + {{ end }}

+1 -2

appview/pages/templates/repo/issues/fragments/issueCommentHeader.html

··· 1 1 {{ define "repo/issues/fragments/issueCommentHeader" }} 2 2 <div class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "> 3 3 - {{ resolve .Comment.Did }} 3 3 + {{ template "user/fragments/picHandleLink" .Comment.Did }} 4 4 {{ template "hats" $ }} 5 5 - <span class="before:content-['·']"></span> 6 5 {{ template "timestamp" . }} 7 6 {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 8 7 {{ if and $isCommentOwner (not .Comment.Deleted) }}

+2 -2

appview/pages/templates/repo/issues/fragments/issueListing.html

··· 21 21 {{ $state = "open" }} 22 22 {{ end }} 23 23 24 24 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 24 24 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 25 25 {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 26 26 - <span class="text-white dark:text-white text-sm">{{ $state }}</span> 26 26 + <span class="text-white dark:text-white">{{ $state }}</span> 27 27 </span> 28 28 29 29 <span class="ml-1">

+1 -1

appview/pages/templates/repo/issues/fragments/putIssue.html

··· 18 18 <textarea 19 19 name="body" 20 20 id="body" 21 21 - rows="15" 21 21 + rows="6" 22 22 class="w-full resize-y" 23 23 placeholder="Describe your issue. Markdown is supported." 24 24 >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea>

+3 -3

appview/pages/templates/repo/issues/fragments/replyIssueCommentPlaceholder.html

··· 1 1 {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }} 2 2 - <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 2 2 + <div class="p-2 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 3 {{ if .LoggedInUser }} 4 4 <img 5 5 src="{{ tinyAvatar .LoggedInUser.Did }}" 6 6 alt="" 7 7 - class="rounded-full size-8 mr-1 border-2 border-gray-300 dark:border-gray-700" 7 7 + class="rounded-full h-6 w-6 mr-1 border border-gray-300 dark:border-gray-700" 8 8 /> 9 9 {{ end }} 10 10 <input 11 11 - class="w-full p-0 border-none focus:outline-none" 11 11 + class="w-full py-2 border-none focus:outline-none" 12 12 placeholder="Leave a reply..." 13 13 hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply" 14 14 hx-trigger="focus"

+5 -5

appview/pages/templates/repo/issues/issue.html

··· 58 58 {{ $icon = "circle-dot" }} 59 59 {{ end }} 60 60 <div class="inline-flex items-center gap-2"> 61 61 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 62 62 - {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 63 63 - <span class="text-white dark:text-white text-sm">{{ .Issue.State }}</span> 64 64 - </span> 65 65 - 61 61 + <div id="state" 62 62 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"> 63 63 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 64 64 + <span class="text-white">{{ .Issue.State }}</span> 65 65 + </div> 66 66 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 67 67 opened by 68 68 {{ template "user/fragments/picHandleLink" .Issue.Did }}

+69 -60

appview/pages/templates/repo/pipelines/fragments/pipelineSymbol.html

··· 1 1 {{ define "repo/pipelines/fragments/pipelineSymbol" }} 2 2 - <div class="cursor-pointer flex gap-2 items-center"> 3 3 - {{ template "symbol" .Pipeline }} 4 4 - {{ if .ShortSummary }} 5 5 - {{ .Pipeline.ShortStatusSummary }} 2 2 + <div class="cursor-pointer"> 3 3 + {{ $c := .Counts }} 4 4 + {{ $statuses := .Statuses }} 5 5 + {{ $total := len $statuses }} 6 6 + {{ $success := index $c "success" }} 7 7 + {{ $fail := index $c "failed" }} 8 8 + {{ $timeout := index $c "timeout" }} 9 9 + {{ $empty := eq $total 0 }} 10 10 + {{ $allPass := eq $success $total }} 11 11 + {{ $allFail := eq $fail $total }} 12 12 + {{ $allTimeout := eq $timeout $total }} 13 13 + 14 14 + {{ if $empty }} 15 15 + <div class="flex gap-1 items-center"> 16 16 + {{ i "hourglass" "size-4 text-gray-600 dark:text-gray-400 " }} 17 17 + <span>0/{{ $total }}</span> 18 18 + </div> 19 19 + {{ else if $allPass }} 20 20 + <div class="flex gap-1 items-center"> 21 21 + {{ i "check" "size-4 text-green-600" }} 22 22 + <span>{{ $total }}/{{ $total }}</span> 23 23 + </div> 24 24 + {{ else if $allFail }} 25 25 + <div class="flex gap-1 items-center"> 26 26 + {{ i "x" "size-4 text-red-500" }} 27 27 + <span>0/{{ $total }}</span> 28 28 + </div> 29 29 + {{ else if $allTimeout }} 30 30 + <div class="flex gap-1 items-center"> 31 31 + {{ i "clock-alert" "size-4 text-orange-500" }} 32 32 + <span>0/{{ $total }}</span> 33 33 + </div> 6 34 {{ else }} 7 7 - {{ .Pipeline.LongStatusSummary }} 35 35 + {{ $radius := f64 8 }} 36 36 + {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 37 37 + {{ $offset := 0.0 }} 38 38 + <div class="flex gap-1 items-center"> 39 39 + <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 40 40 + <circle cx="10" cy="10" r="{{ $radius }}" fill="none" stroke="#f3f4f633" stroke-width="2"/> 41 41 + 42 42 + {{ range $kind, $count := $c }} 43 43 + {{ $color := "" }} 44 44 + {{ if or (eq $kind "pending") (eq $kind "running") }} 45 45 + {{ $color = "#eab308" }} {{/* amber-500 */}} 46 46 + {{ else if eq $kind "success" }} 47 47 + {{ $color = "#10b981" }} {{/* green-500 */}} 48 48 + {{ else if eq $kind "cancelled" }} 49 49 + {{ $color = "#6b7280" }} {{/* gray-500 */}} 50 50 + {{ else if eq $kind "timeout" }} 51 51 + {{ $color = "#fb923c" }} {{/* orange-400 */}} 52 52 + {{ else }} 53 53 + {{ $color = "#ef4444" }} {{/* red-500 for failed or unknown */}} 54 54 + {{ end }} 55 55 + 56 56 + {{ $percent := divf64 (f64 $count) (f64 $total) }} 57 57 + {{ $length := mulf64 $percent $circumference }} 58 58 + 59 59 + <circle 60 60 + cx="10" cy="10" r="{{ $radius }}" 61 61 + fill="none" 62 62 + stroke="{{ $color }}" 63 63 + stroke-width="2" 64 64 + stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 65 65 + stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 66 66 + /> 67 67 + {{ $offset = addf64 $offset $length }} 68 68 + {{ end }} 69 69 + </svg> 70 70 + <span>{{ $success }}/{{ $total }}</span> 71 71 + </div> 8 72 {{ end }} 9 73 </div> 10 74 {{ end }} 11 11 - 12 12 - {{ define "symbol" }} 13 13 - {{ $c := .Counts }} 14 14 - {{ $statuses := .Statuses }} 15 15 - {{ $total := len $statuses }} 16 16 - {{ $success := index $c "success" }} 17 17 - {{ $fail := index $c "failed" }} 18 18 - {{ $timeout := index $c "timeout" }} 19 19 - {{ $empty := eq $total 0 }} 20 20 - {{ $allPass := eq $success $total }} 21 21 - {{ $allFail := eq $fail $total }} 22 22 - {{ $allTimeout := eq $timeout $total }} 23 23 - 24 24 - {{ if $empty }} 25 25 - {{ i "hourglass" "size-4 text-gray-600 dark:text-gray-400 " }} 26 26 - {{ else if $allPass }} 27 27 - {{ i "check" "size-4 text-green-600 dark:text-green-500" }} 28 28 - {{ else if $allFail }} 29 29 - {{ i "x" "size-4 text-red-600 dark:text-red-500" }} 30 30 - {{ else if $allTimeout }} 31 31 - {{ i "clock-alert" "size-4 text-orange-500" }} 32 32 - {{ else }} 33 33 - {{ $radius := f64 8 }} 34 34 - {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 35 35 - {{ $offset := 0.0 }} 36 36 - <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 37 37 - <circle cx="10" cy="10" r="{{ $radius }}" fill="none" class="stroke-gray-200 dark:stroke-gray-700" stroke-width="2"/> 38 38 - {{ range $kind, $count := $c }} 39 39 - {{ $colorClass := "" }} 40 40 - {{ if or (eq $kind "pending") (eq $kind "running") }} 41 41 - {{ $colorClass = "stroke-yellow-600 dark:stroke-yellow-500" }} 42 42 - {{ else if eq $kind "success" }} 43 43 - {{ $colorClass = "stroke-green-600 dark:stroke-green-500" }} 44 44 - {{ else if eq $kind "cancelled" }} 45 45 - {{ $colorClass = "stroke-gray-600 dark:stroke-gray-500" }} 46 46 - {{ else if eq $kind "timeout" }} 47 47 - {{ $colorClass = "stroke-orange-600 dark:stroke-orange-500" }} 48 48 - {{ else }} 49 49 - {{ $colorClass = "stroke-red-600 dark:stroke-red-500" }} 50 50 - {{ end }} 51 51 - {{ $percent := divf64 (f64 $count) (f64 $total) }} 52 52 - {{ $length := mulf64 $percent $circumference }} 53 53 - <circle 54 54 - cx="10" cy="10" r="{{ $radius }}" 55 55 - fill="none" 56 56 - class="{{ $colorClass }}" 57 57 - stroke-width="2" 58 58 - stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 59 59 - stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 60 60 - /> 61 61 - {{ $offset = addf64 $offset $length }} 62 62 - {{ end }} 63 63 - </svg> 64 64 - {{ end }} 65 65 - {{ end }}

+1 -1

appview/pages/templates/repo/pipelines/fragments/pipelineSymbolLong.html

··· 4 4 <div class="relative inline-block"> 5 5 <details class="relative"> 6 6 <summary class="cursor-pointer list-none"> 7 7 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 7 7 + {{ template "repo/pipelines/fragments/pipelineSymbol" .Pipeline }} 8 8 </summary> 9 9 {{ template "repo/pipelines/fragments/tooltip" $ }} 10 10 </details>

-14

appview/pages/templates/repo/pipelines/workflow.html

··· 12 12 {{ block "sidebar" . }} {{ end }} 13 13 </div> 14 14 <div class="col-span-1 md:col-span-3"> 15 15 - <!-- TODO(boltless): explictly check for pipeline cancel permission --> 16 16 - {{ if $.RepoInfo.Roles.IsOwner }} 17 17 - <div class="flex justify-between mb-2"> 18 18 - <div id="workflow-error" class="text-red-500 dark:text-red-400"></div> 19 19 - <button 20 20 - class="btn" 21 21 - hx-post="/{{ $.RepoInfo.FullName }}/pipelines/{{ .Pipeline.Id }}/workflow/{{ .Workflow }}/cancel" 22 22 - hx-swap="none" 23 23 - {{ if (index .Pipeline.Statuses .Workflow).Latest.Status.IsFinish -}} 24 24 - disabled 25 25 - {{- end }} 26 26 - >Cancel</button> 27 27 - </div> 28 28 - {{ end }} 29 15 {{ block "logs" . }} {{ end }} 30 16 </div> 31 17 </section>

+17 -17

appview/pages/templates/repo/pulls/fragments/pullActions.html

··· 22 22 {{ $isLastRound := eq $roundNumber $lastIdx }} 23 23 {{ $isSameRepoBranch := .Pull.IsBranchBased }} 24 24 {{ $isUpToDate := .ResubmitCheck.No }} 25 25 - <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative p-2"> 25 25 + <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative"> 26 26 <button 27 27 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 28 hx-target="#actions-{{$roundNumber}}" 29 29 hx-swap="outerHtml" 30 30 - class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 31 - {{ i "message-square-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 30 30 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 31 + {{ i "message-square-plus" "w-4 h-4" }} 32 32 + <span>comment</span> 32 33 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 33 33 - comment 34 34 </button> 35 35 {{ if .BranchDeleteStatus }} 36 36 <button 37 37 hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 38 38 hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 39 39 hx-swap="none" 40 40 - class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 40 40 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 41 41 {{ i "git-branch" "w-4 h-4" }} 42 42 <span>delete branch</span> 43 43 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} ··· 52 52 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 53 53 hx-swap="none" 54 54 hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 55 55 - class="btn-flat p-2 flex items-center gap-2 group" {{ $disabled }}> 56 56 - {{ i "git-merge" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 55 55 + class="btn p-2 flex items-center gap-2 group" {{ $disabled }}> 56 56 + {{ i "git-merge" "w-4 h-4" }} 57 57 + <span>merge{{if $stackCount}} {{$stackCount}}{{end}}</span> 57 58 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 58 58 - merge{{if $stackCount}} {{$stackCount}}{{end}} 59 59 </button> 60 60 {{ end }} 61 61 ··· 74 74 {{ end }} 75 75 76 76 hx-disabled-elt="#resubmitBtn" 77 77 - class="btn-flat p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 77 77 + class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 78 78 79 79 {{ if $disabled }} 80 80 title="Update this branch to resubmit this pull request" ··· 82 82 title="Resubmit this pull request" 83 83 {{ end }} 84 84 > 85 85 - {{ i "rotate-ccw" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 85 85 + {{ i "rotate-ccw" "w-4 h-4" }} 86 86 + <span>resubmit</span> 86 87 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 87 87 - resubmit 88 88 </button> 89 89 {{ end }} 90 90 ··· 92 92 <button 93 93 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 94 94 hx-swap="none" 95 95 - class="btn-flat p-2 flex items-center gap-2 group"> 96 96 - {{ i "ban" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 95 95 + class="btn p-2 flex items-center gap-2 group"> 96 96 + {{ i "ban" "w-4 h-4" }} 97 97 + <span>close</span> 97 98 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 98 98 - close 99 99 </button> 100 100 {{ end }} 101 101 ··· 103 103 <button 104 104 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 105 105 hx-swap="none" 106 106 - class="btn-flat p-2 flex items-center gap-2 group"> 107 107 - {{ i "refresh-ccw-dot" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 106 106 + class="btn p-2 flex items-center gap-2 group"> 107 107 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 108 108 + <span>reopen</span> 108 109 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 109 109 - reopen 110 110 </button> 111 111 {{ end }} 112 112 </div>

+7 -6

appview/pages/templates/repo/pulls/fragments/pullHeader.html

··· 1 1 {{ define "repo/pulls/fragments/pullHeader" }} 2 2 - <header class="pb-2"> 2 2 + <header class="pb-4"> 3 3 <h1 class="text-2xl dark:text-white"> 4 4 {{ .Pull.Title | description }} 5 5 <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span> ··· 17 17 {{ $icon = "git-merge" }} 18 18 {{ end }} 19 19 20 20 - <section> 20 20 + <section class="mt-2"> 21 21 <div class="flex items-center gap-2"> 22 22 - <span 23 23 - class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm" 22 22 + <div 23 23 + id="state" 24 24 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}" 24 25 > 25 25 - {{ i $icon "w-3 h-3 mr-1.5 text-white" }} 26 26 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 26 27 <span class="text-white">{{ .Pull.State.String }}</span> 27 27 - </span> 28 28 + </div> 28 29 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 29 30 opened by 30 31 {{ template "user/fragments/picHandleLink" .Pull.OwnerDid }}

+24 -39

appview/pages/templates/repo/pulls/fragments/pullNewComment.html

··· 1 1 {{ define "repo/pulls/fragments/pullNewComment" }} 2 2 <div 3 3 id="pull-comment-card-{{ .RoundNumber }}" 4 4 - class="w-full flex flex-col gap-2"> 5 5 - {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 4 4 + class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2"> 5 5 + <div class="text-sm text-gray-500 dark:text-gray-400"> 6 6 + {{ resolve .LoggedInUser.Did }} 7 7 + </div> 6 8 <form 7 9 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment" 10 10 + hx-indicator="#create-comment-spinner" 8 11 hx-swap="none" 9 9 - hx-on::after-request="if(event.detail.successful) this.reset()" 10 10 - hx-disabled-elt="#reply-{{ .RoundNumber }}" 11 11 - class="w-full flex flex-wrap gap-2 group" 12 12 + class="w-full flex flex-wrap gap-2" 12 13 > 13 14 <textarea 14 15 name="body" 15 16 class="w-full p-2 rounded border border-gray-200" 16 16 - rows=8 17 17 placeholder="Add to the discussion..."></textarea 18 18 > 19 19 - {{ template "replyActions" . }} 19 19 + <button type="submit" class="btn flex items-center gap-2"> 20 20 + {{ i "message-square" "w-4 h-4" }} 21 21 + <span>comment</span> 22 22 + <span id="create-comment-spinner" class="group"> 23 23 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 24 24 + </span> 25 25 + </button> 26 26 + <button 27 27 + type="button" 28 28 + class="btn flex items-center gap-2 group" 29 29 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 30 30 + hx-swap="outerHTML" 31 31 + hx-target="#pull-comment-card-{{ .RoundNumber }}" 32 32 + > 33 33 + {{ i "x" "w-4 h-4" }} 34 34 + <span>cancel</span> 35 35 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 36 36 + </button> 20 37 <div id="pull-comment"></div> 21 38 </form> 22 39 </div> 23 40 {{ end }} 24 24 - 25 25 - {{ define "replyActions" }} 26 26 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm w-full"> 27 27 - {{ template "cancel" . }} 28 28 - {{ template "reply" . }} 29 29 - </div> 30 30 - {{ end }} 31 31 - 32 32 - {{ define "cancel" }} 33 33 - <button 34 34 - type="button" 35 35 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 36 36 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 37 37 - hx-swap="outerHTML" 38 38 - hx-target="#actions-{{.RoundNumber}}" 39 39 - > 40 40 - {{ i "x" "w-4 h-4" }} 41 41 - <span>cancel</span> 42 42 - </button> 43 43 - {{ end }} 44 44 - 45 45 - {{ define "reply" }} 46 46 - <button 47 47 - type="submit" 48 48 - id="reply-{{ .RoundNumber }}" 49 49 - class="btn-create flex items-center gap-2"> 50 50 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 51 51 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 52 52 - reply 53 53 - </button> 54 54 - {{ end }} 55 55 -

+3 -2

appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html

··· 15 15 16 16 <div class="flex-shrink-0 flex items-center gap-2"> 17 17 {{ $latestRound := .LastRoundNumber }} 18 18 - {{ $commentCount := .TotalComments }} 18 18 + {{ $lastSubmission := index .Submissions $latestRound }} 19 19 + {{ $commentCount := len $lastSubmission.Comments }} 19 20 {{ if and $pipeline $pipeline.Id }} 20 20 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 21 21 + {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 21 22 <span class="before:content-['·'] before:select-none text-gray-500 dark:text-gray-400"></span> 22 23 {{ end }} 23 24 <span>

+21 -2

appview/pages/templates/repo/pulls/interdiff.html

··· 25 25 {{ template "repo/pulls/fragments/pullHeader" . }} 26 26 </header> 27 27 </section> 28 28 + 28 29 {{ end }} 29 30 30 31 {{ define "mainLayout" }} ··· 33 34 {{ block "content" . }}{{ end }} 34 35 {{ end }} 35 36 36 36 - {{ block "contentAfter" . }}{{ end }} 37 37 + {{ block "contentAfterLayout" . }} 38 38 + <div class="flex-grow grid grid-cols-1 md:grid-cols-12 gap-4"> 39 39 + <div class="flex flex-col gap-4 col-span-1 md:col-span-2"> 40 40 + {{ block "contentAfterLeft" . }} {{ end }} 41 41 + </div> 42 42 + <main class="col-span-1 md:col-span-10"> 43 43 + {{ block "contentAfter" . }}{{ end }} 44 44 + </main> 45 45 + </div> 46 46 + {{ end }} 37 47 </div> 38 48 {{ end }} 39 49 40 50 {{ define "contentAfter" }} 41 41 - {{ template "repo/fragments/diff" (list .Interdiff .DiffOpts) }} 51 51 + {{ template "repo/fragments/interdiff" (list .RepoInfo.FullName .Interdiff .DiffOpts) }} 52 52 + {{end}} 53 53 + 54 54 + {{ define "contentAfterLeft" }} 55 55 + <div class="flex flex-col gap-4 col-span-1 md:col-span-2"> 56 56 + {{ template "repo/fragments/diffOpts" .DiffOpts }} 57 57 + </div> 58 58 + <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto"> 59 59 + {{ template "repo/fragments/interdiffFiles" .Interdiff }} 60 60 + </div> 42 61 {{end}}

+232 -448

appview/pages/templates/repo/pulls/pull.html

··· 6 6 {{ template "repo/pulls/fragments/og" (dict "RepoInfo" .RepoInfo "Pull" .Pull) }} 7 7 {{ end }} 8 8 9 9 - {{ define "mainLayout" }} 10 10 - <div class="px-1 flex-grow flex flex-col gap-4"> 11 11 - <div class="max-w-screen-lg mx-auto"> 12 12 - {{ block "contentLayout" . }} 13 13 - {{ block "content" . }}{{ end }} 14 14 - {{ end }} 9 9 + {{ define "repoContentLayout" }} 10 10 + <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full"> 11 11 + <div class="col-span-1 md:col-span-8"> 12 12 + <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white"> 13 13 + {{ block "repoContent" . }}{{ end }} 14 14 + </section> 15 15 + {{ block "repoAfter" . }}{{ end }} 15 16 </div> 16 16 - {{ block "contentAfterLayout" . }} 17 17 - <main> 18 18 - {{ block "contentAfter" . }}{{ end }} 19 19 - </main> 20 20 - {{ end }} 21 21 - </div> 22 22 - <script> 23 23 - (function() { 24 24 - const details = document.getElementById('bottomSheet'); 25 25 - const isDesktop = () => window.matchMedia('(min-width: 768px)').matches; 26 26 - 27 27 - // close on mobile initially 28 28 - if (!isDesktop()) { 29 29 - details.open = false; 30 30 - } 31 31 - 32 32 - // prevent closing on desktop 33 33 - details.addEventListener('toggle', function(e) { 34 34 - if (isDesktop() && !this.open) { 35 35 - this.open = true; 36 36 - } 37 37 - }); 38 38 - 39 39 - const mediaQuery = window.matchMedia('(min-width: 768px)'); 40 40 - mediaQuery.addEventListener('change', function(e) { 41 41 - if (e.matches) { 42 42 - // switched to desktop - keep open 43 43 - details.open = true; 44 44 - } else { 45 45 - // switched to mobile - close 46 46 - details.open = false; 47 47 - } 48 48 - }); 49 49 - })(); 50 50 - </script> 51 51 - {{ end }} 52 52 - 53 53 - {{ define "repoContentLayout" }} 54 54 - <div class="grid grid-cols-1 md:grid-cols-10 gap-4"> 55 55 - <section class="bg-white col-span-1 md:col-span-8 dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white h-full flex-shrink"> 56 56 - {{ block "repoContent" . }}{{ end }} 57 57 - </section> 58 58 - <div class="flex flex-col gap-6 col-span-1 md:col-span-2"> 17 17 + <div class="col-span-1 md:col-span-2 flex flex-col gap-6"> 59 18 {{ template "repo/fragments/labelPanel" 60 19 (dict "RepoInfo" $.RepoInfo 61 20 "Defs" $.LabelDefs ··· 70 29 </div> 71 30 {{ end }} 72 31 73 73 - {{ define "contentAfter" }} 74 74 - {{ template "repo/fragments/diff" (list .Diff .DiffOpts $) }} 75 75 - {{ end }} 76 76 - 77 32 {{ define "repoContent" }} 78 33 {{ template "repo/pulls/fragments/pullHeader" . }} 34 34 + 79 35 {{ if .Pull.IsStacked }} 80 36 <div class="mt-8"> 81 37 {{ template "repo/pulls/fragments/pullStack" . }} ··· 83 39 {{ end }} 84 40 {{ end }} 85 41 86 86 - {{ define "diffLayout" }} 87 87 - {{ $diff := index . 0 }} 88 88 - {{ $opts := index . 1 }} 89 89 - {{ $root := index . 2 }} 90 90 - 91 91 - <div class="flex col-span-full"> 92 92 - <!-- left panel --> 93 93 - <div id="files" class="w-0 hidden md:block overflow-hidden sticky top-12 max-h-screen overflow-y-auto pb-12"> 94 94 - <section class="overflow-x-auto text-sm px-6 py-2 border-b border-x border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded-b rounded-t-none bg-white dark:bg-gray-800 drop-shadow-sm"> 95 95 - {{ template "repo/fragments/fileTree" $diff.FileTree }} 96 96 - </section> 97 97 - </div> 98 98 - 99 99 - <!-- main content --> 100 100 - <div class="flex-1 min-w-0 sticky top-12 pb-12"> 101 101 - {{ template "diffFiles" (list $diff $opts) }} 102 102 - </div> 103 103 - 104 104 - <!-- right panel --> 105 105 - {{ template "subsPanel" $ }} 106 106 - </div> 107 107 - {{ end }} 108 108 - 109 109 - {{ define "subsPanel" }} 110 110 - {{ $root := index . 2 }} 111 111 - {{ $pull := $root.Pull }} 112 112 - 113 113 - <!-- backdrop overlay - only visible on mobile when open --> 114 114 - <div class=" 115 115 - fixed inset-0 bg-black/50 z-50 md:hidden opacity-0 116 116 - pointer-events-none transition-opacity duration-300 117 117 - has-[~#subs_details[open]]:opacity-100 has-[~#subs_details[open]]:pointer-events-auto"> 118 118 - </div> 119 119 - <!-- right panel - bottom sheet on mobile, side panel on desktop --> 120 120 - <div id="subs" class="fixed bottom-0 left-0 right-0 z-50 w-full md:static md:z-auto md:max-h-screen md:sticky md:top-12 overflow-hidden"> 121 121 - <details open id="bottomSheet" class="group rounded-t-2xl md:rounded-t drop-shadow-lg md:drop-shadow-none"> 122 122 - <summary class=" 123 123 - flex gap-4 items-center justify-between 124 124 - rounded-t-2xl md:rounded-t cursor-pointer list-none p-4 md:h-12 125 125 - text-white md:text-black md:dark:text-white 126 126 - bg-green-600 dark:bg-green-700 127 127 - md:bg-white md:dark:bg-gray-800 128 128 - drop-shadow-sm 129 129 - border-t md:border-x md:border-t-0 border-gray-200 dark:border-gray-700"> 130 130 - <h2 class="">Submissions</h2> 131 131 - {{ template "subsPanelSummary" $ }} 132 132 - </summary> 133 133 - <div class="max-h-[85vh] md:max-h-[calc(100vh-3rem-3rem)] w-full flex flex-col-reverse gap-4 overflow-y-auto bg-slate-100 dark:bg-gray-900 md:bg-transparent"> 134 134 - {{ template "submissions" $root }} 42 42 + {{ define "repoAfter" }} 43 43 + <section id="submissions" class="mt-4"> 44 44 + <div class="flex flex-col gap-4"> 45 45 + {{ block "submissions" . }} {{ end }} 135 46 </div> 136 136 - </details> 137 137 - </div> 138 138 - {{ end }} 47 47 + </section> 139 48 140 140 - {{ define "subsPanelSummary" }} 141 141 - {{ $root := index . 2 }} 142 142 - {{ $pull := $root.Pull }} 143 143 - {{ $latest := $pull.LastRoundNumber }} 144 144 - <div class="flex items-center gap-2 text-sm"> 145 145 - <!--{{ if $root.IsInterdiff }} 146 146 - <span> 147 147 - viewing interdiff of 148 148 - <span class="font-mono">#{{ $root.ActiveRound }}</span> 149 149 - and 150 150 - <span class="font-mono">#{{ sub $root.ActiveRound 1 }}</span> 151 151 - </span> 152 152 - {{ else }} 153 153 - {{ if ne $root.ActiveRound $latest }} 154 154 - <span>(outdated)</span> 155 155 - <span class="before:content-['·']"></span> 156 156 - <a class="underline" href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $latest }}?{{ safeUrl $root.DiffOpts.Encode }}"> 157 157 - view latest 158 158 - </a> 159 159 - {{ end }} 160 160 - {{ end }}--> 161 161 - <span class="md:hidden inline"> 162 162 - <span class="inline group-open:hidden">{{ i "chevron-up" "size-4" }}</span> 163 163 - <span class="hidden group-open:inline">{{ i "chevron-down" "size-4" }}</span> 164 164 - </span> 165 165 - </div> 166 166 - {{ end }} 167 167 - 168 168 - {{ define "subsCheckbox" }} 169 169 - <input type="checkbox" id="subsToggle" class="peer/subs hidden" checked/> 170 170 - {{ end }} 171 171 - 172 172 - {{ define "subsToggle" }} 173 173 - <style> 174 174 - /* Mobile: full width */ 175 175 - #subsToggle:checked ~ div div#subs { 176 176 - width: 100%; 177 177 - margin-left: 0; 178 178 - } 179 179 - #subsToggle:checked ~ div label[for="subsToggle"] .show-toggle { display: none; } 180 180 - #subsToggle:checked ~ div label[for="subsToggle"] .hide-toggle { display: flex; } 181 181 - #subsToggle:not(:checked) ~ div label[for="subsToggle"] .hide-toggle { display: none; } 182 182 - 183 183 - /* Desktop: 25vw with left margin */ 184 184 - @media (min-width: 768px) { 185 185 - #subsToggle:checked ~ div div#subs { 186 186 - width: 25vw; 187 187 - margin-left: 1rem; 188 188 - } 189 189 - /* Unchecked state */ 190 190 - #subsToggle:not(:checked) ~ div div#subs { 191 191 - width: 0; 192 192 - display: none; 193 193 - margin-left: 0; 194 194 - } 195 195 - } 196 196 - </style> 197 197 - <label title="Toggle review panel" for="subsToggle" class="hidden md:flex items-center justify-end rounded cursor-pointer"> 198 198 - <span class="show-toggle">{{ i "message-square-more" "size-4" }}</span> 199 199 - <span class="hide-toggle w-[25vw] flex justify-end">{{ i "message-square" "size-4" }}</span> 200 200 - </label> 49 49 + <div id="pull-close"></div> 50 50 + <div id="pull-reopen"></div> 201 51 {{ end }} 202 202 - 203 52 204 53 {{ define "submissions" }} 205 54 {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 206 206 - {{ if not .LoggedInUser }} 207 207 - {{ template "loginPrompt" $ }} 208 208 - {{ end }} 209 209 - {{ range $ridx, $item := reverse .Pull.Submissions }} 210 210 - {{ $idx := sub $lastIdx $ridx }} 211 211 - {{ template "submission" (list $item $idx $lastIdx $) }} 212 212 - {{ end }} 213 213 - {{ end }} 55 55 + {{ $targetBranch := .Pull.TargetBranch }} 56 56 + {{ $repoName := .RepoInfo.FullName }} 57 57 + {{ range $idx, $item := .Pull.Submissions }} 58 58 + {{ with $item }} 59 59 + <details {{ if eq $idx $lastIdx }}open{{ end }}> 60 60 + <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer"> 61 61 + <div class="flex flex-wrap gap-2 items-stretch"> 62 62 + <!-- round number --> 63 63 + <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white"> 64 64 + <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span> 65 65 + </div> 66 66 + <!-- round summary --> 67 67 + <div class="flex-1 rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400"> 68 68 + <span class="gap-1 flex items-center"> 69 69 + {{ $owner := resolve $.Pull.OwnerDid }} 70 70 + {{ $re := "re" }} 71 71 + {{ if eq .RoundNumber 0 }} 72 72 + {{ $re = "" }} 73 73 + {{ end }} 74 74 + <span class="hidden md:inline">{{$re}}submitted</span> 75 75 + by {{ template "user/fragments/picHandleLink" $.Pull.OwnerDid }} 76 76 + <span class="select-none before:content-['\00B7']"></span> 77 77 + <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ .RoundNumber }}">{{ template "repo/fragments/shortTime" .Created }}</a> 78 78 + <span class="select-none before:content-['·']"></span> 79 79 + {{ $s := "s" }} 80 80 + {{ if eq (len .Comments) 1 }} 81 81 + {{ $s = "" }} 82 82 + {{ end }} 83 83 + {{ len .Comments }} comment{{$s}} 84 84 + </span> 85 85 + </div> 214 86 215 215 - {{ define "submission" }} 216 216 - {{ $item := index . 0 }} 217 217 - {{ $idx := index . 1 }} 218 218 - {{ $lastIdx := index . 2 }} 219 219 - {{ $root := index . 3 }} 220 220 - <div class="{{ if eq $item.RoundNumber 0 }}rounded-b border-t-0{{ else }}rounded{{ end }} border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50"> 221 221 - {{ template "submissionHeader" $ }} 222 222 - {{ template "submissionComments" $ }} 87 87 + <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" 88 88 + hx-boost="true" 89 89 + href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}"> 90 90 + {{ i "file-diff" "w-4 h-4" }} 91 91 + <span class="hidden md:inline">diff</span> 92 92 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 93 93 + </a> 94 94 + {{ if ne $idx 0 }} 95 95 + <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" 96 96 + hx-boost="true" 97 97 + href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff"> 98 98 + {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 99 99 + <span class="hidden md:inline">interdiff</span> 100 100 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 101 101 + </a> 102 102 + {{ end }} 103 103 + <span id="interdiff-error-{{.RoundNumber}}"></span> 104 104 + </div> 105 105 + </summary> 223 106 224 224 - {{ if eq $lastIdx $item.RoundNumber }} 225 225 - {{ block "mergeStatus" $root }} {{ end }} 226 226 - {{ block "resubmitStatus" $root }} {{ end }} 227 227 - {{ end }} 107 107 + {{ if .IsFormatPatch }} 108 108 + {{ $patches := .AsFormatPatch }} 109 109 + {{ $round := .RoundNumber }} 110 110 + <details class="group py-2 md:ml-[3.5rem] text-gray-500 dark:text-gray-400 flex flex-col gap-2 relative text-sm"> 111 111 + <summary class="py-1 list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400"> 112 112 + {{ $s := "s" }} 113 113 + {{ if eq (len $patches) 1 }} 114 114 + {{ $s = "" }} 115 115 + {{ end }} 116 116 + <div class="group-open:hidden flex items-center gap-2 ml-2"> 117 117 + {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $patches }} commit{{$s}} 118 118 + </div> 119 119 + <div class="hidden group-open:flex items-center gap-2 ml-2"> 120 120 + {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $patches }} commit{{$s}} 121 121 + </div> 122 122 + </summary> 123 123 + {{ range $patches }} 124 124 + <div id="commit-{{.SHA}}" class="py-1 px-2 relative w-full md:max-w-3/5 md:w-fit flex flex-col"> 125 125 + <div class="flex items-center gap-2"> 126 126 + {{ i "git-commit-horizontal" "w-4 h-4" }} 127 127 + <div class="text-sm text-gray-500 dark:text-gray-400"> 128 128 + <!-- attempt to resolve $fullRepo: this is possible only on non-deleted forks and branches --> 129 129 + {{ $fullRepo := "" }} 130 130 + {{ if and $.Pull.IsForkBased $.Pull.PullSource.Repo }} 131 131 + {{ $fullRepo = printf "%s/%s" $owner $.Pull.PullSource.Repo.Name }} 132 132 + {{ else if $.Pull.IsBranchBased }} 133 133 + {{ $fullRepo = $.RepoInfo.FullName }} 134 134 + {{ end }} 228 135 229 229 - {{ if $root.LoggedInUser }} 230 230 - {{ template "repo/pulls/fragments/pullActions" 231 231 - (dict 232 232 - "LoggedInUser" $root.LoggedInUser 233 233 - "Pull" $root.Pull 234 234 - "RepoInfo" $root.RepoInfo 235 235 - "RoundNumber" $item.RoundNumber 236 236 - "MergeCheck" $root.MergeCheck 237 237 - "ResubmitCheck" $root.ResubmitCheck 238 238 - "BranchDeleteStatus" $root.BranchDeleteStatus 239 239 - "Stack" $root.Stack) }} 240 240 - {{ end }} 241 241 - </div> 242 242 - {{ end }} 136 136 + <!-- if $fullRepo was resolved, link to it, otherwise just span without a link --> 137 137 + {{ if $fullRepo }} 138 138 + <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-500 dark:text-gray-400">{{ slice .SHA 0 8 }}</a> 139 139 + {{ else }} 140 140 + <span class="font-mono">{{ slice .SHA 0 8 }}</span> 141 141 + {{ end }} 142 142 + </div> 143 143 + <div class="flex items-center"> 144 144 + <span>{{ .Title | description }}</span> 145 145 + {{ if gt (len .Body) 0 }} 146 146 + <button 147 147 + class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 148 148 + hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 149 149 + > 150 150 + {{ i "ellipsis" "w-3 h-3" }} 151 151 + </button> 152 152 + {{ end }} 153 153 + </div> 154 154 + </div> 155 155 + {{ if gt (len .Body) 0 }} 156 156 + <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2"> 157 157 + {{ nl2br .Body }} 158 158 + </p> 159 159 + {{ end }} 160 160 + </div> 161 161 + {{ end }} 162 162 + </details> 163 163 + {{ end }} 243 164 244 244 - {{ define "submissionHeader" }} 245 245 - {{ $item := index . 0 }} 246 246 - {{ $lastIdx := index . 2 }} 247 247 - {{ $root := index . 3 }} 248 248 - {{ $round := $item.RoundNumber }} 249 249 - <div class="{{ if eq $round 0 }}rounded-b{{ else }}rounded{{ end }} px-6 py-4 pr-2 pt-2 {{ if eq $root.ActiveRound $round }}bg-blue-100 dark:bg-blue-900/50 border-b border-blue-200 dark:border-blue-700{{ else }}bg-white dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700{{ end }} flex gap-2 sticky top-0 z-20"> 250 250 - <!-- left column: just profile picture --> 251 251 - <div class="flex-shrink-0 pt-2"> 252 252 - <img 253 253 - src="{{ tinyAvatar $root.Pull.OwnerDid }}" 254 254 - alt="" 255 255 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 256 256 - /> 257 257 - </div> 258 258 - <!-- right column --> 259 259 - <div class="flex-1 min-w-0 flex flex-col gap-1"> 260 260 - {{ template "submissionInfo" $ }} 261 261 - {{ template "submissionCommits" $ }} 262 262 - {{ template "submissionPipeline" $ }} 263 263 - {{ if eq $lastIdx $round }} 264 264 - {{ block "mergeCheck" $root }} {{ end }} 265 265 - {{ end }} 266 266 - </div> 267 267 - </div> 268 268 - {{ end }} 269 165 270 270 - {{ define "submissionInfo" }} 271 271 - {{ $item := index . 0 }} 272 272 - {{ $idx := index . 1 }} 273 273 - {{ $root := index . 3 }} 274 274 - {{ $round := $item.RoundNumber }} 275 275 - <div class="flex gap-2 items-center justify-between mb-1"> 276 276 - <span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 pt-2"> 277 277 - {{ resolve $root.Pull.OwnerDid }} submitted 278 278 - <span class="px-2 py-0.5 {{ if eq $root.ActiveRound $round }}text-white bg-blue-600 dark:bg-blue-500 border-blue-700 dark:border-blue-600{{ else }}text-black dark:text-white bg-gray-100 dark:bg-gray-700 border-gray-300 dark:border-gray-600{{ end }} rounded font-mono text-xs border"> 279 279 - #{{ $round }} 280 280 - </span> 281 281 - <span class="select-none before:content-['\00B7']"></span> 282 282 - <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}"> 283 283 - {{ template "repo/fragments/shortTime" $item.Created }} 284 284 - </a> 285 285 - </span> 286 286 - <div class="flex gap-2 items-center"> 287 287 - {{ if ne $root.ActiveRound $round }} 288 288 - <a class="btn-flat flex items-center gap-2 no-underline hover:no-underline text-sm" 289 289 - href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $round }}?{{ safeUrl $root.DiffOpts.Encode }}"> 290 290 - {{ i "diff" "w-4 h-4" }} 291 291 - diff 292 292 - </a> 293 293 - {{ end }} 294 294 - {{ if ne $idx 0 }} 295 295 - <a class="btn-flat flex items-center gap-2 no-underline hover:no-underline text-sm" 296 296 - href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $round }}/interdiff?{{ safeUrl $root.DiffOpts.Encode }}"> 297 297 - {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 298 298 - interdiff 299 299 - </a> 300 300 - {{ end }} 301 301 - </div> 302 302 - </div> 303 303 - {{ end }} 166 166 + <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative"> 167 167 + {{ range $cidx, $c := .Comments }} 168 168 + <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full"> 169 169 + {{ if gt $cidx 0 }} 170 170 + <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 171 171 + {{ end }} 172 172 + <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 173 173 + {{ template "user/fragments/picHandleLink" $c.OwnerDid }} 174 174 + <span class="before:content-['·']"></span> 175 175 + <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}">{{ template "repo/fragments/time" $c.Created }}</a> 176 176 + </div> 177 177 + <div class="prose dark:prose-invert"> 178 178 + {{ $c.Body | markdown }} 179 179 + </div> 180 180 + </div> 181 181 + {{ end }} 304 182 305 305 - {{ define "submissionCommits" }} 306 306 - {{ $item := index . 0 }} 307 307 - {{ $root := index . 3 }} 308 308 - {{ $round := $item.RoundNumber }} 309 309 - {{ $patches := $item.AsFormatPatch }} 310 310 - {{ if $patches }} 311 311 - <details class="group/commit"> 312 312 - <summary class="list-none cursor-pointer flex items-center gap-2"> 313 313 - <span>{{ i "git-commit-horizontal" "w-4 h-4" }}</span> 314 314 - {{ len $patches }} commit{{ if ne (len $patches) 1 }}s{{ end }} 315 315 - <div class="text-sm text-gray-500 dark:text-gray-400"> 316 316 - <span class="group-open/commit:hidden inline">expand</span> 317 317 - <span class="hidden group-open/commit:inline">collapse</span> 318 318 - </div> 319 319 - </summary> 320 320 - {{ range $patches }} 321 321 - {{ template "submissionCommit" (list . $item $root) }} 322 322 - {{ end }} 323 323 - </details> 324 324 - {{ end }} 325 325 - {{ end }} 183 183 + {{ block "pipelineStatus" (list $ .) }} {{ end }} 326 184 327 327 - {{ define "submissionCommit" }} 328 328 - {{ $patch := index . 0 }} 329 329 - {{ $item := index . 1 }} 330 330 - {{ $root := index . 2 }} 331 331 - {{ $round := $item.RoundNumber }} 332 332 - {{ with $patch }} 333 333 - <div id="commit-{{.SHA}}" class="py-1 relative w-full md:max-w-3/5 md:w-fit flex flex-col text-gray-600 dark:text-gray-300"> 334 334 - <div class="flex items-baseline gap-2"> 335 335 - <div class="text-xs"> 336 336 - <!-- attempt to resolve $fullRepo: this is possible only on non-deleted forks and branches --> 337 337 - {{ $fullRepo := "" }} 338 338 - {{ if and $root.Pull.IsForkBased $root.Pull.PullSource.Repo }} 339 339 - {{ $fullRepo = printf "%s/%s" $root.Pull.OwnerDid $root.Pull.PullSource.Repo.Name }} 340 340 - {{ else if $root.Pull.IsBranchBased }} 341 341 - {{ $fullRepo = $root.RepoInfo.FullName }} 185 185 + {{ if eq $lastIdx .RoundNumber }} 186 186 + {{ block "mergeStatus" $ }} {{ end }} 187 187 + {{ block "resubmitStatus" $ }} {{ end }} 342 188 {{ end }} 343 189 344 344 - <!-- if $fullRepo was resolved, link to it, otherwise just span without a link --> 345 345 - {{ if $fullRepo }} 346 346 - <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-600 dark:text-gray-300">{{ slice .SHA 0 8 }}</a> 190 190 + {{ if $.LoggedInUser }} 191 191 + {{ template "repo/pulls/fragments/pullActions" 192 192 + (dict 193 193 + "LoggedInUser" $.LoggedInUser 194 194 + "Pull" $.Pull 195 195 + "RepoInfo" $.RepoInfo 196 196 + "RoundNumber" .RoundNumber 197 197 + "MergeCheck" $.MergeCheck 198 198 + "ResubmitCheck" $.ResubmitCheck 199 199 + "BranchDeleteStatus" $.BranchDeleteStatus 200 200 + "Stack" $.Stack) }} 347 201 {{ else }} 348 348 - <span class="font-mono">{{ slice .SHA 0 8 }}</span> 202 202 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-2 relative flex gap-2 items-center w-fit"> 203 203 + <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 204 204 + sign up 205 205 + </a> 206 206 + <span class="text-gray-500 dark:text-gray-400">or</span> 207 207 + <a href="/login" class="underline">login</a> 208 208 + to add to the discussion 209 209 + </div> 349 210 {{ end }} 350 211 </div> 351 351 - 352 352 - <div> 353 353 - <span>{{ .Title | description }}</span> 354 354 - {{ if gt (len .Body) 0 }} 355 355 - <button 356 356 - class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 357 357 - hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 358 358 - > 359 359 - {{ i "ellipsis" "w-3 h-3" }} 360 360 - </button> 361 361 - {{ end }} 362 362 - {{ if gt (len .Body) 0 }} 363 363 - <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 pb-2">{{ nl2br .Body }}</p> 364 364 - {{ end }} 365 365 - </div> 366 366 - </div> 367 367 - </div> 368 368 - {{ end }} 369 369 - {{ end }} 370 370 - 371 371 - {{ define "mergeCheck" }} 372 372 - {{ $isOpen := .Pull.State.IsOpen }} 373 373 - {{ if and $isOpen .MergeCheck .MergeCheck.Error }} 374 374 - <div class="flex items-center gap-2"> 375 375 - {{ i "triangle-alert" "w-4 h-4 text-red-600 dark:text-red-500" }} 376 376 - {{ .MergeCheck.Error }} 377 377 - </div> 378 378 - {{ else if and $isOpen .MergeCheck .MergeCheck.IsConflicted }} 379 379 - <details class="group/conflict"> 380 380 - <summary class="flex items-center justify-between cursor-pointer list-none"> 381 381 - <div class="flex items-center gap-2 "> 382 382 - {{ i "triangle-alert" "text-red-600 dark:text-red-500 w-4 h-4" }} 383 383 - <span class="font-medium">merge conflicts detected</span> 384 384 - <div class="text-sm text-gray-500 dark:text-gray-400"> 385 385 - <span class="group-open/conflict:hidden inline">expand</span> 386 386 - <span class="hidden group-open/conflict:inline">collapse</span> 387 387 - </div> 388 388 - </div> 389 389 - </summary> 390 390 - {{ if gt (len .MergeCheck.Conflicts) 0 }} 391 391 - <ul class="space-y-1 mt-2 overflow-x-auto"> 392 392 - {{ range .MergeCheck.Conflicts }} 393 393 - {{ if .Filename }} 394 394 - <li class="flex items-center whitespace-nowrap"> 395 395 - {{ i "file-warning" "inline-flex w-4 h-4 mr-1.5 text-red-600 dark:text-red-500 flex-shrink-0" }} 396 396 - <span class="font-mono">{{ .Filename }}</span> 397 397 - </li> 398 398 - {{ else if .Reason }} 399 399 - <li class="flex items-center whitespace-nowrap"> 400 400 - {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-600 dark:text-red-500 " }} 401 401 - <span>{{.Reason}}</span> 402 402 - </li> 403 403 - {{ end }} 404 404 - {{ end }} 405 405 - </ul> 406 406 - {{ end }} 407 212 </details> 408 408 - {{ else if and $isOpen .MergeCheck }} 409 409 - <div class="flex items-center gap-2"> 410 410 - {{ i "check" "w-4 h-4 text-green-600 dark:text-green-500" }} 411 411 - <span>no conflicts, ready to merge</span> 412 412 - </div> 213 213 + {{ end }} 413 214 {{ end }} 414 215 {{ end }} 415 216 416 217 {{ define "mergeStatus" }} 417 218 {{ if .Pull.State.IsClosed }} 418 418 - <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative"> 219 219 + <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 419 220 <div class="flex items-center gap-2 text-black dark:text-white"> 420 221 {{ i "ban" "w-4 h-4" }} 421 222 <span class="font-medium">closed without merging</span ··· 423 224 </div> 424 225 </div> 425 226 {{ else if .Pull.State.IsMerged }} 426 426 - <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative"> 227 227 + <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 427 228 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 428 229 {{ i "git-merge" "w-4 h-4" }} 429 230 <span class="font-medium">pull request successfully merged</span ··· 431 232 </div> 432 233 </div> 433 234 {{ else if .Pull.State.IsDeleted }} 434 434 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 235 235 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 435 236 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 436 237 {{ i "git-pull-request-closed" "w-4 h-4" }} 437 238 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 438 239 </div> 439 240 </div> 241 241 + {{ else if and .MergeCheck .MergeCheck.Error }} 242 242 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 243 243 + <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 244 244 + {{ i "triangle-alert" "w-4 h-4" }} 245 245 + <span class="font-medium">{{ .MergeCheck.Error }}</span> 246 246 + </div> 247 247 + </div> 248 248 + {{ else if and .MergeCheck .MergeCheck.IsConflicted }} 249 249 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 250 250 + <div class="flex flex-col gap-2 text-red-500 dark:text-red-300"> 251 251 + <div class="flex items-center gap-2"> 252 252 + {{ i "triangle-alert" "w-4 h-4" }} 253 253 + <span class="font-medium">merge conflicts detected</span> 254 254 + </div> 255 255 + {{ if gt (len .MergeCheck.Conflicts) 0 }} 256 256 + <ul class="space-y-1"> 257 257 + {{ range .MergeCheck.Conflicts }} 258 258 + {{ if .Filename }} 259 259 + <li class="flex items-center"> 260 260 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 261 261 + <span class="font-mono">{{ .Filename }}</span> 262 262 + </li> 263 263 + {{ else if .Reason }} 264 264 + <li class="flex items-center"> 265 265 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 266 266 + <span>{{.Reason}}</span> 267 267 + </li> 268 268 + {{ end }} 269 269 + {{ end }} 270 270 + </ul> 271 271 + {{ end }} 272 272 + </div> 273 273 + </div> 274 274 + {{ else if .MergeCheck }} 275 275 + <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 276 276 + <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> 277 277 + {{ i "circle-check-big" "w-4 h-4" }} 278 278 + <span class="font-medium">no conflicts, ready to merge</span> 279 279 + </div> 280 280 + </div> 440 281 {{ end }} 441 282 {{ end }} 442 283 443 284 {{ define "resubmitStatus" }} 444 285 {{ if .ResubmitCheck.Yes }} 445 445 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative"> 286 286 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 446 287 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 447 288 {{ i "triangle-alert" "w-4 h-4" }} 448 289 <span class="font-medium">this branch has been updated, consider resubmitting</span> ··· 451 292 {{ end }} 452 293 {{ end }} 453 294 454 454 - {{ define "submissionPipeline" }} 455 455 - {{ $item := index . 0 }} 456 456 - {{ $root := index . 3 }} 457 457 - {{ $pipeline := index $root.Pipelines $item.SourceRev }} 295 295 + {{ define "pipelineStatus" }} 296 296 + {{ $root := index . 0 }} 297 297 + {{ $submission := index . 1 }} 298 298 + {{ $pipeline := index $root.Pipelines $submission.SourceRev }} 458 299 {{ with $pipeline }} 459 300 {{ $id := .Id }} 460 301 {{ if .Statuses }} 461 461 - <details class="group/pipeline"> 462 462 - <summary class="cursor-pointer list-none flex items-center gap-2"> 463 463 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" false) }} 464 464 - <div class="text-sm text-gray-500 dark:text-gray-400"> 465 465 - <span class="group-open/pipeline:hidden inline">expand</span> 466 466 - <span class="hidden group-open/pipeline:inline">collapse</span> 467 467 - </div> 468 468 - </summary> 469 469 - <div class="my-2 grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 470 470 - {{ range $name, $all := .Statuses }} 471 471 - <a href="/{{ $root.RepoInfo.FullName }}/pipelines/{{ $id }}/workflow/{{ $name }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 472 472 - <div 473 473 - class="flex gap-2 items-center justify-between p-2"> 474 474 - {{ $lastStatus := $all.Latest }} 475 475 - {{ $kind := $lastStatus.Status.String }} 302 302 + <div class="max-w-80 grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 303 303 + {{ range $name, $all := .Statuses }} 304 304 + <a href="/{{ $root.RepoInfo.FullName }}/pipelines/{{ $id }}/workflow/{{ $name }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 305 305 + <div 306 306 + class="flex gap-2 items-center justify-between p-2"> 307 307 + {{ $lastStatus := $all.Latest }} 308 308 + {{ $kind := $lastStatus.Status.String }} 476 309 477 477 - <div id="left" class="flex items-center gap-2 flex-shrink-0"> 478 478 - {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 479 479 - {{ $name }} 480 480 - </div> 481 481 - <div id="right" class="flex items-center gap-2 flex-shrink-0"> 482 482 - <span class="font-bold">{{ $kind }}</span> 483 483 - {{ if .TimeTaken }} 484 484 - {{ template "repo/fragments/duration" .TimeTaken }} 485 485 - {{ else }} 486 486 - {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 487 487 - {{ end }} 488 488 - </div> 489 489 - </div> 490 490 - </a> 491 491 - {{ end }} 310 310 + <div id="left" class="flex items-center gap-2 flex-shrink-0"> 311 311 + {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 312 312 + {{ $name }} 313 313 + </div> 314 314 + <div id="right" class="flex items-center gap-2 flex-shrink-0"> 315 315 + <span class="font-bold">{{ $kind }}</span> 316 316 + {{ if .TimeTaken }} 317 317 + {{ template "repo/fragments/duration" .TimeTaken }} 318 318 + {{ else }} 319 319 + {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 320 320 + {{ end }} 321 321 + </div> 492 322 </div> 493 493 - </details> 323 323 + </a> 324 324 + {{ end }} 325 325 + </div> 494 326 {{ end }} 495 327 {{ end }} 496 328 {{ end }} 497 497 - 498 498 - {{ define "submissionComments" }} 499 499 - {{ $item := index . 0 }} 500 500 - <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 501 501 - {{ range $item.Comments }} 502 502 - {{ template "submissionComment" . }} 503 503 - {{ end }} 504 504 - </div> 505 505 - {{ end }} 506 506 - 507 507 - {{ define "submissionComment" }} 508 508 - <div id="comment-{{.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 509 509 - <!-- left column: profile picture --> 510 510 - <div class="flex-shrink-0"> 511 511 - <img 512 512 - src="{{ tinyAvatar .OwnerDid }}" 513 513 - alt="" 514 514 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 515 515 - /> 516 516 - </div> 517 517 - <!-- right column: name and body in two rows --> 518 518 - <div class="flex-1 min-w-0"> 519 519 - <!-- Row 1: Author and timestamp --> 520 520 - <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 521 521 - <span>{{ resolve .OwnerDid }}</span> 522 522 - <span class="before:content-['·']"></span> 523 523 - <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}"> 524 524 - {{ template "repo/fragments/time" .Created }} 525 525 - </a> 526 526 - </div> 527 527 - <!-- Row 2: Body text --> 528 528 - <div class="prose dark:prose-invert mt-1"> 529 529 - {{ .Body | markdown }} 530 530 - </div> 531 531 - </div> 532 532 - </div> 533 533 - {{ end }} 534 534 - 535 535 - {{ define "loginPrompt" }} 536 536 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-2 relative flex gap-2 items-center"> 537 537 - <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 538 538 - sign up 539 539 - </a> 540 540 - <span class="text-gray-500 dark:text-gray-400">or</span> 541 541 - <a href="/login" class="underline">login</a> 542 542 - to add to the discussion 543 543 - </div> 544 544 - {{ end }}

+12 -3

appview/pages/templates/repo/pulls/pulls.html

··· 112 112 {{ template "repo/fragments/time" .Created }} 113 113 </span> 114 114 115 115 + 116 116 + {{ $latestRound := .LastRoundNumber }} 117 117 + {{ $lastSubmission := index .Submissions $latestRound }} 118 118 + 115 119 <span class="before:content-['·']"> 116 116 - {{ $commentCount := .TotalComments }} 117 117 - {{ $commentCount }} comment{{ if ne $commentCount 1 }}s{{ end }} 120 120 + {{ $commentCount := len $lastSubmission.Comments }} 121 121 + {{ $s := "s" }} 122 122 + {{ if eq $commentCount 1 }} 123 123 + {{ $s = "" }} 124 124 + {{ end }} 125 125 + 126 126 + {{ len $lastSubmission.Comments}} comment{{$s}} 118 127 </span> 119 128 120 129 <span class="before:content-['·']"> ··· 127 136 {{ $pipeline := index $.Pipelines .LatestSha }} 128 137 {{ if and $pipeline $pipeline.Id }} 129 138 <span class="before:content-['·']"></span> 130 130 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 139 139 + {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 131 140 {{ end }} 132 141 133 142 {{ $state := .Labels }}

+16 -24

appview/pages/templates/strings/string.html

··· 10 10 11 11 {{ define "content" }} 12 12 {{ $ownerId := resolve .Owner.DID.String }} 13 13 - <section id="string-header" class="mb-2 py-2 px-4 dark:text-white"> 14 14 - <div class="text-lg flex flex-col sm:flex-row items-start gap-4 justify-between"> 15 15 - <!-- left items --> 16 16 - <div class="flex flex-col gap-2"> 17 17 - <!-- string owner / string name --> 18 18 - <div class="flex items-center gap-2 flex-wrap"> 19 19 - {{ template "user/fragments/picHandleLink" .Owner.DID.String }} 20 20 - <span class="select-none">/</span> 21 21 - <a href="/strings/{{ $ownerId }}/{{ .String.Rkey }}" class="font-bold">{{ .String.Filename }}</a> 22 22 - </div> 23 23 - 24 24 - <span class="flex flex-wrap items-center gap-x-4 gap-y-2 text-sm text-gray-600 dark:text-gray-300"> 25 25 - {{ if .String.Description }} 26 26 - {{ .String.Description }} 27 27 - {{ else }} 28 28 - <span class="italic">this string has no description</span> 29 29 - {{ end }} 30 30 - </span> 13 13 + <section id="string-header" class="mb-4 py-2 px-6 dark:text-white"> 14 14 + <div class="text-lg flex items-center justify-between"> 15 15 + <div> 16 16 + <a href="/strings/{{ $ownerId }}">{{ $ownerId }}</a> 17 17 + <span class="select-none">/</span> 18 18 + <a href="/strings/{{ $ownerId }}/{{ .String.Rkey }}" class="font-bold">{{ .String.Filename }}</a> 31 19 </div> 32 32 - 33 33 - <div class="w-full sm:w-fit grid grid-cols-3 gap-2 z-auto"> 20 20 + <div class="flex gap-2 items-stretch text-base"> 34 21 {{ if and .LoggedInUser (eq .LoggedInUser.Did .String.Did) }} 35 35 - <a class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group" 22 22 + <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" 36 23 hx-boost="true" 37 24 href="/strings/{{ .String.Did }}/{{ .String.Rkey }}/edit"> 38 38 - {{ i "pencil" "w-4 h-4" }} 25 25 + {{ i "pencil" "size-4" }} 39 26 <span class="hidden md:inline">edit</span> 40 27 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 41 28 </a> 42 29 <button 43 43 - class="btn text-sm text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 flex items-center gap-2 group" 30 30 + class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group p-2" 44 31 title="Delete string" 45 32 hx-delete="/strings/{{ .String.Did }}/{{ .String.Rkey }}/" 46 33 hx-swap="none" 47 34 hx-confirm="Are you sure you want to delete the string `{{ .String.Filename }}`?" 48 35 > 49 49 - {{ i "trash-2" "w-4 h-4" }} 36 36 + {{ i "trash-2" "size-4" }} 50 37 <span class="hidden md:inline">delete</span> 51 38 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 52 39 </button> ··· 57 44 "StarCount" .StarCount) }} 58 45 </div> 59 46 </div> 47 47 + <span> 48 48 + {{ with .String.Description }} 49 49 + {{ . }} 50 50 + {{ end }} 51 51 + </span> 60 52 </section> 61 53 <section class="bg-white dark:bg-gray-800 px-6 py-4 rounded relative w-full dark:text-white"> 62 54 <div class="flex flex-col md:flex-row md:justify-between md:items-center text-gray-500 dark:text-gray-400 text-sm md:text-base pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-700">

-53

appview/pages/templates/user/login.html

··· 20 20 <h2 class="text-center text-xl italic dark:text-white"> 21 21 tightly-knit social coding. 22 22 </h2> 23 23 - 24 24 - {{ if .AddAccount }} 25 25 - <div class="flex gap-2 my-4 bg-blue-50 dark:bg-blue-900/30 border border-blue-300 dark:border-sky-800 rounded px-3 py-2 text-blue-600 dark:text-blue-300"> 26 26 - <span class="py-1">{{ i "user-plus" "w-4 h-4" }}</span> 27 27 - <div> 28 28 - <h5 class="font-medium">Add another account</h5> 29 29 - <p class="text-sm">Sign in with a different account to add it to your account list.</p> 30 30 - </div> 31 31 - </div> 32 32 - {{ end }} 33 33 - 34 34 - {{ if and .LoggedInUser .LoggedInUser.Accounts }} 35 35 - {{ $accounts := .LoggedInUser.Accounts }} 36 36 - {{ if $accounts }} 37 37 - <div class="my-4 border border-gray-200 dark:border-gray-700 rounded overflow-hidden"> 38 38 - <div class="px-3 py-2 bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700"> 39 39 - <span class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-wide font-medium">Saved accounts</span> 40 40 - </div> 41 41 - <div class="divide-y divide-gray-200 dark:divide-gray-700"> 42 42 - {{ range $accounts }} 43 43 - <div class="flex items-center justify-between px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-700"> 44 44 - <button 45 45 - type="button" 46 46 - hx-post="/account/switch" 47 47 - hx-vals='{"did": "{{ .Did }}"}' 48 48 - hx-swap="none" 49 49 - class="flex items-center gap-2 flex-1 text-left min-w-0" 50 50 - > 51 51 - <img src="{{ tinyAvatar .Did }}" alt="" class="rounded-full h-8 w-8 flex-shrink-0 border border-gray-300 dark:border-gray-700" /> 52 52 - <div class="flex flex-col min-w-0"> 53 53 - <span class="text-sm font-medium dark:text-white truncate">{{ .Did | resolve | truncateAt30 }}</span> 54 54 - <span class="text-xs text-gray-500 dark:text-gray-400">Click to switch</span> 55 55 - </div> 56 56 - </button> 57 57 - <button 58 58 - type="button" 59 59 - hx-delete="/account/{{ .Did }}" 60 60 - hx-swap="none" 61 61 - class="p-1 text-gray-400 hover:text-red-500 dark:hover:text-red-400 flex-shrink-0" 62 62 - title="Remove account" 63 63 - > 64 64 - {{ i "x" "w-4 h-4" }} 65 65 - </button> 66 66 - </div> 67 67 - {{ end }} 68 68 - </div> 69 69 - </div> 70 70 - {{ end }} 71 71 - {{ end }} 72 72 - 73 23 <form 74 24 class="mt-4" 75 25 hx-post="/login" ··· 96 46 </span> 97 47 </div> 98 48 <input type="hidden" name="return_url" value="{{ .ReturnUrl }}"> 99 99 - <input type="hidden" name="add_account" value="{{ if .AddAccount }}true{{ end }}"> 100 49 101 50 <button 102 51 class="btn w-full my-2 mt-6 text-base " ··· 117 66 You have not authorized the app. 118 67 {{ else if eq .ErrorCode "session" }} 119 68 Server failed to create user session. 120 120 - {{ else if eq .ErrorCode "max_accounts" }} 121 121 - You have reached the maximum of 20 linked accounts. Please remove an account before adding a new one. 122 69 {{ else }} 123 70 Internal Server error. 124 71 {{ end }}

+3 -87

appview/pipelines/pipelines.go

··· 4 4 "bytes" 5 5 "context" 6 6 "encoding/json" 7 7 - "fmt" 8 7 "log/slog" 9 8 "net/http" 10 9 "strings" 11 10 "time" 12 11 13 13 - "tangled.org/core/api/tangled" 14 12 "tangled.org/core/appview/config" 15 13 "tangled.org/core/appview/db" 16 16 - "tangled.org/core/appview/middleware" 17 17 - "tangled.org/core/appview/models" 18 14 "tangled.org/core/appview/oauth" 19 15 "tangled.org/core/appview/pages" 20 16 "tangled.org/core/appview/reporesolver" ··· 40 36 logger *slog.Logger 41 37 } 42 38 43 43 - func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler { 39 39 + func (p *Pipelines) Router() http.Handler { 44 40 r := chi.NewRouter() 45 41 r.Get("/", p.Index) 46 42 r.Get("/{pipeline}/workflow/{workflow}", p.Workflow) 47 43 r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs) 48 48 - r. 49 49 - With(mw.RepoPermissionMiddleware("repo:owner")). 50 50 - Post("/{pipeline}/workflow/{workflow}/cancel", p.Cancel) 51 44 52 45 return r 53 46 } ··· 77 70 } 78 71 79 72 func (p *Pipelines) Index(w http.ResponseWriter, r *http.Request) { 80 80 - user := p.oauth.GetMultiAccountUser(r) 73 73 + user := p.oauth.GetUser(r) 81 74 l := p.logger.With("handler", "Index") 82 75 83 76 f, err := p.repoResolver.Resolve(r) ··· 106 99 } 107 100 108 101 func (p *Pipelines) Workflow(w http.ResponseWriter, r *http.Request) { 109 109 - user := p.oauth.GetMultiAccountUser(r) 102 102 + user := p.oauth.GetUser(r) 110 103 l := p.logger.With("handler", "Workflow") 111 104 112 105 f, err := p.repoResolver.Resolve(r) ··· 321 314 } 322 315 } 323 316 } 324 324 - } 325 325 - 326 326 - func (p *Pipelines) Cancel(w http.ResponseWriter, r *http.Request) { 327 327 - l := p.logger.With("handler", "Cancel") 328 328 - 329 329 - var ( 330 330 - pipelineId = chi.URLParam(r, "pipeline") 331 331 - workflow = chi.URLParam(r, "workflow") 332 332 - ) 333 333 - if pipelineId == "" || workflow == "" { 334 334 - http.Error(w, "missing pipeline ID or workflow", http.StatusBadRequest) 335 335 - return 336 336 - } 337 337 - 338 338 - f, err := p.repoResolver.Resolve(r) 339 339 - if err != nil { 340 340 - l.Error("failed to get repo and knot", "err", err) 341 341 - http.Error(w, "bad repo/knot", http.StatusBadRequest) 342 342 - return 343 343 - } 344 344 - 345 345 - pipeline, err := func() (models.Pipeline, error) { 346 346 - ps, err := db.GetPipelineStatuses( 347 347 - p.db, 348 348 - 1, 349 349 - orm.FilterEq("repo_owner", f.Did), 350 350 - orm.FilterEq("repo_name", f.Name), 351 351 - orm.FilterEq("knot", f.Knot), 352 352 - orm.FilterEq("id", pipelineId), 353 353 - ) 354 354 - if err != nil { 355 355 - return models.Pipeline{}, err 356 356 - } 357 357 - if len(ps) != 1 { 358 358 - return models.Pipeline{}, fmt.Errorf("wrong pipeline count %d", len(ps)) 359 359 - } 360 360 - return ps[0], nil 361 361 - }() 362 362 - if err != nil { 363 363 - l.Error("pipeline query failed", "err", err) 364 364 - http.Error(w, "pipeline not found", http.StatusNotFound) 365 365 - } 366 366 - var ( 367 367 - spindle = f.Spindle 368 368 - knot = f.Knot 369 369 - rkey = pipeline.Rkey 370 370 - ) 371 371 - 372 372 - if spindle == "" || knot == "" || rkey == "" { 373 373 - http.Error(w, "invalid repo info", http.StatusBadRequest) 374 374 - return 375 375 - } 376 376 - 377 377 - spindleClient, err := p.oauth.ServiceClient( 378 378 - r, 379 379 - oauth.WithService(f.Spindle), 380 380 - oauth.WithLxm(tangled.PipelineCancelPipelineNSID), 381 381 - oauth.WithDev(p.config.Core.Dev), 382 382 - oauth.WithTimeout(time.Second*30), // workflow cleanup usually takes time 383 383 - ) 384 384 - 385 385 - err = tangled.PipelineCancelPipeline( 386 386 - r.Context(), 387 387 - spindleClient, 388 388 - &tangled.PipelineCancelPipeline_Input{ 389 389 - Repo: string(f.RepoAt()), 390 390 - Pipeline: pipeline.AtUri().String(), 391 391 - Workflow: workflow, 392 392 - }, 393 393 - ) 394 394 - errorId := "workflow-error" 395 395 - if err != nil { 396 396 - l.Error("failed to cancel workflow", "err", err) 397 397 - p.pages.Notice(w, errorId, "Failed to cancel workflow") 398 398 - return 399 399 - } 400 400 - l.Debug("canceled pipeline", "uri", pipeline.AtUri()) 401 317 } 402 318 403 319 // either a message or an error

+2 -2

appview/pulls/opengraph.go

··· 18 18 "tangled.org/core/types" 19 19 ) 20 20 21 21 - func (s *Pulls) drawPullSummaryCard(pull *models.Pull, repo *models.Repo, commentCount int, diffStats types.DiffFileStat, filesChanged int) (*ogcard.Card, error) { 21 21 + func (s *Pulls) drawPullSummaryCard(pull *models.Pull, repo *models.Repo, commentCount int, diffStats types.DiffStat, filesChanged int) (*ogcard.Card, error) { 22 22 width, height := ogcard.DefaultSize() 23 23 mainCard, err := ogcard.NewCard(width, height) 24 24 if err != nil { ··· 284 284 commentCount := len(comments) 285 285 286 286 // Calculate diff stats from latest submission using patchutil 287 287 - var diffStats types.DiffFileStat 287 287 + var diffStats types.DiffStat 288 288 filesChanged := 0 289 289 if len(pull.Submissions) > 0 { 290 290 latestSubmission := pull.Submissions[len(pull.Submissions)-1]

+164 -137

appview/pulls/pulls.go

··· 1 1 package pulls 2 2 3 3 import ( 4 4 - "bytes" 5 5 - "compress/gzip" 6 4 "context" 7 5 "database/sql" 8 6 "encoding/json" 9 7 "errors" 10 8 "fmt" 11 11 - "io" 12 9 "log" 13 10 "log/slog" 14 11 "net/http" ··· 97 94 func (s *Pulls) PullActions(w http.ResponseWriter, r *http.Request) { 98 95 switch r.Method { 99 96 case http.MethodGet: 100 100 - user := s.oauth.GetMultiAccountUser(r) 97 97 + user := s.oauth.GetUser(r) 101 98 f, err := s.repoResolver.Resolve(r) 102 99 if err != nil { 103 100 log.Println("failed to get repo and knot", err) ··· 128 125 mergeCheckResponse := s.mergeCheck(r, f, pull, stack) 129 126 branchDeleteStatus := s.branchDeleteStatus(r, f, pull) 130 127 resubmitResult := pages.Unknown 131 131 - if user.Active.Did == pull.OwnerDid { 128 128 + if user.Did == pull.OwnerDid { 132 129 resubmitResult = s.resubmitCheck(r, f, pull, stack) 133 130 } 134 131 ··· 146 143 } 147 144 } 148 145 149 149 - func (s *Pulls) repoPullHelper(w http.ResponseWriter, r *http.Request, interdiff bool) { 150 150 - user := s.oauth.GetMultiAccountUser(r) 146 146 + func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) { 147 147 + user := s.oauth.GetUser(r) 151 148 f, err := s.repoResolver.Resolve(r) 152 149 if err != nil { 153 150 log.Println("failed to get repo and knot", err) ··· 168 165 return 169 166 } 170 167 171 171 - roundId := chi.URLParam(r, "round") 172 172 - roundIdInt := pull.LastRoundNumber() 173 173 - if r, err := strconv.Atoi(roundId); err == nil { 174 174 - roundIdInt = r 175 175 - } 176 176 - if roundIdInt >= len(pull.Submissions) { 177 177 - http.Error(w, "bad round id", http.StatusBadRequest) 178 178 - log.Println("failed to parse round id", err) 179 179 - return 180 180 - } 181 181 - 182 182 - var diffOpts types.DiffOpts 183 183 - if d := r.URL.Query().Get("diff"); d == "split" { 184 184 - diffOpts.Split = true 185 185 - } 186 186 - 187 168 // can be nil if this pull is not stacked 188 169 stack, _ := r.Context().Value("stack").(models.Stack) 189 170 abandonedPulls, _ := r.Context().Value("abandonedPulls").([]*models.Pull) ··· 191 172 mergeCheckResponse := s.mergeCheck(r, f, pull, stack) 192 173 branchDeleteStatus := s.branchDeleteStatus(r, f, pull) 193 174 resubmitResult := pages.Unknown 194 194 - if user != nil && user.Active != nil && user.Active.Did == pull.OwnerDid { 175 175 + if user != nil && user.Did == pull.OwnerDid { 195 176 resubmitResult = s.resubmitCheck(r, f, pull, stack) 196 177 } 197 178 ··· 233 214 234 215 userReactions := map[models.ReactionKind]bool{} 235 216 if user != nil { 236 236 - userReactions = db.GetReactionStatusMap(s.db, user.Active.Did, pull.AtUri()) 217 217 + userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.AtUri()) 237 218 } 238 219 239 220 labelDefs, err := db.GetLabelDefinitions( ··· 252 233 defs[l.AtUri().String()] = &l 253 234 } 254 235 255 255 - patch := pull.Submissions[roundIdInt].CombinedPatch() 256 256 - var diff types.DiffRenderer 257 257 - diff = patchutil.AsNiceDiff(patch, pull.TargetBranch) 258 258 - 259 259 - if interdiff { 260 260 - currentPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt].CombinedPatch()) 261 261 - if err != nil { 262 262 - log.Println("failed to interdiff; current patch malformed") 263 263 - s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; current patch is invalid.") 264 264 - return 265 265 - } 266 266 - 267 267 - previousPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt-1].CombinedPatch()) 268 268 - if err != nil { 269 269 - log.Println("failed to interdiff; previous patch malformed") 270 270 - s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; previous patch is invalid.") 271 271 - return 272 272 - } 273 273 - 274 274 - diff = patchutil.Interdiff(previousPatch, currentPatch) 275 275 - } 276 276 - 277 236 s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 278 237 LoggedInUser: user, 279 238 RepoInfo: s.repoResolver.GetRepoInfo(r, user), ··· 285 244 MergeCheck: mergeCheckResponse, 286 245 ResubmitCheck: resubmitResult, 287 246 Pipelines: m, 288 288 - Diff: diff, 289 289 - DiffOpts: diffOpts, 290 290 - ActiveRound: roundIdInt, 291 291 - IsInterdiff: interdiff, 292 247 293 248 OrderedReactionKinds: models.OrderedReactionKinds, 294 249 Reactions: reactionMap, ··· 298 253 }) 299 254 } 300 255 301 301 - func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) { 302 302 - s.repoPullHelper(w, r, false) 303 303 - } 304 304 - 305 256 func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse { 306 257 if pull.State == models.PullMerged { 307 258 return types.MergeCheckResponse{} ··· 374 325 return nil 375 326 } 376 327 377 377 - user := s.oauth.GetMultiAccountUser(r) 328 328 + user := s.oauth.GetUser(r) 378 329 if user == nil { 379 330 return nil 380 331 } ··· 397 348 } 398 349 399 350 // user can only delete branch if they are a collaborator in the repo that the branch belongs to 400 400 - perms := s.enforcer.GetPermissionsInRepo(user.Active.Did, repo.Knot, repo.DidSlashRepo()) 351 351 + perms := s.enforcer.GetPermissionsInRepo(user.Did, repo.Knot, repo.DidSlashRepo()) 401 352 if !slices.Contains(perms, "repo:push") { 402 353 return nil 403 354 } ··· 484 435 } 485 436 486 437 func (s *Pulls) RepoPullPatch(w http.ResponseWriter, r *http.Request) { 487 487 - s.repoPullHelper(w, r, false) 438 438 + user := s.oauth.GetUser(r) 439 439 + 440 440 + var diffOpts types.DiffOpts 441 441 + if d := r.URL.Query().Get("diff"); d == "split" { 442 442 + diffOpts.Split = true 443 443 + } 444 444 + 445 445 + pull, ok := r.Context().Value("pull").(*models.Pull) 446 446 + if !ok { 447 447 + log.Println("failed to get pull") 448 448 + s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") 449 449 + return 450 450 + } 451 451 + 452 452 + stack, _ := r.Context().Value("stack").(models.Stack) 453 453 + 454 454 + roundId := chi.URLParam(r, "round") 455 455 + roundIdInt, err := strconv.Atoi(roundId) 456 456 + if err != nil || roundIdInt >= len(pull.Submissions) { 457 457 + http.Error(w, "bad round id", http.StatusBadRequest) 458 458 + log.Println("failed to parse round id", err) 459 459 + return 460 460 + } 461 461 + 462 462 + patch := pull.Submissions[roundIdInt].CombinedPatch() 463 463 + diff := patchutil.AsNiceDiff(patch, pull.TargetBranch) 464 464 + 465 465 + s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{ 466 466 + LoggedInUser: user, 467 467 + RepoInfo: s.repoResolver.GetRepoInfo(r, user), 468 468 + Pull: pull, 469 469 + Stack: stack, 470 470 + Round: roundIdInt, 471 471 + Submission: pull.Submissions[roundIdInt], 472 472 + Diff: &diff, 473 473 + DiffOpts: diffOpts, 474 474 + }) 475 475 + 488 476 } 489 477 490 478 func (s *Pulls) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) { 491 491 - s.repoPullHelper(w, r, true) 479 479 + user := s.oauth.GetUser(r) 480 480 + 481 481 + var diffOpts types.DiffOpts 482 482 + if d := r.URL.Query().Get("diff"); d == "split" { 483 483 + diffOpts.Split = true 484 484 + } 485 485 + 486 486 + pull, ok := r.Context().Value("pull").(*models.Pull) 487 487 + if !ok { 488 488 + log.Println("failed to get pull") 489 489 + s.pages.Notice(w, "pull-error", "Failed to get pull.") 490 490 + return 491 491 + } 492 492 + 493 493 + roundId := chi.URLParam(r, "round") 494 494 + roundIdInt, err := strconv.Atoi(roundId) 495 495 + if err != nil || roundIdInt >= len(pull.Submissions) { 496 496 + http.Error(w, "bad round id", http.StatusBadRequest) 497 497 + log.Println("failed to parse round id", err) 498 498 + return 499 499 + } 500 500 + 501 501 + if roundIdInt == 0 { 502 502 + http.Error(w, "bad round id", http.StatusBadRequest) 503 503 + log.Println("cannot interdiff initial submission") 504 504 + return 505 505 + } 506 506 + 507 507 + currentPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt].CombinedPatch()) 508 508 + if err != nil { 509 509 + log.Println("failed to interdiff; current patch malformed") 510 510 + s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; current patch is invalid.") 511 511 + return 512 512 + } 513 513 + 514 514 + previousPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt-1].CombinedPatch()) 515 515 + if err != nil { 516 516 + log.Println("failed to interdiff; previous patch malformed") 517 517 + s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; previous patch is invalid.") 518 518 + return 519 519 + } 520 520 + 521 521 + interdiff := patchutil.Interdiff(previousPatch, currentPatch) 522 522 + 523 523 + s.pages.RepoPullInterdiffPage(w, pages.RepoPullInterdiffParams{ 524 524 + LoggedInUser: s.oauth.GetUser(r), 525 525 + RepoInfo: s.repoResolver.GetRepoInfo(r, user), 526 526 + Pull: pull, 527 527 + Round: roundIdInt, 528 528 + Interdiff: interdiff, 529 529 + DiffOpts: diffOpts, 530 530 + }) 492 531 } 493 532 494 533 func (s *Pulls) RepoPullPatchRaw(w http.ResponseWriter, r *http.Request) { ··· 514 553 func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) { 515 554 l := s.logger.With("handler", "RepoPulls") 516 555 517 517 - user := s.oauth.GetMultiAccountUser(r) 556 556 + user := s.oauth.GetUser(r) 518 557 params := r.URL.Query() 519 558 520 559 state := models.PullOpen ··· 545 584 546 585 keyword := params.Get("q") 547 586 548 548 - var pulls []*models.Pull 587 587 + var ids []int64 549 588 searchOpts := models.PullSearchOptions{ 550 589 Keyword: keyword, 551 590 RepoAt: f.RepoAt().String(), ··· 559 598 l.Error("failed to search for pulls", "err", err) 560 599 return 561 600 } 601 601 + ids = res.Hits 562 602 totalPulls = int(res.Total) 563 563 - l.Debug("searched pulls with indexer", "count", len(res.Hits)) 564 564 - 565 565 - pulls, err = db.GetPulls( 566 566 - s.db, 567 567 - orm.FilterIn("id", res.Hits), 568 568 - ) 569 569 - if err != nil { 570 570 - log.Println("failed to get pulls", err) 571 571 - s.pages.Notice(w, "pulls", "Failed to load pulls. Try again later.") 572 572 - return 573 573 - } 603 603 + l.Debug("searched pulls with indexer", "count", len(ids)) 574 604 } else { 575 575 - pulls, err = db.GetPullsPaginated( 576 576 - s.db, 577 577 - page, 578 578 - orm.FilterEq("repo_at", f.RepoAt()), 579 579 - orm.FilterEq("state", searchOpts.State), 580 580 - ) 605 605 + ids, err = db.GetPullIDs(s.db, searchOpts) 581 606 if err != nil { 582 582 - log.Println("failed to get pulls", err) 583 583 - s.pages.Notice(w, "pulls", "Failed to load pulls. Try again later.") 607 607 + l.Error("failed to get all pull ids", "err", err) 584 608 return 585 609 } 610 610 + l.Debug("indexed all pulls from the db", "count", len(ids)) 611 611 + } 612 612 + 613 613 + pulls, err := db.GetPulls( 614 614 + s.db, 615 615 + orm.FilterIn("id", ids), 616 616 + ) 617 617 + if err != nil { 618 618 + log.Println("failed to get pulls", err) 619 619 + s.pages.Notice(w, "pulls", "Failed to load pulls. Try again later.") 620 620 + return 586 621 } 587 622 588 623 for _, p := range pulls { ··· 659 694 } 660 695 661 696 s.pages.RepoPulls(w, pages.RepoPullsParams{ 662 662 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 697 697 + LoggedInUser: s.oauth.GetUser(r), 663 698 RepoInfo: s.repoResolver.GetRepoInfo(r, user), 664 699 Pulls: pulls, 665 700 LabelDefs: defs, ··· 673 708 } 674 709 675 710 func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) { 676 676 - user := s.oauth.GetMultiAccountUser(r) 711 711 + user := s.oauth.GetUser(r) 677 712 f, err := s.repoResolver.Resolve(r) 678 713 if err != nil { 679 714 log.Println("failed to get repo and knot", err) ··· 732 767 } 733 768 atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 734 769 Collection: tangled.RepoPullCommentNSID, 735 735 - Repo: user.Active.Did, 770 770 + Repo: user.Did, 736 771 Rkey: tid.TID(), 737 772 Record: &lexutil.LexiconTypeDecoder{ 738 773 Val: &tangled.RepoPullComment{ ··· 749 784 } 750 785 751 786 comment := &models.PullComment{ 752 752 - OwnerDid: user.Active.Did, 787 787 + OwnerDid: user.Did, 753 788 RepoAt: f.RepoAt().String(), 754 789 PullId: pull.PullId, 755 790 Body: body, ··· 783 818 } 784 819 785 820 func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) { 786 786 - user := s.oauth.GetMultiAccountUser(r) 821 821 + user := s.oauth.GetUser(r) 787 822 f, err := s.repoResolver.Resolve(r) 788 823 if err != nil { 789 824 log.Println("failed to get repo and knot", err) ··· 851 886 } 852 887 853 888 // Determine PR type based on input parameters 854 854 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 889 889 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 855 890 isPushAllowed := roles.IsPushAllowed() 856 891 isBranchBased := isPushAllowed && sourceBranch != "" && fromFork == "" 857 892 isForkBased := fromFork != "" && sourceBranch != "" ··· 951 986 w http.ResponseWriter, 952 987 r *http.Request, 953 988 repo *models.Repo, 954 954 - user *oauth.MultiAccountUser, 989 989 + user *oauth.User, 955 990 title, 956 991 body, 957 992 targetBranch, ··· 1008 1043 s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, combined, sourceRev, pullSource, recordPullSource, isStacked) 1009 1044 } 1010 1045 1011 1011 - func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.MultiAccountUser, title, body, targetBranch, patch string, isStacked bool) { 1046 1046 + func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, title, body, targetBranch, patch string, isStacked bool) { 1012 1047 if err := s.validator.ValidatePatch(&patch); err != nil { 1013 1048 s.logger.Error("patch validation failed", "err", err) 1014 1049 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.") ··· 1018 1053 s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, "", "", nil, nil, isStacked) 1019 1054 } 1020 1055 1021 1021 - func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.MultiAccountUser, forkRepo string, title, body, targetBranch, sourceBranch string, isStacked bool) { 1056 1056 + func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, forkRepo string, title, body, targetBranch, sourceBranch string, isStacked bool) { 1022 1057 repoString := strings.SplitN(forkRepo, "/", 2) 1023 1058 forkOwnerDid := repoString[0] 1024 1059 repoName := repoString[1] ··· 1127 1162 w http.ResponseWriter, 1128 1163 r *http.Request, 1129 1164 repo *models.Repo, 1130 1130 - user *oauth.MultiAccountUser, 1165 1165 + user *oauth.User, 1131 1166 title, body, targetBranch string, 1132 1167 patch string, 1133 1168 combined string, ··· 1199 1234 Title: title, 1200 1235 Body: body, 1201 1236 TargetBranch: targetBranch, 1202 1202 - OwnerDid: user.Active.Did, 1237 1237 + OwnerDid: user.Did, 1203 1238 RepoAt: repo.RepoAt(), 1204 1239 Rkey: rkey, 1205 1240 Mentions: mentions, ··· 1222 1257 return 1223 1258 } 1224 1259 1225 1225 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 1260 1260 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 1226 1261 if err != nil { 1227 1262 log.Println("failed to upload patch", err) 1228 1263 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") ··· 1231 1266 1232 1267 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1233 1268 Collection: tangled.RepoPullNSID, 1234 1234 - Repo: user.Active.Did, 1269 1269 + Repo: user.Did, 1235 1270 Rkey: rkey, 1236 1271 Record: &lexutil.LexiconTypeDecoder{ 1237 1272 Val: &tangled.RepoPull{ ··· 1268 1303 w http.ResponseWriter, 1269 1304 r *http.Request, 1270 1305 repo *models.Repo, 1271 1271 - user *oauth.MultiAccountUser, 1306 1306 + user *oauth.User, 1272 1307 targetBranch string, 1273 1308 patch string, 1274 1309 sourceRev string, ··· 1316 1351 // apply all record creations at once 1317 1352 var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem 1318 1353 for _, p := range stack { 1319 1319 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(p.LatestPatch())) 1354 1354 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(p.LatestPatch())) 1320 1355 if err != nil { 1321 1356 log.Println("failed to upload patch blob", err) 1322 1357 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") ··· 1336 1371 }) 1337 1372 } 1338 1373 _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ 1339 1339 - Repo: user.Active.Did, 1374 1374 + Repo: user.Did, 1340 1375 Writes: writes, 1341 1376 }) 1342 1377 if err != nil { ··· 1408 1443 } 1409 1444 1410 1445 func (s *Pulls) PatchUploadFragment(w http.ResponseWriter, r *http.Request) { 1411 1411 - user := s.oauth.GetMultiAccountUser(r) 1446 1446 + user := s.oauth.GetUser(r) 1412 1447 1413 1448 s.pages.PullPatchUploadFragment(w, pages.PullPatchUploadParams{ 1414 1449 RepoInfo: s.repoResolver.GetRepoInfo(r, user), ··· 1416 1451 } 1417 1452 1418 1453 func (s *Pulls) CompareBranchesFragment(w http.ResponseWriter, r *http.Request) { 1419 1419 - user := s.oauth.GetMultiAccountUser(r) 1454 1454 + user := s.oauth.GetUser(r) 1420 1455 f, err := s.repoResolver.Resolve(r) 1421 1456 if err != nil { 1422 1457 log.Println("failed to get repo and knot", err) ··· 1471 1506 } 1472 1507 1473 1508 func (s *Pulls) CompareForksFragment(w http.ResponseWriter, r *http.Request) { 1474 1474 - user := s.oauth.GetMultiAccountUser(r) 1509 1509 + user := s.oauth.GetUser(r) 1475 1510 1476 1476 - forks, err := db.GetForksByDid(s.db, user.Active.Did) 1511 1511 + forks, err := db.GetForksByDid(s.db, user.Did) 1477 1512 if err != nil { 1478 1513 log.Println("failed to get forks", err) 1479 1514 return ··· 1487 1522 } 1488 1523 1489 1524 func (s *Pulls) CompareForksBranchesFragment(w http.ResponseWriter, r *http.Request) { 1490 1490 - user := s.oauth.GetMultiAccountUser(r) 1525 1525 + user := s.oauth.GetUser(r) 1491 1526 1492 1527 f, err := s.repoResolver.Resolve(r) 1493 1528 if err != nil { ··· 1580 1615 } 1581 1616 1582 1617 func (s *Pulls) ResubmitPull(w http.ResponseWriter, r *http.Request) { 1583 1583 - user := s.oauth.GetMultiAccountUser(r) 1618 1618 + user := s.oauth.GetUser(r) 1584 1619 1585 1620 pull, ok := r.Context().Value("pull").(*models.Pull) 1586 1621 if !ok { ··· 1611 1646 } 1612 1647 1613 1648 func (s *Pulls) resubmitPatch(w http.ResponseWriter, r *http.Request) { 1614 1614 - user := s.oauth.GetMultiAccountUser(r) 1649 1649 + user := s.oauth.GetUser(r) 1615 1650 1616 1651 pull, ok := r.Context().Value("pull").(*models.Pull) 1617 1652 if !ok { ··· 1626 1661 return 1627 1662 } 1628 1663 1629 1629 - if user.Active.Did != pull.OwnerDid { 1664 1664 + if user.Did != pull.OwnerDid { 1630 1665 log.Println("unauthorized user") 1631 1666 w.WriteHeader(http.StatusUnauthorized) 1632 1667 return ··· 1638 1673 } 1639 1674 1640 1675 func (s *Pulls) resubmitBranch(w http.ResponseWriter, r *http.Request) { 1641 1641 - user := s.oauth.GetMultiAccountUser(r) 1676 1676 + user := s.oauth.GetUser(r) 1642 1677 1643 1678 pull, ok := r.Context().Value("pull").(*models.Pull) 1644 1679 if !ok { ··· 1653 1688 return 1654 1689 } 1655 1690 1656 1656 - if user.Active.Did != pull.OwnerDid { 1691 1691 + if user.Did != pull.OwnerDid { 1657 1692 log.Println("unauthorized user") 1658 1693 w.WriteHeader(http.StatusUnauthorized) 1659 1694 return 1660 1695 } 1661 1696 1662 1662 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 1697 1697 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 1663 1698 if !roles.IsPushAllowed() { 1664 1699 log.Println("unauthorized user") 1665 1700 w.WriteHeader(http.StatusUnauthorized) ··· 1703 1738 } 1704 1739 1705 1740 func (s *Pulls) resubmitFork(w http.ResponseWriter, r *http.Request) { 1706 1706 - user := s.oauth.GetMultiAccountUser(r) 1741 1741 + user := s.oauth.GetUser(r) 1707 1742 1708 1743 pull, ok := r.Context().Value("pull").(*models.Pull) 1709 1744 if !ok { ··· 1718 1753 return 1719 1754 } 1720 1755 1721 1721 - if user.Active.Did != pull.OwnerDid { 1756 1756 + if user.Did != pull.OwnerDid { 1722 1757 log.Println("unauthorized user") 1723 1758 w.WriteHeader(http.StatusUnauthorized) 1724 1759 return ··· 1803 1838 w http.ResponseWriter, 1804 1839 r *http.Request, 1805 1840 repo *models.Repo, 1806 1806 - user *oauth.MultiAccountUser, 1841 1841 + user *oauth.User, 1807 1842 pull *models.Pull, 1808 1843 patch string, 1809 1844 combined string, ··· 1859 1894 return 1860 1895 } 1861 1896 1862 1862 - ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Active.Did, pull.Rkey) 1897 1897 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1863 1898 if err != nil { 1864 1899 // failed to get record 1865 1900 s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") 1866 1901 return 1867 1902 } 1868 1903 1869 1869 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 1904 1904 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 1870 1905 if err != nil { 1871 1906 log.Println("failed to upload patch blob", err) 1872 1907 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") ··· 1878 1913 1879 1914 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1880 1915 Collection: tangled.RepoPullNSID, 1881 1881 - Repo: user.Active.Did, 1916 1916 + Repo: user.Did, 1882 1917 Rkey: pull.Rkey, 1883 1918 SwapRecord: ex.Cid, 1884 1919 Record: &lexutil.LexiconTypeDecoder{ ··· 1905 1940 w http.ResponseWriter, 1906 1941 r *http.Request, 1907 1942 repo *models.Repo, 1908 1908 - user *oauth.MultiAccountUser, 1943 1943 + user *oauth.User, 1909 1944 pull *models.Pull, 1910 1945 patch string, 1911 1946 stackId string, ··· 2008 2043 return 2009 2044 } 2010 2045 2011 2011 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 2046 2046 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 2012 2047 if err != nil { 2013 2048 log.Println("failed to upload patch blob", err) 2014 2049 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") ··· 2050 2085 return 2051 2086 } 2052 2087 2053 2053 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 2088 2088 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 2054 2089 if err != nil { 2055 2090 log.Println("failed to upload patch blob", err) 2056 2091 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") ··· 2095 2130 } 2096 2131 2097 2132 _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ 2098 2098 - Repo: user.Active.Did, 2133 2133 + Repo: user.Did, 2099 2134 Writes: writes, 2100 2135 }) 2101 2136 if err != nil { ··· 2109 2144 } 2110 2145 2111 2146 func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) { 2112 2112 - user := s.oauth.GetMultiAccountUser(r) 2147 2147 + user := s.oauth.GetUser(r) 2113 2148 f, err := s.repoResolver.Resolve(r) 2114 2149 if err != nil { 2115 2150 log.Println("failed to resolve repo:", err) ··· 2220 2255 2221 2256 // notify about the pull merge 2222 2257 for _, p := range pullsToMerge { 2223 2223 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Active.Did), p) 2258 2258 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2224 2259 } 2225 2260 2226 2261 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) ··· 2228 2263 } 2229 2264 2230 2265 func (s *Pulls) ClosePull(w http.ResponseWriter, r *http.Request) { 2231 2231 - user := s.oauth.GetMultiAccountUser(r) 2266 2266 + user := s.oauth.GetUser(r) 2232 2267 2233 2268 f, err := s.repoResolver.Resolve(r) 2234 2269 if err != nil { ··· 2244 2279 } 2245 2280 2246 2281 // auth filter: only owner or collaborators can close 2247 2247 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 2282 2282 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 2248 2283 isOwner := roles.IsOwner() 2249 2284 isCollaborator := roles.IsCollaborator() 2250 2250 - isPullAuthor := user.Active.Did == pull.OwnerDid 2285 2285 + isPullAuthor := user.Did == pull.OwnerDid 2251 2286 isCloseAllowed := isOwner || isCollaborator || isPullAuthor 2252 2287 if !isCloseAllowed { 2253 2288 log.Println("failed to close pull") ··· 2293 2328 } 2294 2329 2295 2330 for _, p := range pullsToClose { 2296 2296 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Active.Did), p) 2331 2331 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2297 2332 } 2298 2333 2299 2334 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) ··· 2301 2336 } 2302 2337 2303 2338 func (s *Pulls) ReopenPull(w http.ResponseWriter, r *http.Request) { 2304 2304 - user := s.oauth.GetMultiAccountUser(r) 2339 2339 + user := s.oauth.GetUser(r) 2305 2340 2306 2341 f, err := s.repoResolver.Resolve(r) 2307 2342 if err != nil { ··· 2318 2353 } 2319 2354 2320 2355 // auth filter: only owner or collaborators can close 2321 2321 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 2356 2356 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 2322 2357 isOwner := roles.IsOwner() 2323 2358 isCollaborator := roles.IsCollaborator() 2324 2324 - isPullAuthor := user.Active.Did == pull.OwnerDid 2359 2359 + isPullAuthor := user.Did == pull.OwnerDid 2325 2360 isCloseAllowed := isOwner || isCollaborator || isPullAuthor 2326 2361 if !isCloseAllowed { 2327 2362 log.Println("failed to close pull") ··· 2367 2402 } 2368 2403 2369 2404 for _, p := range pullsToReopen { 2370 2370 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Active.Did), p) 2405 2405 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2371 2406 } 2372 2407 2373 2408 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 2374 2409 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId)) 2375 2410 } 2376 2411 2377 2377 - func (s *Pulls) newStack(ctx context.Context, repo *models.Repo, user *oauth.MultiAccountUser, targetBranch, patch string, pullSource *models.PullSource, stackId string) (models.Stack, error) { 2412 2412 + func (s *Pulls) newStack(ctx context.Context, repo *models.Repo, user *oauth.User, targetBranch, patch string, pullSource *models.PullSource, stackId string) (models.Stack, error) { 2378 2413 formatPatches, err := patchutil.ExtractPatches(patch) 2379 2414 if err != nil { 2380 2415 return nil, fmt.Errorf("Failed to extract patches: %v", err) ··· 2410 2445 Title: title, 2411 2446 Body: body, 2412 2447 TargetBranch: targetBranch, 2413 2413 - OwnerDid: user.Active.Did, 2448 2448 + OwnerDid: user.Did, 2414 2449 RepoAt: repo.RepoAt(), 2415 2450 Rkey: rkey, 2416 2451 Mentions: mentions, ··· 2433 2468 2434 2469 return stack, nil 2435 2470 } 2436 2436 - 2437 2437 - func gz(s string) io.Reader { 2438 2438 - var b bytes.Buffer 2439 2439 - w := gzip.NewWriter(&b) 2440 2440 - w.Write([]byte(s)) 2441 2441 - w.Close() 2442 2442 - return &b 2443 2443 - }

+6 -6

appview/repo/artifact.go

··· 30 30 31 31 // TODO: proper statuses here on early exit 32 32 func (rp *Repo) AttachArtifact(w http.ResponseWriter, r *http.Request) { 33 33 - user := rp.oauth.GetMultiAccountUser(r) 33 33 + user := rp.oauth.GetUser(r) 34 34 tagParam := chi.URLParam(r, "tag") 35 35 f, err := rp.repoResolver.Resolve(r) 36 36 if err != nil { ··· 75 75 76 76 putRecordResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 77 77 Collection: tangled.RepoArtifactNSID, 78 78 - Repo: user.Active.Did, 78 78 + Repo: user.Did, 79 79 Rkey: rkey, 80 80 Record: &lexutil.LexiconTypeDecoder{ 81 81 Val: &tangled.RepoArtifact{ ··· 104 104 defer tx.Rollback() 105 105 106 106 artifact := models.Artifact{ 107 107 - Did: user.Active.Did, 107 107 + Did: user.Did, 108 108 Rkey: rkey, 109 109 RepoAt: f.RepoAt(), 110 110 Tag: tag.Tag.Hash, ··· 220 220 221 221 // TODO: proper statuses here on early exit 222 222 func (rp *Repo) DeleteArtifact(w http.ResponseWriter, r *http.Request) { 223 223 - user := rp.oauth.GetMultiAccountUser(r) 223 223 + user := rp.oauth.GetUser(r) 224 224 tagParam := chi.URLParam(r, "tag") 225 225 filename := chi.URLParam(r, "file") 226 226 f, err := rp.repoResolver.Resolve(r) ··· 251 251 252 252 artifact := artifacts[0] 253 253 254 254 - if user.Active.Did != artifact.Did { 254 254 + if user.Did != artifact.Did { 255 255 log.Println("user not authorized to delete artifact", err) 256 256 rp.pages.Notice(w, "remove", "Unauthorized deletion of artifact.") 257 257 return ··· 259 259 260 260 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 261 261 Collection: tangled.RepoArtifactNSID, 262 262 - Repo: user.Active.Did, 262 262 + Repo: user.Did, 263 263 Rkey: artifact.Rkey, 264 264 }) 265 265 if err != nil {

+1 -1

appview/repo/blob.go

··· 76 76 // Create the blob view 77 77 blobView := NewBlobView(resp, rp.config, f, ref, filePath, r.URL.Query()) 78 78 79 79 - user := rp.oauth.GetMultiAccountUser(r) 79 79 + user := rp.oauth.GetUser(r) 80 80 81 81 rp.pages.RepoBlob(w, pages.RepoBlobParams{ 82 82 LoggedInUser: user,

+1 -1

appview/repo/branches.go

··· 43 43 return 44 44 } 45 45 sortBranches(result.Branches) 46 46 - user := rp.oauth.GetMultiAccountUser(r) 46 46 + user := rp.oauth.GetUser(r) 47 47 rp.pages.RepoBranches(w, pages.RepoBranchesParams{ 48 48 LoggedInUser: user, 49 49 RepoInfo: rp.repoResolver.GetRepoInfo(r, user),

+2 -2

appview/repo/compare.go

··· 20 20 func (rp *Repo) CompareNew(w http.ResponseWriter, r *http.Request) { 21 21 l := rp.logger.With("handler", "RepoCompareNew") 22 22 23 23 - user := rp.oauth.GetMultiAccountUser(r) 23 23 + user := rp.oauth.GetUser(r) 24 24 f, err := rp.repoResolver.Resolve(r) 25 25 if err != nil { 26 26 l.Error("failed to get repo and knot", "err", err) ··· 101 101 func (rp *Repo) Compare(w http.ResponseWriter, r *http.Request) { 102 102 l := rp.logger.With("handler", "RepoCompare") 103 103 104 104 - user := rp.oauth.GetMultiAccountUser(r) 104 104 + user := rp.oauth.GetUser(r) 105 105 f, err := rp.repoResolver.Resolve(r) 106 106 if err != nil { 107 107 l.Error("failed to get repo and knot", "err", err)

+3 -3

appview/repo/feed.go

··· 19 19 ) 20 20 21 21 func (rp *Repo) getRepoFeed(ctx context.Context, repo *models.Repo, ownerSlashRepo string) (*feeds.Feed, error) { 22 22 - feedPagePerType := pagination.Page{Limit: 100} 22 22 + const feedLimitPerType = 100 23 23 24 24 - pulls, err := db.GetPullsPaginated(rp.db, feedPagePerType, orm.FilterEq("repo_at", repo.RepoAt())) 24 24 + pulls, err := db.GetPullsWithLimit(rp.db, feedLimitPerType, orm.FilterEq("repo_at", repo.RepoAt())) 25 25 if err != nil { 26 26 return nil, err 27 27 } 28 28 29 29 issues, err := db.GetIssuesPaginated( 30 30 rp.db, 31 31 - feedPagePerType, 31 31 + pagination.Page{Limit: feedLimitPerType}, 32 32 orm.FilterEq("repo_at", repo.RepoAt()), 33 33 ) 34 34 if err != nil {

+1 -1

appview/repo/index.go

··· 51 51 Host: host, 52 52 } 53 53 54 54 - user := rp.oauth.GetMultiAccountUser(r) 54 54 + user := rp.oauth.GetUser(r) 55 55 56 56 // Build index response from multiple XRPC calls 57 57 result, err := rp.buildIndexResponse(r.Context(), xrpcc, f, ref)

+2 -2

appview/repo/log.go

··· 109 109 } 110 110 } 111 111 112 112 - user := rp.oauth.GetMultiAccountUser(r) 112 112 + user := rp.oauth.GetUser(r) 113 113 114 114 emailToDidMap, err := db.GetEmailToDid(rp.db, uniqueEmails(xrpcResp.Commits), true) 115 115 if err != nil { ··· 197 197 l.Error("failed to GetVerifiedCommits", "err", err) 198 198 } 199 199 200 200 - user := rp.oauth.GetMultiAccountUser(r) 200 200 + user := rp.oauth.GetUser(r) 201 201 pipelines, err := getPipelineStatuses(rp.db, f, []string{result.Diff.Commit.This}) 202 202 if err != nil { 203 203 l.Error("failed to getPipelineStatuses", "err", err)

+34 -34

appview/repo/repo.go

··· 81 81 82 82 // modify the spindle configured for this repo 83 83 func (rp *Repo) EditSpindle(w http.ResponseWriter, r *http.Request) { 84 84 - user := rp.oauth.GetMultiAccountUser(r) 84 84 + user := rp.oauth.GetUser(r) 85 85 l := rp.logger.With("handler", "EditSpindle") 86 86 - l = l.With("did", user.Active.Did) 86 86 + l = l.With("did", user.Did) 87 87 88 88 errorId := "operation-error" 89 89 fail := func(msg string, err error) { ··· 107 107 108 108 if !removingSpindle { 109 109 // ensure that this is a valid spindle for this user 110 110 - validSpindles, err := rp.enforcer.GetSpindlesForUser(user.Active.Did) 110 110 + validSpindles, err := rp.enforcer.GetSpindlesForUser(user.Did) 111 111 if err != nil { 112 112 fail("Failed to find spindles. Try again later.", err) 113 113 return ··· 168 168 } 169 169 170 170 func (rp *Repo) AddLabelDef(w http.ResponseWriter, r *http.Request) { 171 171 - user := rp.oauth.GetMultiAccountUser(r) 171 171 + user := rp.oauth.GetUser(r) 172 172 l := rp.logger.With("handler", "AddLabel") 173 173 - l = l.With("did", user.Active.Did) 173 173 + l = l.With("did", user.Did) 174 174 175 175 f, err := rp.repoResolver.Resolve(r) 176 176 if err != nil { ··· 216 216 } 217 217 218 218 label := models.LabelDefinition{ 219 219 - Did: user.Active.Did, 219 219 + Did: user.Did, 220 220 Rkey: tid.TID(), 221 221 Name: name, 222 222 ValueType: valueType, ··· 327 327 } 328 328 329 329 func (rp *Repo) DeleteLabelDef(w http.ResponseWriter, r *http.Request) { 330 330 - user := rp.oauth.GetMultiAccountUser(r) 330 330 + user := rp.oauth.GetUser(r) 331 331 l := rp.logger.With("handler", "DeleteLabel") 332 332 - l = l.With("did", user.Active.Did) 332 332 + l = l.With("did", user.Did) 333 333 334 334 f, err := rp.repoResolver.Resolve(r) 335 335 if err != nil { ··· 435 435 } 436 436 437 437 func (rp *Repo) SubscribeLabel(w http.ResponseWriter, r *http.Request) { 438 438 - user := rp.oauth.GetMultiAccountUser(r) 438 438 + user := rp.oauth.GetUser(r) 439 439 l := rp.logger.With("handler", "SubscribeLabel") 440 440 - l = l.With("did", user.Active.Did) 440 440 + l = l.With("did", user.Did) 441 441 442 442 f, err := rp.repoResolver.Resolve(r) 443 443 if err != nil { ··· 521 521 } 522 522 523 523 func (rp *Repo) UnsubscribeLabel(w http.ResponseWriter, r *http.Request) { 524 524 - user := rp.oauth.GetMultiAccountUser(r) 524 524 + user := rp.oauth.GetUser(r) 525 525 l := rp.logger.With("handler", "UnsubscribeLabel") 526 526 - l = l.With("did", user.Active.Did) 526 526 + l = l.With("did", user.Did) 527 527 528 528 f, err := rp.repoResolver.Resolve(r) 529 529 if err != nil { ··· 633 633 } 634 634 state := states[subject] 635 635 636 636 - user := rp.oauth.GetMultiAccountUser(r) 636 636 + user := rp.oauth.GetUser(r) 637 637 rp.pages.LabelPanel(w, pages.LabelPanelParams{ 638 638 LoggedInUser: user, 639 639 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), ··· 681 681 } 682 682 state := states[subject] 683 683 684 684 - user := rp.oauth.GetMultiAccountUser(r) 684 684 + user := rp.oauth.GetUser(r) 685 685 rp.pages.EditLabelPanel(w, pages.EditLabelPanelParams{ 686 686 LoggedInUser: user, 687 687 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), ··· 692 692 } 693 693 694 694 func (rp *Repo) AddCollaborator(w http.ResponseWriter, r *http.Request) { 695 695 - user := rp.oauth.GetMultiAccountUser(r) 695 695 + user := rp.oauth.GetUser(r) 696 696 l := rp.logger.With("handler", "AddCollaborator") 697 697 - l = l.With("did", user.Active.Did) 697 697 + l = l.With("did", user.Did) 698 698 699 699 f, err := rp.repoResolver.Resolve(r) 700 700 if err != nil { ··· 723 723 return 724 724 } 725 725 726 726 - if collaboratorIdent.DID.String() == user.Active.Did { 726 726 + if collaboratorIdent.DID.String() == user.Did { 727 727 fail("You seem to be adding yourself as a collaborator.", nil) 728 728 return 729 729 } ··· 738 738 } 739 739 740 740 // emit a record 741 741 - currentUser := rp.oauth.GetMultiAccountUser(r) 741 741 + currentUser := rp.oauth.GetUser(r) 742 742 rkey := tid.TID() 743 743 createdAt := time.Now() 744 744 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 745 745 Collection: tangled.RepoCollaboratorNSID, 746 746 - Repo: currentUser.Active.Did, 746 746 + Repo: currentUser.Did, 747 747 Rkey: rkey, 748 748 Record: &lexutil.LexiconTypeDecoder{ 749 749 Val: &tangled.RepoCollaborator{ ··· 792 792 } 793 793 794 794 err = db.AddCollaborator(tx, models.Collaborator{ 795 795 - Did: syntax.DID(currentUser.Active.Did), 795 795 + Did: syntax.DID(currentUser.Did), 796 796 Rkey: rkey, 797 797 SubjectDid: collaboratorIdent.DID, 798 798 RepoAt: f.RepoAt(), ··· 822 822 } 823 823 824 824 func (rp *Repo) DeleteRepo(w http.ResponseWriter, r *http.Request) { 825 825 - user := rp.oauth.GetMultiAccountUser(r) 825 825 + user := rp.oauth.GetUser(r) 826 826 l := rp.logger.With("handler", "DeleteRepo") 827 827 828 828 noticeId := "operation-error" ··· 840 840 } 841 841 _, err = comatproto.RepoDeleteRecord(r.Context(), atpClient, &comatproto.RepoDeleteRecord_Input{ 842 842 Collection: tangled.RepoNSID, 843 843 - Repo: user.Active.Did, 843 843 + Repo: user.Did, 844 844 Rkey: f.Rkey, 845 845 }) 846 846 if err != nil { ··· 940 940 ref := chi.URLParam(r, "ref") 941 941 ref, _ = url.PathUnescape(ref) 942 942 943 943 - user := rp.oauth.GetMultiAccountUser(r) 943 943 + user := rp.oauth.GetUser(r) 944 944 f, err := rp.repoResolver.Resolve(r) 945 945 if err != nil { 946 946 l.Error("failed to resolve source repo", "err", err) ··· 969 969 r.Context(), 970 970 client, 971 971 &tangled.RepoForkSync_Input{ 972 972 - Did: user.Active.Did, 972 972 + Did: user.Did, 973 973 Name: f.Name, 974 974 Source: f.Source, 975 975 Branch: ref, ··· 988 988 func (rp *Repo) ForkRepo(w http.ResponseWriter, r *http.Request) { 989 989 l := rp.logger.With("handler", "ForkRepo") 990 990 991 991 - user := rp.oauth.GetMultiAccountUser(r) 991 991 + user := rp.oauth.GetUser(r) 992 992 f, err := rp.repoResolver.Resolve(r) 993 993 if err != nil { 994 994 l.Error("failed to resolve source repo", "err", err) ··· 997 997 998 998 switch r.Method { 999 999 case http.MethodGet: 1000 1000 - user := rp.oauth.GetMultiAccountUser(r) 1001 1001 - knots, err := rp.enforcer.GetKnotsForUser(user.Active.Did) 1000 1000 + user := rp.oauth.GetUser(r) 1001 1001 + knots, err := rp.enforcer.GetKnotsForUser(user.Did) 1002 1002 if err != nil { 1003 1003 rp.pages.Notice(w, "repo", "Invalid user account.") 1004 1004 return ··· 1020 1020 } 1021 1021 l = l.With("targetKnot", targetKnot) 1022 1022 1023 1023 - ok, err := rp.enforcer.E.Enforce(user.Active.Did, targetKnot, targetKnot, "repo:create") 1023 1023 + ok, err := rp.enforcer.E.Enforce(user.Did, targetKnot, targetKnot, "repo:create") 1024 1024 if err != nil || !ok { 1025 1025 rp.pages.Notice(w, "repo", "You do not have permission to create a repo in this knot.") 1026 1026 return ··· 1037 1037 // in the user's account. 1038 1038 existingRepo, err := db.GetRepo( 1039 1039 rp.db, 1040 1040 - orm.FilterEq("did", user.Active.Did), 1040 1040 + orm.FilterEq("did", user.Did), 1041 1041 orm.FilterEq("name", forkName), 1042 1042 ) 1043 1043 if err != nil { ··· 1066 1066 // create an atproto record for this fork 1067 1067 rkey := tid.TID() 1068 1068 repo := &models.Repo{ 1069 1069 - Did: user.Active.Did, 1069 1069 + Did: user.Did, 1070 1070 Name: forkName, 1071 1071 Knot: targetKnot, 1072 1072 Rkey: rkey, ··· 1086 1086 1087 1087 atresp, err := comatproto.RepoPutRecord(r.Context(), atpClient, &comatproto.RepoPutRecord_Input{ 1088 1088 Collection: tangled.RepoNSID, 1089 1089 - Repo: user.Active.Did, 1089 1089 + Repo: user.Did, 1090 1090 Rkey: rkey, 1091 1091 Record: &lexutil.LexiconTypeDecoder{ 1092 1092 Val: &record, ··· 1165 1165 } 1166 1166 1167 1167 // acls 1168 1168 - p, _ := securejoin.SecureJoin(user.Active.Did, forkName) 1169 1169 - err = rp.enforcer.AddRepo(user.Active.Did, targetKnot, p) 1168 1168 + p, _ := securejoin.SecureJoin(user.Did, forkName) 1169 1169 + err = rp.enforcer.AddRepo(user.Did, targetKnot, p) 1170 1170 if err != nil { 1171 1171 l.Error("failed to add ACLs", "err", err) 1172 1172 rp.pages.Notice(w, "repo", "Failed to set up repository permissions.") ··· 1191 1191 aturi = "" 1192 1192 1193 1193 rp.notifier.NewRepo(r.Context(), repo) 1194 1194 - rp.pages.HxLocation(w, fmt.Sprintf("/%s/%s", user.Active.Did, forkName)) 1194 1194 + rp.pages.HxLocation(w, fmt.Sprintf("/%s/%s", user.Did, forkName)) 1195 1195 } 1196 1196 } 1197 1197

+5 -5

appview/repo/settings.go

··· 79 79 } 80 80 81 81 func (rp *Repo) Secrets(w http.ResponseWriter, r *http.Request) { 82 82 - user := rp.oauth.GetMultiAccountUser(r) 82 82 + user := rp.oauth.GetUser(r) 83 83 l := rp.logger.With("handler", "Secrets") 84 84 - l = l.With("did", user.Active.Did) 84 84 + l = l.With("did", user.Did) 85 85 86 86 f, err := rp.repoResolver.Resolve(r) 87 87 if err != nil { ··· 185 185 l := rp.logger.With("handler", "generalSettings") 186 186 187 187 f, err := rp.repoResolver.Resolve(r) 188 188 - user := rp.oauth.GetMultiAccountUser(r) 188 188 + user := rp.oauth.GetUser(r) 189 189 190 190 scheme := "http" 191 191 if !rp.config.Core.Dev { ··· 271 271 l := rp.logger.With("handler", "accessSettings") 272 272 273 273 f, err := rp.repoResolver.Resolve(r) 274 274 - user := rp.oauth.GetMultiAccountUser(r) 274 274 + user := rp.oauth.GetUser(r) 275 275 276 276 collaborators, err := func(repo *models.Repo) ([]pages.Collaborator, error) { 277 277 repoCollaborators, err := rp.enforcer.E.GetImplicitUsersForResourceByDomain(repo.DidSlashRepo(), repo.Knot) ··· 318 318 l := rp.logger.With("handler", "pipelineSettings") 319 319 320 320 f, err := rp.repoResolver.Resolve(r) 321 321 - user := rp.oauth.GetMultiAccountUser(r) 321 321 + user := rp.oauth.GetUser(r) 322 322 323 323 // all spindles that the repo owner is a member of 324 324 spindles, err := rp.enforcer.GetSpindlesForUser(f.Did)

+1 -1

appview/repo/tags.go

··· 69 69 danglingArtifacts = append(danglingArtifacts, a) 70 70 } 71 71 } 72 72 - user := rp.oauth.GetMultiAccountUser(r) 72 72 + user := rp.oauth.GetUser(r) 73 73 rp.pages.RepoTags(w, pages.RepoTagsParams{ 74 74 LoggedInUser: user, 75 75 RepoInfo: rp.repoResolver.GetRepoInfo(r, user),

+1 -1

appview/repo/tree.go

··· 88 88 http.Redirect(w, r, redirectTo, http.StatusFound) 89 89 return 90 90 } 91 91 - user := rp.oauth.GetMultiAccountUser(r) 91 91 + user := rp.oauth.GetUser(r) 92 92 var breadcrumbs [][]string 93 93 breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", ownerSlashRepo, url.PathEscape(ref))}) 94 94 if treePath != "" {

+4 -4

appview/reporesolver/resolver.go

··· 55 55 // 2. [x] remove `rr`, `CurrentDir`, `Ref` fields from `ResolvedRepo` 56 56 // 3. [x] remove `ResolvedRepo` 57 57 // 4. [ ] replace reporesolver to reposervice 58 58 - func (rr *RepoResolver) GetRepoInfo(r *http.Request, user *oauth.MultiAccountUser) repoinfo.RepoInfo { 58 58 + func (rr *RepoResolver) GetRepoInfo(r *http.Request, user *oauth.User) repoinfo.RepoInfo { 59 59 ownerId, ook := r.Context().Value("resolvedId").(identity.Identity) 60 60 repo, rok := r.Context().Value("repo").(*models.Repo) 61 61 if !ook || !rok { ··· 69 69 repoAt := repo.RepoAt() 70 70 isStarred := false 71 71 roles := repoinfo.RolesInRepo{} 72 72 - if user != nil && user.Active != nil { 73 73 - isStarred = db.GetStarStatus(rr.execer, user.Active.Did, repoAt) 74 74 - roles.Roles = rr.enforcer.GetPermissionsInRepo(user.Active.Did, repo.Knot, repo.DidSlashRepo()) 72 72 + if user != nil { 73 73 + isStarred = db.GetStarStatus(rr.execer, user.Did, repoAt) 74 74 + roles.Roles = rr.enforcer.GetPermissionsInRepo(user.Did, repo.Knot, repo.DidSlashRepo()) 75 75 } 76 76 77 77 stats := repo.RepoStats

+6 -6

appview/settings/settings.go

··· 81 81 } 82 82 83 83 func (s *Settings) profileSettings(w http.ResponseWriter, r *http.Request) { 84 84 - user := s.OAuth.GetMultiAccountUser(r) 84 84 + user := s.OAuth.GetUser(r) 85 85 86 86 s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ 87 87 LoggedInUser: user, ··· 91 91 } 92 92 93 93 func (s *Settings) notificationsSettings(w http.ResponseWriter, r *http.Request) { 94 94 - user := s.OAuth.GetMultiAccountUser(r) 94 94 + user := s.OAuth.GetUser(r) 95 95 did := s.OAuth.GetDid(r) 96 96 97 97 prefs, err := db.GetNotificationPreference(s.Db, did) ··· 137 137 } 138 138 139 139 func (s *Settings) keysSettings(w http.ResponseWriter, r *http.Request) { 140 140 - user := s.OAuth.GetMultiAccountUser(r) 141 141 - pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Active.Did) 140 140 + user := s.OAuth.GetUser(r) 141 141 + pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Did) 142 142 if err != nil { 143 143 log.Println(err) 144 144 } ··· 152 152 } 153 153 154 154 func (s *Settings) emailsSettings(w http.ResponseWriter, r *http.Request) { 155 155 - user := s.OAuth.GetMultiAccountUser(r) 156 156 - emails, err := db.GetAllEmails(s.Db, user.Active.Did) 155 155 + user := s.OAuth.GetUser(r) 156 156 + emails, err := db.GetAllEmails(s.Db, user.Did) 157 157 if err != nil { 158 158 log.Println(err) 159 159 }

+41 -41

appview/spindles/spindles.go

··· 69 69 } 70 70 71 71 func (s *Spindles) spindles(w http.ResponseWriter, r *http.Request) { 72 72 - user := s.OAuth.GetMultiAccountUser(r) 72 72 + user := s.OAuth.GetUser(r) 73 73 all, err := db.GetSpindles( 74 74 s.Db, 75 75 - orm.FilterEq("owner", user.Active.Did), 75 75 + orm.FilterEq("owner", user.Did), 76 76 ) 77 77 if err != nil { 78 78 s.Logger.Error("failed to fetch spindles", "err", err) ··· 91 91 func (s *Spindles) dashboard(w http.ResponseWriter, r *http.Request) { 92 92 l := s.Logger.With("handler", "dashboard") 93 93 94 94 - user := s.OAuth.GetMultiAccountUser(r) 95 95 - l = l.With("user", user.Active.Did) 94 94 + user := s.OAuth.GetUser(r) 95 95 + l = l.With("user", user.Did) 96 96 97 97 instance := chi.URLParam(r, "instance") 98 98 if instance == "" { ··· 103 103 spindles, err := db.GetSpindles( 104 104 s.Db, 105 105 orm.FilterEq("instance", instance), 106 106 - orm.FilterEq("owner", user.Active.Did), 106 106 + orm.FilterEq("owner", user.Did), 107 107 orm.FilterIsNot("verified", "null"), 108 108 ) 109 109 if err != nil || len(spindles) != 1 { ··· 155 155 // 156 156 // if the spindle is not up yet, the user is free to retry verification at a later point 157 157 func (s *Spindles) register(w http.ResponseWriter, r *http.Request) { 158 158 - user := s.OAuth.GetMultiAccountUser(r) 158 158 + user := s.OAuth.GetUser(r) 159 159 l := s.Logger.With("handler", "register") 160 160 161 161 noticeId := "register-error" ··· 176 176 return 177 177 } 178 178 l = l.With("instance", instance) 179 179 - l = l.With("user", user.Active.Did) 179 179 + l = l.With("user", user.Did) 180 180 181 181 tx, err := s.Db.Begin() 182 182 if err != nil { ··· 190 190 }() 191 191 192 192 err = db.AddSpindle(tx, models.Spindle{ 193 193 - Owner: syntax.DID(user.Active.Did), 193 193 + Owner: syntax.DID(user.Did), 194 194 Instance: instance, 195 195 }) 196 196 if err != nil { ··· 214 214 return 215 215 } 216 216 217 217 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.SpindleNSID, user.Active.Did, instance) 217 217 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.SpindleNSID, user.Did, instance) 218 218 var exCid *string 219 219 if ex != nil { 220 220 exCid = ex.Cid ··· 223 223 // re-announce by registering under same rkey 224 224 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 225 225 Collection: tangled.SpindleNSID, 226 226 - Repo: user.Active.Did, 226 226 + Repo: user.Did, 227 227 Rkey: instance, 228 228 Record: &lexutil.LexiconTypeDecoder{ 229 229 Val: &tangled.Spindle{ ··· 254 254 } 255 255 256 256 // begin verification 257 257 - err = serververify.RunVerification(r.Context(), instance, user.Active.Did, s.Config.Core.Dev) 257 257 + err = serververify.RunVerification(r.Context(), instance, user.Did, s.Config.Core.Dev) 258 258 if err != nil { 259 259 l.Error("verification failed", "err", err) 260 260 s.Pages.HxRefresh(w) 261 261 return 262 262 } 263 263 264 264 - _, err = serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Active.Did) 264 264 + _, err = serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Did) 265 265 if err != nil { 266 266 l.Error("failed to mark verified", "err", err) 267 267 s.Pages.HxRefresh(w) ··· 273 273 } 274 274 275 275 func (s *Spindles) delete(w http.ResponseWriter, r *http.Request) { 276 276 - user := s.OAuth.GetMultiAccountUser(r) 276 276 + user := s.OAuth.GetUser(r) 277 277 l := s.Logger.With("handler", "delete") 278 278 279 279 noticeId := "operation-error" ··· 291 291 292 292 spindles, err := db.GetSpindles( 293 293 s.Db, 294 294 - orm.FilterEq("owner", user.Active.Did), 294 294 + orm.FilterEq("owner", user.Did), 295 295 orm.FilterEq("instance", instance), 296 296 ) 297 297 if err != nil || len(spindles) != 1 { ··· 300 300 return 301 301 } 302 302 303 303 - if string(spindles[0].Owner) != user.Active.Did { 304 304 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 303 303 + if string(spindles[0].Owner) != user.Did { 304 304 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 305 305 s.Pages.Notice(w, noticeId, "Failed to delete spindle, unauthorized deletion attempt.") 306 306 return 307 307 } ··· 320 320 // remove spindle members first 321 321 err = db.RemoveSpindleMember( 322 322 tx, 323 323 - orm.FilterEq("did", user.Active.Did), 323 323 + orm.FilterEq("did", user.Did), 324 324 orm.FilterEq("instance", instance), 325 325 ) 326 326 if err != nil { ··· 331 331 332 332 err = db.DeleteSpindle( 333 333 tx, 334 334 - orm.FilterEq("owner", user.Active.Did), 334 334 + orm.FilterEq("owner", user.Did), 335 335 orm.FilterEq("instance", instance), 336 336 ) 337 337 if err != nil { ··· 359 359 360 360 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 361 361 Collection: tangled.SpindleNSID, 362 362 - Repo: user.Active.Did, 362 362 + Repo: user.Did, 363 363 Rkey: instance, 364 364 }) 365 365 if err != nil { ··· 391 391 } 392 392 393 393 func (s *Spindles) retry(w http.ResponseWriter, r *http.Request) { 394 394 - user := s.OAuth.GetMultiAccountUser(r) 394 394 + user := s.OAuth.GetUser(r) 395 395 l := s.Logger.With("handler", "retry") 396 396 397 397 noticeId := "operation-error" ··· 407 407 return 408 408 } 409 409 l = l.With("instance", instance) 410 410 - l = l.With("user", user.Active.Did) 410 410 + l = l.With("user", user.Did) 411 411 412 412 spindles, err := db.GetSpindles( 413 413 s.Db, 414 414 - orm.FilterEq("owner", user.Active.Did), 414 414 + orm.FilterEq("owner", user.Did), 415 415 orm.FilterEq("instance", instance), 416 416 ) 417 417 if err != nil || len(spindles) != 1 { ··· 420 420 return 421 421 } 422 422 423 423 - if string(spindles[0].Owner) != user.Active.Did { 424 424 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 423 423 + if string(spindles[0].Owner) != user.Did { 424 424 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 425 425 s.Pages.Notice(w, noticeId, "Failed to verify spindle, unauthorized verification attempt.") 426 426 return 427 427 } 428 428 429 429 // begin verification 430 430 - err = serververify.RunVerification(r.Context(), instance, user.Active.Did, s.Config.Core.Dev) 430 430 + err = serververify.RunVerification(r.Context(), instance, user.Did, s.Config.Core.Dev) 431 431 if err != nil { 432 432 l.Error("verification failed", "err", err) 433 433 ··· 445 445 return 446 446 } 447 447 448 448 - rowId, err := serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Active.Did) 448 448 + rowId, err := serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Did) 449 449 if err != nil { 450 450 l.Error("failed to mark verified", "err", err) 451 451 s.Pages.Notice(w, noticeId, err.Error()) ··· 473 473 } 474 474 475 475 func (s *Spindles) addMember(w http.ResponseWriter, r *http.Request) { 476 476 - user := s.OAuth.GetMultiAccountUser(r) 476 476 + user := s.OAuth.GetUser(r) 477 477 l := s.Logger.With("handler", "addMember") 478 478 479 479 instance := chi.URLParam(r, "instance") ··· 483 483 return 484 484 } 485 485 l = l.With("instance", instance) 486 486 - l = l.With("user", user.Active.Did) 486 486 + l = l.With("user", user.Did) 487 487 488 488 spindles, err := db.GetSpindles( 489 489 s.Db, 490 490 - orm.FilterEq("owner", user.Active.Did), 490 490 + orm.FilterEq("owner", user.Did), 491 491 orm.FilterEq("instance", instance), 492 492 ) 493 493 if err != nil || len(spindles) != 1 { ··· 502 502 s.Pages.Notice(w, noticeId, defaultErr) 503 503 } 504 504 505 505 - if string(spindles[0].Owner) != user.Active.Did { 506 506 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 505 505 + if string(spindles[0].Owner) != user.Did { 506 506 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 507 507 s.Pages.Notice(w, noticeId, "Failed to add member, unauthorized attempt.") 508 508 return 509 509 } ··· 552 552 553 553 // add member to db 554 554 if err = db.AddSpindleMember(tx, models.SpindleMember{ 555 555 - Did: syntax.DID(user.Active.Did), 555 555 + Did: syntax.DID(user.Did), 556 556 Rkey: rkey, 557 557 Instance: instance, 558 558 Subject: memberId.DID, ··· 570 570 571 571 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 572 572 Collection: tangled.SpindleMemberNSID, 573 573 - Repo: user.Active.Did, 573 573 + Repo: user.Did, 574 574 Rkey: rkey, 575 575 Record: &lexutil.LexiconTypeDecoder{ 576 576 Val: &tangled.SpindleMember{ ··· 603 603 } 604 604 605 605 func (s *Spindles) removeMember(w http.ResponseWriter, r *http.Request) { 606 606 - user := s.OAuth.GetMultiAccountUser(r) 606 606 + user := s.OAuth.GetUser(r) 607 607 l := s.Logger.With("handler", "removeMember") 608 608 609 609 noticeId := "operation-error" ··· 619 619 return 620 620 } 621 621 l = l.With("instance", instance) 622 622 - l = l.With("user", user.Active.Did) 622 622 + l = l.With("user", user.Did) 623 623 624 624 spindles, err := db.GetSpindles( 625 625 s.Db, 626 626 - orm.FilterEq("owner", user.Active.Did), 626 626 + orm.FilterEq("owner", user.Did), 627 627 orm.FilterEq("instance", instance), 628 628 ) 629 629 if err != nil || len(spindles) != 1 { ··· 632 632 return 633 633 } 634 634 635 635 - if string(spindles[0].Owner) != user.Active.Did { 636 636 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 635 635 + if string(spindles[0].Owner) != user.Did { 636 636 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 637 637 s.Pages.Notice(w, noticeId, "Failed to remove member, unauthorized attempt.") 638 638 return 639 639 } ··· 668 668 // get the record from the DB first: 669 669 members, err := db.GetSpindleMembers( 670 670 s.Db, 671 671 - orm.FilterEq("did", user.Active.Did), 671 671 + orm.FilterEq("did", user.Did), 672 672 orm.FilterEq("instance", instance), 673 673 orm.FilterEq("subject", memberId.DID), 674 674 ) ··· 681 681 // remove from db 682 682 if err = db.RemoveSpindleMember( 683 683 tx, 684 684 - orm.FilterEq("did", user.Active.Did), 684 684 + orm.FilterEq("did", user.Did), 685 685 orm.FilterEq("instance", instance), 686 686 orm.FilterEq("subject", memberId.DID), 687 687 ); err != nil { ··· 707 707 // remove from pds 708 708 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 709 709 Collection: tangled.SpindleMemberNSID, 710 710 - Repo: user.Active.Did, 710 710 + Repo: user.Did, 711 711 Rkey: members[0].Rkey, 712 712 }) 713 713 if err != nil {

-83

appview/state/accounts.go

··· 1 1 - package state 2 2 - 3 3 - import ( 4 4 - "net/http" 5 5 - 6 6 - "github.com/go-chi/chi/v5" 7 7 - ) 8 8 - 9 9 - func (s *State) SwitchAccount(w http.ResponseWriter, r *http.Request) { 10 10 - l := s.logger.With("handler", "SwitchAccount") 11 11 - 12 12 - if err := r.ParseForm(); err != nil { 13 13 - l.Error("failed to parse form", "err", err) 14 14 - http.Error(w, "invalid request", http.StatusBadRequest) 15 15 - return 16 16 - } 17 17 - 18 18 - did := r.FormValue("did") 19 19 - if did == "" { 20 20 - http.Error(w, "missing did", http.StatusBadRequest) 21 21 - return 22 22 - } 23 23 - 24 24 - if err := s.oauth.SwitchAccount(w, r, did); err != nil { 25 25 - l.Error("failed to switch account", "err", err) 26 26 - s.pages.HxRedirect(w, "/login?error=session") 27 27 - return 28 28 - } 29 29 - 30 30 - l.Info("switched account", "did", did) 31 31 - s.pages.HxRedirect(w, "/") 32 32 - } 33 33 - 34 34 - func (s *State) RemoveAccount(w http.ResponseWriter, r *http.Request) { 35 35 - l := s.logger.With("handler", "RemoveAccount") 36 36 - 37 37 - did := chi.URLParam(r, "did") 38 38 - if did == "" { 39 39 - http.Error(w, "missing did", http.StatusBadRequest) 40 40 - return 41 41 - } 42 42 - 43 43 - currentUser := s.oauth.GetMultiAccountUser(r) 44 44 - isCurrentAccount := currentUser != nil && currentUser.Active.Did == did 45 45 - 46 46 - var remainingAccounts []string 47 47 - if currentUser != nil { 48 48 - for _, acc := range currentUser.Accounts { 49 49 - if acc.Did != did { 50 50 - remainingAccounts = append(remainingAccounts, acc.Did) 51 51 - } 52 52 - } 53 53 - } 54 54 - 55 55 - if err := s.oauth.RemoveAccount(w, r, did); err != nil { 56 56 - l.Error("failed to remove account", "err", err) 57 57 - http.Error(w, "failed to remove account", http.StatusInternalServerError) 58 58 - return 59 59 - } 60 60 - 61 61 - l.Info("removed account", "did", did) 62 62 - 63 63 - if isCurrentAccount { 64 64 - if len(remainingAccounts) > 0 { 65 65 - nextDid := remainingAccounts[0] 66 66 - if err := s.oauth.SwitchAccount(w, r, nextDid); err != nil { 67 67 - l.Error("failed to switch to next account", "err", err) 68 68 - s.pages.HxRedirect(w, "/login") 69 69 - return 70 70 - } 71 71 - s.pages.HxRefresh(w) 72 72 - return 73 73 - } 74 74 - 75 75 - if err := s.oauth.DeleteSession(w, r); err != nil { 76 76 - l.Error("failed to delete session", "err", err) 77 77 - } 78 78 - s.pages.HxRedirect(w, "/login") 79 79 - return 80 80 - } 81 81 - 82 82 - s.pages.HxRefresh(w) 83 83 - }

+7 -7

appview/state/follow.go

··· 15 15 ) 16 16 17 17 func (s *State) Follow(w http.ResponseWriter, r *http.Request) { 18 18 - currentUser := s.oauth.GetMultiAccountUser(r) 18 18 + currentUser := s.oauth.GetUser(r) 19 19 20 20 subject := r.URL.Query().Get("subject") 21 21 if subject == "" { ··· 29 29 return 30 30 } 31 31 32 32 - if currentUser.Active.Did == subjectIdent.DID.String() { 32 32 + if currentUser.Did == subjectIdent.DID.String() { 33 33 log.Println("cant follow or unfollow yourself") 34 34 return 35 35 } ··· 46 46 rkey := tid.TID() 47 47 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 48 48 Collection: tangled.GraphFollowNSID, 49 49 - Repo: currentUser.Active.Did, 49 49 + Repo: currentUser.Did, 50 50 Rkey: rkey, 51 51 Record: &lexutil.LexiconTypeDecoder{ 52 52 Val: &tangled.GraphFollow{ ··· 62 62 log.Println("created atproto record: ", resp.Uri) 63 63 64 64 follow := &models.Follow{ 65 65 - UserDid: currentUser.Active.Did, 65 65 + UserDid: currentUser.Did, 66 66 SubjectDid: subjectIdent.DID.String(), 67 67 Rkey: rkey, 68 68 } ··· 89 89 return 90 90 case http.MethodDelete: 91 91 // find the record in the db 92 92 - follow, err := db.GetFollow(s.db, currentUser.Active.Did, subjectIdent.DID.String()) 92 92 + follow, err := db.GetFollow(s.db, currentUser.Did, subjectIdent.DID.String()) 93 93 if err != nil { 94 94 log.Println("failed to get follow relationship") 95 95 return ··· 97 97 98 98 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 99 99 Collection: tangled.GraphFollowNSID, 100 100 - Repo: currentUser.Active.Did, 100 100 + Repo: currentUser.Did, 101 101 Rkey: follow.Rkey, 102 102 }) 103 103 ··· 106 106 return 107 107 } 108 108 109 109 - err = db.DeleteFollowByRkey(s.db, currentUser.Active.Did, follow.Rkey) 109 109 + err = db.DeleteFollowByRkey(s.db, currentUser.Did, follow.Rkey) 110 110 if err != nil { 111 111 log.Println("failed to delete follow from DB") 112 112 // this is not an issue, the firehose event might have already done this

+1 -1

appview/state/gfi.go

··· 15 15 ) 16 16 17 17 func (s *State) GoodFirstIssues(w http.ResponseWriter, r *http.Request) { 18 18 - user := s.oauth.GetMultiAccountUser(r) 18 18 + user := s.oauth.GetUser(r) 19 19 20 20 page := pagination.FromContext(r.Context()) 21 21

+7 -57

appview/state/login.go

··· 5 5 "net/http" 6 6 "strings" 7 7 8 8 - "tangled.org/core/appview/oauth" 9 8 "tangled.org/core/appview/pages" 10 9 ) 11 10 ··· 16 15 case http.MethodGet: 17 16 returnURL := r.URL.Query().Get("return_url") 18 17 errorCode := r.URL.Query().Get("error") 19 19 - addAccount := r.URL.Query().Get("mode") == "add_account" 20 20 - 21 21 - user := s.oauth.GetMultiAccountUser(r) 22 22 - if user == nil { 23 23 - registry := s.oauth.GetAccounts(r) 24 24 - if len(registry.Accounts) > 0 { 25 25 - user = &oauth.MultiAccountUser{ 26 26 - Active: nil, 27 27 - Accounts: registry.Accounts, 28 28 - } 29 29 - } 30 30 - } 31 18 s.pages.Login(w, pages.LoginParams{ 32 32 - ReturnUrl: returnURL, 33 33 - ErrorCode: errorCode, 34 34 - AddAccount: addAccount, 35 35 - LoggedInUser: user, 19 19 + ReturnUrl: returnURL, 20 20 + ErrorCode: errorCode, 36 21 }) 37 22 case http.MethodPost: 38 23 handle := r.FormValue("handle") 39 39 - returnURL := r.FormValue("return_url") 40 40 - addAccount := r.FormValue("add_account") == "true" 41 24 42 25 // when users copy their handle from bsky.app, it tends to have these characters around it: 43 26 // ··· 61 44 return 62 45 } 63 46 64 64 - if err := s.oauth.SetAuthReturn(w, r, returnURL, addAccount); err != nil { 65 65 - l.Error("failed to set auth return", "err", err) 66 66 - } 67 67 - 68 47 redirectURL, err := s.oauth.ClientApp.StartAuthFlow(r.Context(), handle) 69 48 if err != nil { 70 49 l.Error("failed to start auth", "err", err) ··· 79 58 func (s *State) Logout(w http.ResponseWriter, r *http.Request) { 80 59 l := s.logger.With("handler", "Logout") 81 60 82 82 - currentUser := s.oauth.GetMultiAccountUser(r) 83 83 - if currentUser == nil || currentUser.Active == nil { 84 84 - s.pages.HxRedirect(w, "/login") 85 85 - return 86 86 - } 87 87 - 88 88 - currentDid := currentUser.Active.Did 89 89 - 90 90 - var remainingAccounts []string 91 91 - for _, acc := range currentUser.Accounts { 92 92 - if acc.Did != currentDid { 93 93 - remainingAccounts = append(remainingAccounts, acc.Did) 94 94 - } 95 95 - } 96 96 - 97 97 - if err := s.oauth.RemoveAccount(w, r, currentDid); err != nil { 98 98 - l.Error("failed to remove account from registry", "err", err) 99 99 - } 100 100 - 101 101 - if err := s.oauth.DeleteSession(w, r); err != nil { 102 102 - l.Error("failed to delete session", "err", err) 103 103 - } 104 104 - 105 105 - if len(remainingAccounts) > 0 { 106 106 - nextDid := remainingAccounts[0] 107 107 - if err := s.oauth.SwitchAccount(w, r, nextDid); err != nil { 108 108 - l.Error("failed to switch to next account", "err", err) 109 109 - s.pages.HxRedirect(w, "/login") 110 110 - return 111 111 - } 112 112 - l.Info("switched to next account after logout", "did", nextDid) 113 113 - s.pages.HxRefresh(w) 114 114 - return 61 61 + err := s.oauth.DeleteSession(w, r) 62 62 + if err != nil { 63 63 + l.Error("failed to logout", "err", err) 64 64 + } else { 65 65 + l.Info("logged out successfully") 115 66 } 116 67 117 117 - l.Info("logged out last account") 118 68 s.pages.HxRedirect(w, "/login") 119 69 }

+32 -32

appview/state/profile.go

··· 77 77 return nil, fmt.Errorf("failed to get follower stats: %w", err) 78 78 } 79 79 80 80 - loggedInUser := s.oauth.GetMultiAccountUser(r) 80 80 + loggedInUser := s.oauth.GetUser(r) 81 81 followStatus := models.IsNotFollowing 82 82 if loggedInUser != nil { 83 83 - followStatus = db.GetFollowStatus(s.db, loggedInUser.Active.Did, did) 83 83 + followStatus = db.GetFollowStatus(s.db, loggedInUser.Did, did) 84 84 } 85 85 86 86 now := time.Now() ··· 174 174 } 175 175 176 176 s.pages.ProfileOverview(w, pages.ProfileOverviewParams{ 177 177 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 177 177 + LoggedInUser: s.oauth.GetUser(r), 178 178 Card: profile, 179 179 Repos: pinnedRepos, 180 180 CollaboratingRepos: pinnedCollaboratingRepos, ··· 205 205 } 206 206 207 207 err = s.pages.ProfileRepos(w, pages.ProfileReposParams{ 208 208 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 208 208 + LoggedInUser: s.oauth.GetUser(r), 209 209 Repos: repos, 210 210 Card: profile, 211 211 }) ··· 234 234 } 235 235 236 236 err = s.pages.ProfileStarred(w, pages.ProfileStarredParams{ 237 237 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 237 237 + LoggedInUser: s.oauth.GetUser(r), 238 238 Repos: repos, 239 239 Card: profile, 240 240 }) ··· 259 259 } 260 260 261 261 err = s.pages.ProfileStrings(w, pages.ProfileStringsParams{ 262 262 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 262 262 + LoggedInUser: s.oauth.GetUser(r), 263 263 Strings: strings, 264 264 Card: profile, 265 265 }) ··· 283 283 } 284 284 l = l.With("profileDid", profile.UserDid) 285 285 286 286 - loggedInUser := s.oauth.GetMultiAccountUser(r) 286 286 + loggedInUser := s.oauth.GetUser(r) 287 287 params := FollowsPageParams{ 288 288 Card: profile, 289 289 } ··· 316 316 317 317 loggedInUserFollowing := make(map[string]struct{}) 318 318 if loggedInUser != nil { 319 319 - following, err := db.GetFollowing(s.db, loggedInUser.Active.Did) 319 319 + following, err := db.GetFollowing(s.db, loggedInUser.Did) 320 320 if err != nil { 321 321 - l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Active.Did) 321 321 + l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Did) 322 322 return &params, err 323 323 } 324 324 loggedInUserFollowing = make(map[string]struct{}, len(following)) ··· 333 333 followStatus := models.IsNotFollowing 334 334 if _, exists := loggedInUserFollowing[did]; exists { 335 335 followStatus = models.IsFollowing 336 336 - } else if loggedInUser != nil && loggedInUser.Active.Did == did { 336 336 + } else if loggedInUser != nil && loggedInUser.Did == did { 337 337 followStatus = models.IsSelf 338 338 } 339 339 ··· 367 367 } 368 368 369 369 s.pages.ProfileFollowers(w, pages.ProfileFollowersParams{ 370 370 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 370 370 + LoggedInUser: s.oauth.GetUser(r), 371 371 Followers: followPage.Follows, 372 372 Card: followPage.Card, 373 373 }) ··· 381 381 } 382 382 383 383 s.pages.ProfileFollowing(w, pages.ProfileFollowingParams{ 384 384 - LoggedInUser: s.oauth.GetMultiAccountUser(r), 384 384 + LoggedInUser: s.oauth.GetUser(r), 385 385 Following: followPage.Follows, 386 386 Card: followPage.Card, 387 387 }) ··· 530 530 } 531 531 532 532 func (s *State) UpdateProfileBio(w http.ResponseWriter, r *http.Request) { 533 533 - user := s.oauth.GetMultiAccountUser(r) 533 533 + user := s.oauth.GetUser(r) 534 534 535 535 err := r.ParseForm() 536 536 if err != nil { ··· 539 539 return 540 540 } 541 541 542 542 - profile, err := db.GetProfile(s.db, user.Active.Did) 542 542 + profile, err := db.GetProfile(s.db, user.Did) 543 543 if err != nil { 544 544 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 544 544 + log.Printf("getting profile data for %s: %s", user.Did, err) 545 545 } 546 546 547 547 profile.Description = r.FormValue("description") ··· 578 578 } 579 579 580 580 func (s *State) UpdateProfilePins(w http.ResponseWriter, r *http.Request) { 581 581 - user := s.oauth.GetMultiAccountUser(r) 581 581 + user := s.oauth.GetUser(r) 582 582 583 583 err := r.ParseForm() 584 584 if err != nil { ··· 587 587 return 588 588 } 589 589 590 590 - profile, err := db.GetProfile(s.db, user.Active.Did) 590 590 + profile, err := db.GetProfile(s.db, user.Did) 591 591 if err != nil { 592 592 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 592 592 + log.Printf("getting profile data for %s: %s", user.Did, err) 593 593 } 594 594 595 595 i := 0 ··· 617 617 } 618 618 619 619 func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r *http.Request) { 620 620 - user := s.oauth.GetMultiAccountUser(r) 620 620 + user := s.oauth.GetUser(r) 621 621 tx, err := s.db.BeginTx(r.Context(), nil) 622 622 if err != nil { 623 623 log.Println("failed to start transaction", err) ··· 644 644 vanityStats = append(vanityStats, string(v.Kind)) 645 645 } 646 646 647 647 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 647 647 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 648 648 var cid *string 649 649 if ex != nil { 650 650 cid = ex.Cid ··· 652 652 653 653 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 654 654 Collection: tangled.ActorProfileNSID, 655 655 - Repo: user.Active.Did, 655 655 + Repo: user.Did, 656 656 Rkey: "self", 657 657 Record: &lexutil.LexiconTypeDecoder{ 658 658 Val: &tangled.ActorProfile{ ··· 681 681 682 682 s.notifier.UpdateProfile(r.Context(), profile) 683 683 684 684 - s.pages.HxRedirect(w, "/"+user.Active.Did) 684 684 + s.pages.HxRedirect(w, "/"+user.Did) 685 685 } 686 686 687 687 func (s *State) EditBioFragment(w http.ResponseWriter, r *http.Request) { 688 688 - user := s.oauth.GetMultiAccountUser(r) 688 688 + user := s.oauth.GetUser(r) 689 689 690 690 - profile, err := db.GetProfile(s.db, user.Active.Did) 690 690 + profile, err := db.GetProfile(s.db, user.Did) 691 691 if err != nil { 692 692 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 692 692 + log.Printf("getting profile data for %s: %s", user.Did, err) 693 693 } 694 694 695 695 s.pages.EditBioFragment(w, pages.EditBioParams{ ··· 699 699 } 700 700 701 701 func (s *State) EditPinsFragment(w http.ResponseWriter, r *http.Request) { 702 702 - user := s.oauth.GetMultiAccountUser(r) 702 702 + user := s.oauth.GetUser(r) 703 703 704 704 - profile, err := db.GetProfile(s.db, user.Active.Did) 704 704 + profile, err := db.GetProfile(s.db, user.Did) 705 705 if err != nil { 706 706 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 706 706 + log.Printf("getting profile data for %s: %s", user.Did, err) 707 707 } 708 708 709 709 - repos, err := db.GetRepos(s.db, 0, orm.FilterEq("did", user.Active.Did)) 709 709 + repos, err := db.GetRepos(s.db, 0, orm.FilterEq("did", user.Did)) 710 710 if err != nil { 711 711 - log.Printf("getting repos for %s: %s", user.Active.Did, err) 711 711 + log.Printf("getting repos for %s: %s", user.Did, err) 712 712 } 713 713 714 714 - collaboratingRepos, err := db.CollaboratingIn(s.db, user.Active.Did) 714 714 + collaboratingRepos, err := db.CollaboratingIn(s.db, user.Did) 715 715 if err != nil { 716 716 - log.Printf("getting collaborating repos for %s: %s", user.Active.Did, err) 716 716 + log.Printf("getting collaborating repos for %s: %s", user.Did, err) 717 717 } 718 718 719 719 allRepos := []pages.PinnedRepo{}

+7 -7

appview/state/reaction.go

··· 17 17 ) 18 18 19 19 func (s *State) React(w http.ResponseWriter, r *http.Request) { 20 20 - currentUser := s.oauth.GetMultiAccountUser(r) 20 20 + currentUser := s.oauth.GetUser(r) 21 21 22 22 subject := r.URL.Query().Get("subject") 23 23 if subject == "" { ··· 49 49 rkey := tid.TID() 50 50 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 51 51 Collection: tangled.FeedReactionNSID, 52 52 - Repo: currentUser.Active.Did, 52 52 + Repo: currentUser.Did, 53 53 Rkey: rkey, 54 54 Record: &lexutil.LexiconTypeDecoder{ 55 55 Val: &tangled.FeedReaction{ ··· 64 64 return 65 65 } 66 66 67 67 - err = db.AddReaction(s.db, currentUser.Active.Did, subjectUri, reactionKind, rkey) 67 67 + err = db.AddReaction(s.db, currentUser.Did, subjectUri, reactionKind, rkey) 68 68 if err != nil { 69 69 log.Println("failed to react", err) 70 70 return ··· 87 87 88 88 return 89 89 case http.MethodDelete: 90 90 - reaction, err := db.GetReaction(s.db, currentUser.Active.Did, subjectUri, reactionKind) 90 90 + reaction, err := db.GetReaction(s.db, currentUser.Did, subjectUri, reactionKind) 91 91 if err != nil { 92 92 - log.Println("failed to get reaction relationship for", currentUser.Active.Did, subjectUri) 92 92 + log.Println("failed to get reaction relationship for", currentUser.Did, subjectUri) 93 93 return 94 94 } 95 95 96 96 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 97 97 Collection: tangled.FeedReactionNSID, 98 98 - Repo: currentUser.Active.Did, 98 98 + Repo: currentUser.Did, 99 99 Rkey: reaction.Rkey, 100 100 }) 101 101 ··· 104 104 return 105 105 } 106 106 107 107 - err = db.DeleteReactionByRkey(s.db, currentUser.Active.Did, reaction.Rkey) 107 107 + err = db.DeleteReactionByRkey(s.db, currentUser.Did, reaction.Rkey) 108 108 if err != nil { 109 109 log.Println("failed to delete reaction from DB") 110 110 // this is not an issue, the firehose event might have already done this

+3 -6

appview/state/router.go

··· 94 94 r.Mount("/", s.RepoRouter(mw)) 95 95 r.Mount("/issues", s.IssuesRouter(mw)) 96 96 r.Mount("/pulls", s.PullsRouter(mw)) 97 97 - r.Mount("/pipelines", s.PipelinesRouter(mw)) 97 97 + r.Mount("/pipelines", s.PipelinesRouter()) 98 98 r.Mount("/labels", s.LabelsRouter()) 99 99 100 100 // These routes get proxied to the knot ··· 129 129 r.Get("/login", s.Login) 130 130 r.Post("/login", s.Login) 131 131 r.Post("/logout", s.Logout) 132 132 - 133 133 - r.Post("/account/switch", s.SwitchAccount) 134 134 - r.With(middleware.AuthMiddleware(s.oauth)).Delete("/account/{did}", s.RemoveAccount) 135 132 136 133 r.Route("/repo", func(r chi.Router) { 137 134 r.Route("/new", func(r chi.Router) { ··· 316 313 return repo.Router(mw) 317 314 } 318 315 319 319 - func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler { 316 316 + func (s *State) PipelinesRouter() http.Handler { 320 317 pipes := pipelines.New( 321 318 s.oauth, 322 319 s.repoResolver, ··· 328 325 s.enforcer, 329 326 log.SubLogger(s.logger, "pipelines"), 330 327 ) 331 331 - return pipes.Router(mw) 328 328 + return pipes.Router() 332 329 } 333 330 334 331 func (s *State) LabelsRouter() http.Handler {

+6 -6

appview/state/star.go

··· 16 16 ) 17 17 18 18 func (s *State) Star(w http.ResponseWriter, r *http.Request) { 19 19 - currentUser := s.oauth.GetMultiAccountUser(r) 19 19 + currentUser := s.oauth.GetUser(r) 20 20 21 21 subject := r.URL.Query().Get("subject") 22 22 if subject == "" { ··· 42 42 rkey := tid.TID() 43 43 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 44 44 Collection: tangled.FeedStarNSID, 45 45 - Repo: currentUser.Active.Did, 45 45 + Repo: currentUser.Did, 46 46 Rkey: rkey, 47 47 Record: &lexutil.LexiconTypeDecoder{ 48 48 Val: &tangled.FeedStar{ ··· 57 57 log.Println("created atproto record: ", resp.Uri) 58 58 59 59 star := &models.Star{ 60 60 - Did: currentUser.Active.Did, 60 60 + Did: currentUser.Did, 61 61 RepoAt: subjectUri, 62 62 Rkey: rkey, 63 63 } ··· 84 84 return 85 85 case http.MethodDelete: 86 86 // find the record in the db 87 87 - star, err := db.GetStar(s.db, currentUser.Active.Did, subjectUri) 87 87 + star, err := db.GetStar(s.db, currentUser.Did, subjectUri) 88 88 if err != nil { 89 89 log.Println("failed to get star relationship") 90 90 return ··· 92 92 93 93 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 94 94 Collection: tangled.FeedStarNSID, 95 95 - Repo: currentUser.Active.Did, 95 95 + Repo: currentUser.Did, 96 96 Rkey: star.Rkey, 97 97 }) 98 98 ··· 101 101 return 102 102 } 103 103 104 104 - err = db.DeleteStarByRkey(s.db, currentUser.Active.Did, star.Rkey) 104 104 + err = db.DeleteStarByRkey(s.db, currentUser.Did, star.Rkey) 105 105 if err != nil { 106 106 log.Println("failed to delete star from DB") 107 107 // this is not an issue, the firehose event might have already done this

+22 -22

appview/state/state.go

··· 213 213 } 214 214 215 215 func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) { 216 216 - user := s.oauth.GetMultiAccountUser(r) 216 216 + user := s.oauth.GetUser(r) 217 217 s.pages.TermsOfService(w, pages.TermsOfServiceParams{ 218 218 LoggedInUser: user, 219 219 }) 220 220 } 221 221 222 222 func (s *State) PrivacyPolicy(w http.ResponseWriter, r *http.Request) { 223 223 - user := s.oauth.GetMultiAccountUser(r) 223 223 + user := s.oauth.GetUser(r) 224 224 s.pages.PrivacyPolicy(w, pages.PrivacyPolicyParams{ 225 225 LoggedInUser: user, 226 226 }) 227 227 } 228 228 229 229 func (s *State) Brand(w http.ResponseWriter, r *http.Request) { 230 230 - user := s.oauth.GetMultiAccountUser(r) 230 230 + user := s.oauth.GetUser(r) 231 231 s.pages.Brand(w, pages.BrandParams{ 232 232 LoggedInUser: user, 233 233 }) 234 234 } 235 235 236 236 func (s *State) HomeOrTimeline(w http.ResponseWriter, r *http.Request) { 237 237 - if s.oauth.GetMultiAccountUser(r) != nil { 237 237 + if s.oauth.GetUser(r) != nil { 238 238 s.Timeline(w, r) 239 239 return 240 240 } ··· 242 242 } 243 243 244 244 func (s *State) Timeline(w http.ResponseWriter, r *http.Request) { 245 245 - user := s.oauth.GetMultiAccountUser(r) 245 245 + user := s.oauth.GetUser(r) 246 246 247 247 // TODO: set this flag based on the UI 248 248 filtered := false 249 249 250 250 var userDid string 251 251 - if user != nil && user.Active != nil { 252 252 - userDid = user.Active.Did 251 251 + if user != nil { 252 252 + userDid = user.Did 253 253 } 254 254 timeline, err := db.MakeTimeline(s.db, 50, userDid, filtered) 255 255 if err != nil { ··· 278 278 } 279 279 280 280 func (s *State) UpgradeBanner(w http.ResponseWriter, r *http.Request) { 281 281 - user := s.oauth.GetMultiAccountUser(r) 281 281 + user := s.oauth.GetUser(r) 282 282 if user == nil { 283 283 return 284 284 } 285 285 286 286 l := s.logger.With("handler", "UpgradeBanner") 287 287 - l = l.With("did", user.Active.Did) 287 287 + l = l.With("did", user.Did) 288 288 289 289 regs, err := db.GetRegistrations( 290 290 s.db, 291 291 - orm.FilterEq("did", user.Active.Did), 291 291 + orm.FilterEq("did", user.Did), 292 292 orm.FilterEq("needs_upgrade", 1), 293 293 ) 294 294 if err != nil { ··· 297 297 298 298 spindles, err := db.GetSpindles( 299 299 s.db, 300 300 - orm.FilterEq("owner", user.Active.Did), 300 300 + orm.FilterEq("owner", user.Did), 301 301 orm.FilterEq("needs_upgrade", 1), 302 302 ) 303 303 if err != nil { ··· 411 411 func (s *State) NewRepo(w http.ResponseWriter, r *http.Request) { 412 412 switch r.Method { 413 413 case http.MethodGet: 414 414 - user := s.oauth.GetMultiAccountUser(r) 415 415 - knots, err := s.enforcer.GetKnotsForUser(user.Active.Did) 414 414 + user := s.oauth.GetUser(r) 415 415 + knots, err := s.enforcer.GetKnotsForUser(user.Did) 416 416 if err != nil { 417 417 s.pages.Notice(w, "repo", "Invalid user account.") 418 418 return ··· 426 426 case http.MethodPost: 427 427 l := s.logger.With("handler", "NewRepo") 428 428 429 429 - user := s.oauth.GetMultiAccountUser(r) 430 430 - l = l.With("did", user.Active.Did) 429 429 + user := s.oauth.GetUser(r) 430 430 + l = l.With("did", user.Did) 431 431 432 432 // form validation 433 433 domain := r.FormValue("domain") ··· 459 459 description := r.FormValue("description") 460 460 461 461 // ACL validation 462 462 - ok, err := s.enforcer.E.Enforce(user.Active.Did, domain, domain, "repo:create") 462 462 + ok, err := s.enforcer.E.Enforce(user.Did, domain, domain, "repo:create") 463 463 if err != nil || !ok { 464 464 l.Info("unauthorized") 465 465 s.pages.Notice(w, "repo", "You do not have permission to create a repo in this knot.") ··· 469 469 // Check for existing repos 470 470 existingRepo, err := db.GetRepo( 471 471 s.db, 472 472 - orm.FilterEq("did", user.Active.Did), 472 472 + orm.FilterEq("did", user.Did), 473 473 orm.FilterEq("name", repoName), 474 474 ) 475 475 if err == nil && existingRepo != nil { ··· 481 481 // create atproto record for this repo 482 482 rkey := tid.TID() 483 483 repo := &models.Repo{ 484 484 - Did: user.Active.Did, 484 484 + Did: user.Did, 485 485 Name: repoName, 486 486 Knot: domain, 487 487 Rkey: rkey, ··· 500 500 501 501 atresp, err := comatproto.RepoPutRecord(r.Context(), atpClient, &comatproto.RepoPutRecord_Input{ 502 502 Collection: tangled.RepoNSID, 503 503 - Repo: user.Active.Did, 503 503 + Repo: user.Did, 504 504 Rkey: rkey, 505 505 Record: &lexutil.LexiconTypeDecoder{ 506 506 Val: &record, ··· 577 577 } 578 578 579 579 // acls 580 580 - p, _ := securejoin.SecureJoin(user.Active.Did, repoName) 581 581 - err = s.enforcer.AddRepo(user.Active.Did, domain, p) 580 580 + p, _ := securejoin.SecureJoin(user.Did, repoName) 581 581 + err = s.enforcer.AddRepo(user.Did, domain, p) 582 582 if err != nil { 583 583 l.Error("acl setup failed", "err", err) 584 584 s.pages.Notice(w, "repo", "Failed to set up repository permissions.") ··· 603 603 aturi = "" 604 604 605 605 s.notifier.NewRepo(r.Context(), repo) 606 606 - s.pages.HxLocation(w, fmt.Sprintf("/%s/%s", user.Active.Did, repoName)) 606 606 + s.pages.HxLocation(w, fmt.Sprintf("/%s/%s", user.Did, repoName)) 607 607 } 608 608 } 609 609

+19 -19

appview/strings/strings.go

··· 82 82 } 83 83 84 84 s.Pages.StringsTimeline(w, pages.StringTimelineParams{ 85 85 - LoggedInUser: s.OAuth.GetMultiAccountUser(r), 85 85 + LoggedInUser: s.OAuth.GetUser(r), 86 86 Strings: strings, 87 87 }) 88 88 } ··· 153 153 if err != nil { 154 154 l.Error("failed to get star count", "err", err) 155 155 } 156 156 - user := s.OAuth.GetMultiAccountUser(r) 156 156 + user := s.OAuth.GetUser(r) 157 157 isStarred := false 158 158 if user != nil { 159 159 - isStarred = db.GetStarStatus(s.Db, user.Active.Did, string.AtUri()) 159 159 + isStarred = db.GetStarStatus(s.Db, user.Did, string.AtUri()) 160 160 } 161 161 162 162 s.Pages.SingleString(w, pages.SingleStringParams{ ··· 178 178 func (s *Strings) edit(w http.ResponseWriter, r *http.Request) { 179 179 l := s.Logger.With("handler", "edit") 180 180 181 181 - user := s.OAuth.GetMultiAccountUser(r) 181 181 + user := s.OAuth.GetUser(r) 182 182 183 183 id, ok := r.Context().Value("resolvedId").(identity.Identity) 184 184 if !ok { ··· 216 216 first := all[0] 217 217 218 218 // verify that the logged in user owns this string 219 219 - if user.Active.Did != id.DID.String() { 220 220 - l.Error("unauthorized request", "expected", id.DID, "got", user.Active.Did) 219 219 + if user.Did != id.DID.String() { 220 220 + l.Error("unauthorized request", "expected", id.DID, "got", user.Did) 221 221 w.WriteHeader(http.StatusUnauthorized) 222 222 return 223 223 } ··· 226 226 case http.MethodGet: 227 227 // return the form with prefilled fields 228 228 s.Pages.PutString(w, pages.PutStringParams{ 229 229 - LoggedInUser: s.OAuth.GetMultiAccountUser(r), 229 229 + LoggedInUser: s.OAuth.GetUser(r), 230 230 Action: "edit", 231 231 String: first, 232 232 }) ··· 299 299 s.Notifier.EditString(r.Context(), &entry) 300 300 301 301 // if that went okay, redir to the string 302 302 - s.Pages.HxRedirect(w, "/strings/"+user.Active.Did+"/"+entry.Rkey) 302 302 + s.Pages.HxRedirect(w, "/strings/"+user.Did+"/"+entry.Rkey) 303 303 } 304 304 305 305 } 306 306 307 307 func (s *Strings) create(w http.ResponseWriter, r *http.Request) { 308 308 l := s.Logger.With("handler", "create") 309 309 - user := s.OAuth.GetMultiAccountUser(r) 309 309 + user := s.OAuth.GetUser(r) 310 310 311 311 switch r.Method { 312 312 case http.MethodGet: 313 313 s.Pages.PutString(w, pages.PutStringParams{ 314 314 - LoggedInUser: s.OAuth.GetMultiAccountUser(r), 314 314 + LoggedInUser: s.OAuth.GetUser(r), 315 315 Action: "new", 316 316 }) 317 317 case http.MethodPost: ··· 335 335 description := r.FormValue("description") 336 336 337 337 string := models.String{ 338 338 - Did: syntax.DID(user.Active.Did), 338 338 + Did: syntax.DID(user.Did), 339 339 Rkey: tid.TID(), 340 340 Filename: filename, 341 341 Description: description, ··· 353 353 354 354 resp, err := comatproto.RepoPutRecord(r.Context(), client, &atproto.RepoPutRecord_Input{ 355 355 Collection: tangled.StringNSID, 356 356 - Repo: user.Active.Did, 356 356 + Repo: user.Did, 357 357 Rkey: string.Rkey, 358 358 Record: &lexutil.LexiconTypeDecoder{ 359 359 Val: &record, ··· 375 375 s.Notifier.NewString(r.Context(), &string) 376 376 377 377 // successful 378 378 - s.Pages.HxRedirect(w, "/strings/"+user.Active.Did+"/"+string.Rkey) 378 378 + s.Pages.HxRedirect(w, "/strings/"+user.Did+"/"+string.Rkey) 379 379 } 380 380 } 381 381 382 382 func (s *Strings) delete(w http.ResponseWriter, r *http.Request) { 383 383 l := s.Logger.With("handler", "create") 384 384 - user := s.OAuth.GetMultiAccountUser(r) 384 384 + user := s.OAuth.GetUser(r) 385 385 fail := func(msg string, err error) { 386 386 l.Error(msg, "err", err) 387 387 s.Pages.Notice(w, "error", msg) ··· 402 402 return 403 403 } 404 404 405 405 - if user.Active.Did != id.DID.String() { 406 406 - fail("You cannot delete this string", fmt.Errorf("unauthorized deletion, %s != %s", user.Active.Did, id.DID.String())) 405 405 + if user.Did != id.DID.String() { 406 406 + fail("You cannot delete this string", fmt.Errorf("unauthorized deletion, %s != %s", user.Did, id.DID.String())) 407 407 return 408 408 } 409 409 410 410 if err := db.DeleteString( 411 411 s.Db, 412 412 - orm.FilterEq("did", user.Active.Did), 412 412 + orm.FilterEq("did", user.Did), 413 413 orm.FilterEq("rkey", rkey), 414 414 ); err != nil { 415 415 fail("Failed to delete string.", err) 416 416 return 417 417 } 418 418 419 419 - s.Notifier.DeleteString(r.Context(), user.Active.Did, rkey) 419 419 + s.Notifier.DeleteString(r.Context(), user.Did, rkey) 420 420 421 421 - s.Pages.HxRedirect(w, "/strings/"+user.Active.Did) 421 421 + s.Pages.HxRedirect(w, "/strings/"+user.Did) 422 422 } 423 423 424 424 func (s *Strings) comment(w http.ResponseWriter, r *http.Request) {

+10 -23

cmd/dolly/main.go

··· 2 2 3 3 import ( 4 4 "bytes" 5 5 - _ "embed" 6 5 "flag" 7 6 "fmt" 8 7 "image" ··· 17 16 "github.com/srwiley/oksvg" 18 17 "github.com/srwiley/rasterx" 19 18 "golang.org/x/image/draw" 19 19 + "tangled.org/core/appview/pages" 20 20 "tangled.org/core/ico" 21 21 ) 22 22 23 23 func main() { 24 24 var ( 25 25 - size string 26 26 - fillColor string 27 27 - output string 28 28 - templatePath string 25 25 + size string 26 26 + fillColor string 27 27 + output string 29 28 ) 30 29 31 31 - flag.StringVar(&templatePath, "template", "", "Path to dolly go-html template") 32 30 flag.StringVar(&size, "size", "512x512", "Output size in format WIDTHxHEIGHT (e.g., 512x512)") 33 31 flag.StringVar(&fillColor, "color", "#000000", "Fill color in hex format (e.g., #FF5733)") 34 32 flag.StringVar(&output, "output", "dolly.svg", "Output file path (format detected from extension: .svg, .png, or .ico)") 35 33 flag.Parse() 36 36 - 37 37 - if templatePath == "" { 38 38 - fmt.Fprintf(os.Stderr, "Empty template path") 39 39 - os.Exit(1) 40 40 - } 41 34 42 35 width, height, err := parseSize(size) 43 36 if err != nil { ··· 59 52 os.Exit(1) 60 53 } 61 54 62 62 - tpl, err := os.ReadFile(templatePath) 63 63 - if err != nil { 64 64 - fmt.Fprintf(os.Stderr, "Failed to read template from path %s: %v\n", templatePath, err) 65 65 - os.Exit(1) 66 66 - } 67 67 - 68 68 - svgData, err := dolly(string(tpl), fillColor) 55 55 + svgData, err := dolly(fillColor) 69 56 if err != nil { 70 57 fmt.Fprintf(os.Stderr, "Error generating SVG: %v\n", err) 71 58 os.Exit(1) ··· 97 84 fmt.Printf("Successfully generated %s (%dx%d)\n", output, width, height) 98 85 } 99 86 100 100 - func dolly(tplString, hexColor string) ([]byte, error) { 101 101 - tpl, err := template.New("dolly").Parse(tplString) 87 87 + func dolly(hexColor string) ([]byte, error) { 88 88 + tpl, err := template.New("dolly"). 89 89 + ParseFS(pages.Files, "templates/fragments/dolly/logo.html") 102 90 if err != nil { 103 91 return nil, err 104 92 } 105 93 106 94 var svgData bytes.Buffer 107 107 - if err := tpl.ExecuteTemplate(&svgData, "fragments/dolly/logo", map[string]any{ 108 108 - "FillColor": hexColor, 109 109 - "Classes": "", 95 95 + if err := tpl.ExecuteTemplate(&svgData, "fragments/dolly/logo", pages.DollyParams{ 96 96 + FillColor: hexColor, 110 97 }); err != nil { 111 98 return nil, err 112 99 }

-3

docs/template.html

··· 35 35 $endfor$ 36 36 37 37 <link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin /> 38 38 - <link rel="icon" href="/static/logos/dolly.ico" sizes="48x48"/> 39 39 - <link rel="icon" href="/static/logos/dolly.svg" sizes="any" type="image/svg+xml"/> 40 40 - <link rel="apple-touch-icon" href="/static/logos/dolly.png"/> 41 38 42 39 </head> 43 40 <body class="bg-white dark:bg-gray-900 flex flex-col min-h-svh">

-13

input.css

··· 124 124 dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 125 125 } 126 126 127 127 - .btn-flat { 128 128 - @apply relative z-10 inline-flex min-h-[30px] cursor-pointer items-center justify-center 129 129 - bg-transparent px-2 pb-[0.2rem] text-sm text-gray-900 130 130 - before:absolute before:inset-0 before:-z-10 before:block before:rounded 131 131 - before:border before:border-gray-200 before:bg-white 132 132 - before:content-[''] before:transition-all before:duration-150 before:ease-in-out 133 133 - hover:before:bg-gray-50 134 134 - dark:hover:before:bg-gray-700 135 135 - focus:outline-none focus-visible:before:outline focus-visible:before:outline-2 focus-visible:before:outline-gray-400 136 136 - disabled:cursor-not-allowed disabled:opacity-50 137 137 - dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 138 138 - } 139 139 - 140 127 .btn-create { 141 128 @apply btn text-white 142 129 before:bg-green-600 hover:before:bg-green-700

+8 -3

knotserver/git/diff.go

··· 64 64 65 65 for _, tf := range d.TextFragments { 66 66 ndiff.TextFragments = append(ndiff.TextFragments, *tf) 67 67 - nd.Stat.Insertions += tf.LinesAdded 68 68 - nd.Stat.Deletions += tf.LinesDeleted 67 67 + for _, l := range tf.Lines { 68 68 + switch l.Op { 69 69 + case gitdiff.OpAdd: 70 70 + nd.Stat.Insertions += 1 71 71 + case gitdiff.OpDelete: 72 72 + nd.Stat.Deletions += 1 73 73 + } 74 74 + } 69 75 } 70 76 71 77 nd.Diff = append(nd.Diff, ndiff) 72 78 } 73 79 74 74 - nd.Stat.FilesChanged += len(diffs) 75 80 nd.Commit.FromGoGitCommit(c) 76 81 77 82 return &nd, nil

-33

lexicons/pipeline/cancelPipeline.json

··· 1 1 - { 2 2 - "lexicon": 1, 3 3 - "id": "sh.tangled.pipeline.cancelPipeline", 4 4 - "defs": { 5 5 - "main": { 6 6 - "type": "procedure", 7 7 - "description": "Cancel a running pipeline", 8 8 - "input": { 9 9 - "encoding": "application/json", 10 10 - "schema": { 11 11 - "type": "object", 12 12 - "required": ["repo", "pipeline", "workflow"], 13 13 - "properties": { 14 14 - "repo": { 15 15 - "type": "string", 16 16 - "format": "at-uri", 17 17 - "description": "repo at-uri, spindle can't resolve repo from pipeline at-uri yet" 18 18 - }, 19 19 - "pipeline": { 20 20 - "type": "string", 21 21 - "format": "at-uri", 22 22 - "description": "pipeline at-uri" 23 23 - }, 24 24 - "workflow": { 25 25 - "type": "string", 26 26 - "description": "workflow name" 27 27 - } 28 28 - } 29 29 - } 30 30 - } 31 31 - } 32 32 - } 33 33 - }

-5

nix/pkgs/docs.nix

··· 52 52 cp -f ${inter-fonts-src}/InterVariable*.ttf $out/static/fonts/ 53 53 cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono*.woff2 $out/static/fonts/ 54 54 55 55 - # favicons 56 56 - ${dolly}/bin/dolly -output $out/static/logos/dolly.png -size 180x180 57 57 - ${dolly}/bin/dolly -output $out/static/logos/dolly.ico -size 48x48 58 58 - ${dolly}/bin/dolly -output $out/static/logos/dolly.svg -color currentColor 59 59 - 60 55 # styles 61 56 cd ${src} && ${tailwindcss}/bin/tailwindcss -i input.css -o $out/stylesheet.css 62 57 ''

+18 -25

nix/pkgs/dolly.nix

··· 1 1 { 2 2 - lib, 3 2 buildGoApplication, 4 3 modules, 5 5 - writeShellScriptBin, 6 6 - }: let 7 7 - src = lib.fileset.toSource { 8 8 - root = ../..; 9 9 - fileset = lib.fileset.unions [ 10 10 - ../../go.mod 11 11 - ../../ico 12 12 - ../../cmd/dolly/main.go 13 13 - ../../appview/pages/templates/fragments/dolly/logo.html 14 14 - ]; 15 15 - }; 16 16 - dolly-unwrapped = buildGoApplication { 17 17 - pname = "dolly-unwrapped"; 18 18 - version = "0.1.0"; 19 19 - inherit src modules; 20 20 - doCheck = false; 21 21 - subPackages = ["cmd/dolly"]; 22 22 - }; 23 23 - in 24 24 - writeShellScriptBin "dolly" '' 25 25 - exec ${dolly-unwrapped}/bin/dolly \ 26 26 - -template ${src}/appview/pages/templates/fragments/dolly/logo.html \ 27 27 - "$@" 28 28 - '' 4 4 + src, 5 5 + }: 6 6 + buildGoApplication { 7 7 + pname = "dolly"; 8 8 + version = "0.1.0"; 9 9 + inherit src modules; 10 10 + 11 11 + # patch the static dir 12 12 + postUnpack = '' 13 13 + pushd source 14 14 + mkdir -p appview/pages/static 15 15 + touch appview/pages/static/x 16 16 + popd 17 17 + ''; 18 18 + 19 19 + doCheck = false; 20 20 + subPackages = ["cmd/dolly"]; 21 21 + }

+10 -66

patchutil/interdiff.go

··· 5 5 "strings" 6 6 7 7 "github.com/bluekeyes/go-gitdiff/gitdiff" 8 8 - "tangled.org/core/appview/filetree" 9 8 "tangled.org/core/types" 10 9 ) 11 10 ··· 13 12 Files []*InterdiffFile 14 13 } 15 14 16 16 - func (i *InterdiffResult) Stats() types.DiffStat { 17 17 - var ins, del int64 18 18 - for _, s := range i.ChangedFiles() { 19 19 - stat := s.Stats() 20 20 - ins += stat.Insertions 21 21 - del += stat.Deletions 22 22 - } 23 23 - return types.DiffStat{ 24 24 - Insertions: ins, 25 25 - Deletions: del, 26 26 - FilesChanged: len(i.Files), 27 27 - } 28 28 - } 29 29 - 30 30 - func (i *InterdiffResult) ChangedFiles() []types.DiffFileRenderer { 31 31 - drs := make([]types.DiffFileRenderer, len(i.Files)) 32 32 - for i, s := range i.Files { 33 33 - drs[i] = s 34 34 - } 35 35 - return drs 36 36 - } 37 37 - 38 38 - func (i *InterdiffResult) FileTree() *filetree.FileTreeNode { 39 39 - fs := make([]string, len(i.Files)) 40 40 - for i, s := range i.Files { 41 41 - fs[i] = s.Name 15 15 + func (i *InterdiffResult) AffectedFiles() []string { 16 16 + files := make([]string, len(i.Files)) 17 17 + for _, f := range i.Files { 18 18 + files = append(files, f.Name) 42 19 } 43 43 - return filetree.FileTree(fs) 20 20 + return files 44 21 } 45 22 46 23 func (i *InterdiffResult) String() string { ··· 59 36 Status InterdiffFileStatus 60 37 } 61 38 62 62 - func (s *InterdiffFile) Id() string { 63 63 - return s.Name 64 64 - } 65 65 - 66 66 - func (s *InterdiffFile) Split() types.SplitDiff { 39 39 + func (s *InterdiffFile) Split() *types.SplitDiff { 67 40 fragments := make([]types.SplitFragment, len(s.TextFragments)) 68 41 69 42 for i, fragment := range s.TextFragments { ··· 76 49 } 77 50 } 78 51 79 79 - return types.SplitDiff{ 52 52 + return &types.SplitDiff{ 80 53 Name: s.Id(), 81 54 TextFragments: fragments, 82 55 } 83 56 } 84 57 85 85 - func (s *InterdiffFile) CanRender() string { 86 86 - if s.Status.IsUnchanged() { 87 87 - return "This file has not been changed." 88 88 - } else if s.Status.IsRebased() { 89 89 - return "This patch was likely rebased, as context lines do not match." 90 90 - } else if s.Status.IsError() { 91 91 - return "Failed to calculate interdiff for this file." 92 92 - } else { 93 93 - return "" 94 94 - } 95 95 - } 96 96 - 97 97 - func (s *InterdiffFile) Names() types.DiffFileName { 98 98 - var n types.DiffFileName 99 99 - n.New = s.Name 100 100 - return n 101 101 - } 102 102 - 103 103 - func (s *InterdiffFile) Stats() types.DiffFileStat { 104 104 - var ins, del int64 105 105 - 106 106 - if s.File != nil { 107 107 - for _, f := range s.TextFragments { 108 108 - ins += f.LinesAdded 109 109 - del += f.LinesDeleted 110 110 - } 111 111 - } 112 112 - 113 113 - return types.DiffFileStat{ 114 114 - Insertions: ins, 115 115 - Deletions: del, 116 116 - } 58 58 + // used by html elements as a unique ID for hrefs 59 59 + func (s *InterdiffFile) Id() string { 60 60 + return s.Name 117 61 } 118 62 119 63 func (s *InterdiffFile) String() string {

-9

patchutil/patchutil_test.go

··· 4 4 "errors" 5 5 "reflect" 6 6 "testing" 7 7 - 8 8 - "tangled.org/core/types" 9 7 ) 10 8 11 9 func TestIsPatchValid(t *testing.T) { ··· 325 323 }) 326 324 } 327 325 } 328 328 - 329 329 - func TestImplsInterfaces(t *testing.T) { 330 330 - id := &InterdiffResult{} 331 331 - _ = isDiffsRenderer(id) 332 332 - } 333 333 - 334 334 - func isDiffsRenderer[S types.DiffRenderer](S) bool { return true }

+18 -6

spindle/db/events.go

··· 18 18 EventJson string `json:"event"` 19 19 } 20 20 21 21 - func (d *DB) insertEvent(event Event, notifier *notifier.Notifier) error { 21 21 + func (d *DB) InsertEvent(event Event, notifier *notifier.Notifier) error { 22 22 _, err := d.Exec( 23 23 `insert into events (rkey, nsid, event, created) values (?, ?, ?, ?)`, 24 24 event.Rkey, ··· 70 70 return evts, nil 71 71 } 72 72 73 73 + func (d *DB) CreateStatusEvent(rkey string, s tangled.PipelineStatus, n *notifier.Notifier) error { 74 74 + eventJson, err := json.Marshal(s) 75 75 + if err != nil { 76 76 + return err 77 77 + } 78 78 + 79 79 + event := Event{ 80 80 + Rkey: rkey, 81 81 + Nsid: tangled.PipelineStatusNSID, 82 82 + Created: time.Now().UnixNano(), 83 83 + EventJson: string(eventJson), 84 84 + } 85 85 + 86 86 + return d.InsertEvent(event, n) 87 87 + } 88 88 + 73 89 func (d *DB) createStatusEvent( 74 90 workflowId models.WorkflowId, 75 91 statusKind models.StatusKind, ··· 100 116 EventJson: string(eventJson), 101 117 } 102 118 103 103 - return d.insertEvent(event, n) 119 119 + return d.InsertEvent(event, n) 104 120 105 121 } 106 122 ··· 148 164 149 165 func (d *DB) StatusFailed(workflowId models.WorkflowId, workflowError string, exitCode int64, n *notifier.Notifier) error { 150 166 return d.createStatusEvent(workflowId, models.StatusKindFailed, &workflowError, &exitCode, n) 151 151 - } 152 152 - 153 153 - func (d *DB) StatusCancelled(workflowId models.WorkflowId, workflowError string, exitCode int64, n *notifier.Notifier) error { 154 154 - return d.createStatusEvent(workflowId, models.StatusKindCancelled, &workflowError, &exitCode, n) 155 167 } 156 168 157 169 func (d *DB) StatusSuccess(workflowId models.WorkflowId, n *notifier.Notifier) error {

+13 -24

spindle/engines/nixery/engine.go

··· 179 179 return err 180 180 } 181 181 e.registerCleanup(wid, func(ctx context.Context) error { 182 182 - if err := e.docker.NetworkRemove(ctx, networkName(wid)); err != nil { 183 183 - return fmt.Errorf("removing network: %w", err) 184 184 - } 185 185 - return nil 182 182 + return e.docker.NetworkRemove(ctx, networkName(wid)) 186 183 }) 187 184 188 185 addl := wf.Data.(addlFields) ··· 232 229 return fmt.Errorf("creating container: %w", err) 233 230 } 234 231 e.registerCleanup(wid, func(ctx context.Context) error { 235 235 - if err := e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}); err != nil { 236 236 - return fmt.Errorf("stopping container: %w", err) 232 232 + err = e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}) 233 233 + if err != nil { 234 234 + return err 237 235 } 238 236 239 239 - err := e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 237 237 + return e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 240 238 RemoveVolumes: true, 241 239 RemoveLinks: false, 242 240 Force: false, 243 241 }) 244 244 - if err != nil { 245 245 - return fmt.Errorf("removing container: %w", err) 246 246 - } 247 247 - return nil 248 242 }) 249 243 250 250 - if err := e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil { 244 244 + err = e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}) 245 245 + if err != nil { 251 246 return fmt.Errorf("starting container: %w", err) 252 247 } 253 248 ··· 399 394 } 400 395 401 396 func (e *Engine) DestroyWorkflow(ctx context.Context, wid models.WorkflowId) error { 402 402 - fns := e.drainCleanups(wid) 397 397 + e.cleanupMu.Lock() 398 398 + key := wid.String() 399 399 + 400 400 + fns := e.cleanup[key] 401 401 + delete(e.cleanup, key) 402 402 + e.cleanupMu.Unlock() 403 403 404 404 for _, fn := range fns { 405 405 if err := fn(ctx); err != nil { ··· 415 415 416 416 key := wid.String() 417 417 e.cleanup[key] = append(e.cleanup[key], fn) 418 418 - } 419 419 - 420 420 - func (e *Engine) drainCleanups(wid models.WorkflowId) []cleanupFunc { 421 421 - e.cleanupMu.Lock() 422 422 - key := wid.String() 423 423 - 424 424 - fns := e.cleanup[key] 425 425 - delete(e.cleanup, key) 426 426 - e.cleanupMu.Unlock() 427 427 - 428 428 - return fns 429 418 } 430 419 431 420 func networkName(wid models.WorkflowId) string {

+2 -2

spindle/models/models.go

··· 53 53 StatusKindRunning, 54 54 } 55 55 FinishStates [4]StatusKind = [4]StatusKind{ 56 56 - StatusKindFailed, 57 57 - StatusKindTimeout, 58 56 StatusKindCancelled, 57 57 + StatusKindFailed, 59 58 StatusKindSuccess, 59 59 + StatusKindTimeout, 60 60 } 61 61 ) 62 62

+1 -1

spindle/models/pipeline_env.go

··· 20 20 // Standard CI environment variable 21 21 env["CI"] = "true" 22 22 23 23 - env["TANGLED_PIPELINE_ID"] = pipelineId.AtUri().String() 23 23 + env["TANGLED_PIPELINE_ID"] = pipelineId.Rkey 24 24 25 25 // Repo info 26 26 if tr.Repo != nil {

+4 -5

spindle/server.go

··· 286 286 Config: s.cfg, 287 287 Resolver: s.res, 288 288 Vault: s.vault, 289 289 - Notifier: s.Notifier(), 290 289 ServiceAuth: serviceAuth, 291 290 } 292 291 ··· 321 320 tpl.TriggerMetadata.Repo.Repo, 322 321 ) 323 322 if err != nil { 324 324 - return fmt.Errorf("failed to get repo: %w", err) 323 323 + return err 325 324 } 326 325 327 326 pipelineId := models.PipelineId{ ··· 342 341 Name: w.Name, 343 342 }, fmt.Sprintf("unknown engine %#v", w.Engine), -1, s.n) 344 343 if err != nil { 345 345 - return fmt.Errorf("db.StatusFailed: %w", err) 344 344 + return err 346 345 } 347 346 348 347 continue ··· 356 355 357 356 ewf, err := s.engs[w.Engine].InitWorkflow(*w, tpl) 358 357 if err != nil { 359 359 - return fmt.Errorf("init workflow: %w", err) 358 358 + return err 360 359 } 361 360 362 361 // inject TANGLED_* env vars after InitWorkflow ··· 373 372 Name: w.Name, 374 373 }, s.n) 375 374 if err != nil { 376 376 - return fmt.Errorf("db.StatusPending: %w", err) 375 375 + return err 377 376 } 378 377 } 379 378 }

-97

spindle/xrpc/pipeline_cancelPipeline.go

··· 1 1 - package xrpc 2 2 - 3 3 - import ( 4 4 - "encoding/json" 5 5 - "fmt" 6 6 - "net/http" 7 7 - "strings" 8 8 - 9 9 - "github.com/bluesky-social/indigo/api/atproto" 10 10 - "github.com/bluesky-social/indigo/atproto/syntax" 11 11 - "github.com/bluesky-social/indigo/xrpc" 12 12 - securejoin "github.com/cyphar/filepath-securejoin" 13 13 - "tangled.org/core/api/tangled" 14 14 - "tangled.org/core/rbac" 15 15 - "tangled.org/core/spindle/models" 16 16 - xrpcerr "tangled.org/core/xrpc/errors" 17 17 - ) 18 18 - 19 19 - func (x *Xrpc) CancelPipeline(w http.ResponseWriter, r *http.Request) { 20 20 - l := x.Logger 21 21 - fail := func(e xrpcerr.XrpcError) { 22 22 - l.Error("failed", "kind", e.Tag, "error", e.Message) 23 23 - writeError(w, e, http.StatusBadRequest) 24 24 - } 25 25 - l.Debug("cancel pipeline") 26 26 - 27 27 - actorDid, ok := r.Context().Value(ActorDid).(syntax.DID) 28 28 - if !ok { 29 29 - fail(xrpcerr.MissingActorDidError) 30 30 - return 31 31 - } 32 32 - 33 33 - var input tangled.PipelineCancelPipeline_Input 34 34 - if err := json.NewDecoder(r.Body).Decode(&input); err != nil { 35 35 - fail(xrpcerr.GenericError(err)) 36 36 - return 37 37 - } 38 38 - 39 39 - aturi := syntax.ATURI(input.Pipeline) 40 40 - wid := models.WorkflowId{ 41 41 - PipelineId: models.PipelineId{ 42 42 - Knot: strings.TrimPrefix(aturi.Authority().String(), "did:web:"), 43 43 - Rkey: aturi.RecordKey().String(), 44 44 - }, 45 45 - Name: input.Workflow, 46 46 - } 47 47 - l.Debug("cancel pipeline", "wid", wid) 48 48 - 49 49 - // unfortunately we have to resolve repo-at here 50 50 - repoAt, err := syntax.ParseATURI(input.Repo) 51 51 - if err != nil { 52 52 - fail(xrpcerr.InvalidRepoError(input.Repo)) 53 53 - return 54 54 - } 55 55 - 56 56 - ident, err := x.Resolver.ResolveIdent(r.Context(), repoAt.Authority().String()) 57 57 - if err != nil || ident.Handle.IsInvalidHandle() { 58 58 - fail(xrpcerr.GenericError(fmt.Errorf("failed to resolve handle: %w", err))) 59 59 - return 60 60 - } 61 61 - 62 62 - xrpcc := xrpc.Client{Host: ident.PDSEndpoint()} 63 63 - resp, err := atproto.RepoGetRecord(r.Context(), &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String()) 64 64 - if err != nil { 65 65 - fail(xrpcerr.GenericError(err)) 66 66 - return 67 67 - } 68 68 - 69 69 - repo := resp.Value.Val.(*tangled.Repo) 70 70 - didSlashRepo, err := securejoin.SecureJoin(ident.DID.String(), repo.Name) 71 71 - if err != nil { 72 72 - fail(xrpcerr.GenericError(err)) 73 73 - return 74 74 - } 75 75 - 76 76 - // TODO: fine-grained role based control 77 77 - isRepoOwner, err := x.Enforcer.IsRepoOwner(actorDid.String(), rbac.ThisServer, didSlashRepo) 78 78 - if err != nil || !isRepoOwner { 79 79 - fail(xrpcerr.AccessControlError(actorDid.String())) 80 80 - return 81 81 - } 82 82 - for _, engine := range x.Engines { 83 83 - l.Debug("destorying workflow", "wid", wid) 84 84 - err = engine.DestroyWorkflow(r.Context(), wid) 85 85 - if err != nil { 86 86 - fail(xrpcerr.GenericError(fmt.Errorf("failed to destroy workflow: %w", err))) 87 87 - return 88 88 - } 89 89 - err = x.Db.StatusCancelled(wid, "User canceled the workflow", -1, x.Notifier) 90 90 - if err != nil { 91 91 - fail(xrpcerr.GenericError(fmt.Errorf("failed to emit status failed: %w", err))) 92 92 - return 93 93 - } 94 94 - } 95 95 - 96 96 - w.WriteHeader(http.StatusOK) 97 97 - }

-3

spindle/xrpc/xrpc.go

··· 10 10 11 11 "tangled.org/core/api/tangled" 12 12 "tangled.org/core/idresolver" 13 13 - "tangled.org/core/notifier" 14 13 "tangled.org/core/rbac" 15 14 "tangled.org/core/spindle/config" 16 15 "tangled.org/core/spindle/db" ··· 30 29 Config *config.Config 31 30 Resolver *idresolver.Resolver 32 31 Vault secrets.Manager 33 33 - Notifier *notifier.Notifier 34 32 ServiceAuth *serviceauth.ServiceAuth 35 33 } 36 34 ··· 43 41 r.Post("/"+tangled.RepoAddSecretNSID, x.AddSecret) 44 42 r.Post("/"+tangled.RepoRemoveSecretNSID, x.RemoveSecret) 45 43 r.Get("/"+tangled.RepoListSecretsNSID, x.ListSecrets) 46 46 - r.Post("/"+tangled.PipelineCancelPipelineNSID, x.CancelPipeline) 47 44 }) 48 45 49 46 // service query endpoints (no auth required)

+30 -78

types/diff.go

··· 1 1 package types 2 2 3 3 import ( 4 4 - "net/url" 5 5 - 6 4 "github.com/bluekeyes/go-gitdiff/gitdiff" 7 7 - "tangled.org/core/appview/filetree" 8 5 ) 9 6 10 7 type DiffOpts struct { 11 8 Split bool `json:"split"` 12 9 } 13 10 14 14 - func (d DiffOpts) Encode() string { 15 15 - values := make(url.Values) 16 16 - if d.Split { 17 17 - values.Set("diff", "split") 18 18 - } else { 19 19 - values.Set("diff", "unified") 20 20 - } 21 21 - return values.Encode() 22 22 - } 23 23 - 24 24 - // A nicer git diff representation. 25 25 - type NiceDiff struct { 26 26 - Commit Commit `json:"commit"` 27 27 - Stat DiffStat `json:"stat"` 28 28 - Diff []Diff `json:"diff"` 11 11 + type TextFragment struct { 12 12 + Header string `json:"comment"` 13 13 + Lines []gitdiff.Line `json:"lines"` 29 14 } 30 15 31 16 type Diff struct { ··· 41 26 IsRename bool `json:"is_rename"` 42 27 } 43 28 44 44 - func (d Diff) Stats() DiffFileStat { 45 45 - var stats DiffFileStat 29 29 + type DiffStat struct { 30 30 + Insertions int64 31 31 + Deletions int64 32 32 + } 33 33 + 34 34 + func (d *Diff) Stats() DiffStat { 35 35 + var stats DiffStat 46 36 for _, f := range d.TextFragments { 47 37 stats.Insertions += f.LinesAdded 48 38 stats.Deletions += f.LinesDeleted ··· 50 40 return stats 51 41 } 52 42 53 53 - type DiffStat struct { 54 54 - Insertions int64 `json:"insertions"` 55 55 - Deletions int64 `json:"deletions"` 56 56 - FilesChanged int `json:"files_changed"` 57 57 - } 58 58 - 59 59 - type DiffFileStat struct { 60 60 - Insertions int64 61 61 - Deletions int64 43 43 + // A nicer git diff representation. 44 44 + type NiceDiff struct { 45 45 + Commit Commit `json:"commit"` 46 46 + Stat struct { 47 47 + FilesChanged int `json:"files_changed"` 48 48 + Insertions int `json:"insertions"` 49 49 + Deletions int `json:"deletions"` 50 50 + } `json:"stat"` 51 51 + Diff []Diff `json:"diff"` 62 52 } 63 53 64 54 type DiffTree struct { ··· 68 58 Diff []*gitdiff.File `json:"diff"` 69 59 } 70 60 71 71 - type DiffFileName struct { 72 72 - Old string 73 73 - New string 74 74 - } 75 75 - 76 76 - func (d NiceDiff) ChangedFiles() []DiffFileRenderer { 77 77 - drs := make([]DiffFileRenderer, len(d.Diff)) 78 78 - for i, s := range d.Diff { 79 79 - drs[i] = s 80 80 - } 81 81 - return drs 82 82 - } 61 61 + func (d *NiceDiff) ChangedFiles() []string { 62 62 + files := make([]string, len(d.Diff)) 83 63 84 84 - func (d NiceDiff) FileTree() *filetree.FileTreeNode { 85 85 - fs := make([]string, len(d.Diff)) 86 86 - for i, s := range d.Diff { 87 87 - n := s.Names() 88 88 - if n.New == "" { 89 89 - fs[i] = n.Old 64 64 + for i, f := range d.Diff { 65 65 + if f.IsDelete { 66 66 + files[i] = f.Name.Old 90 67 } else { 91 91 - fs[i] = n.New 68 68 + files[i] = f.Name.New 92 69 } 93 70 } 94 94 - return filetree.FileTree(fs) 95 95 - } 96 71 97 97 - func (d NiceDiff) Stats() DiffStat { 98 98 - return d.Stat 72 72 + return files 99 73 } 100 74 101 101 - func (d Diff) Id() string { 75 75 + // used by html elements as a unique ID for hrefs 76 76 + func (d *Diff) Id() string { 102 77 if d.IsDelete { 103 78 return d.Name.Old 104 79 } 105 80 return d.Name.New 106 81 } 107 82 108 108 - func (d Diff) Names() DiffFileName { 109 109 - var n DiffFileName 110 110 - if d.IsDelete { 111 111 - n.Old = d.Name.Old 112 112 - return n 113 113 - } else if d.IsCopy || d.IsRename { 114 114 - n.Old = d.Name.Old 115 115 - n.New = d.Name.New 116 116 - return n 117 117 - } else { 118 118 - n.New = d.Name.New 119 119 - return n 120 120 - } 121 121 - } 122 122 - 123 123 - func (d Diff) CanRender() string { 124 124 - if d.IsBinary { 125 125 - return "This is a binary file and will not be displayed." 126 126 - } 127 127 - 128 128 - return "" 129 129 - } 130 130 - 131 131 - func (d Diff) Split() SplitDiff { 83 83 + func (d *Diff) Split() *SplitDiff { 132 84 fragments := make([]SplitFragment, len(d.TextFragments)) 133 85 for i, fragment := range d.TextFragments { 134 86 leftLines, rightLines := SeparateLines(&fragment) ··· 139 91 } 140 92 } 141 93 142 142 - return SplitDiff{ 94 94 + return &SplitDiff{ 143 95 Name: d.Id(), 144 96 TextFragments: fragments, 145 97 }

-31

types/diff_renderer.go

··· 1 1 - package types 2 2 - 3 3 - import "tangled.org/core/appview/filetree" 4 4 - 5 5 - type DiffRenderer interface { 6 6 - // list of file affected by these diffs 7 7 - ChangedFiles() []DiffFileRenderer 8 8 - 9 9 - // filetree 10 10 - FileTree() *filetree.FileTreeNode 11 11 - 12 12 - Stats() DiffStat 13 13 - } 14 14 - 15 15 - type DiffFileRenderer interface { 16 16 - // html ID for each file in the diff 17 17 - Id() string 18 18 - 19 19 - // produce a splitdiff 20 20 - Split() SplitDiff 21 21 - 22 22 - // stats for this single file 23 23 - Stats() DiffFileStat 24 24 - 25 25 - // old and new name of file 26 26 - Names() DiffFileName 27 27 - 28 28 - // whether this diff can be displayed, 29 29 - // returns a reason if not, and the empty string if it can 30 30 - CanRender() string 31 31 - }

+2 -11

types/diff_test.go

··· 1 1 package types 2 2 3 3 - import ( 4 4 - "testing" 5 5 - ) 3 3 + import "testing" 6 4 7 5 func TestDiffId(t *testing.T) { 8 6 tests := []struct { ··· 107 105 } 108 106 109 107 for i, diff := range nd.Diff { 110 110 - if changedFiles[i].Id() != diff.Id() { 108 108 + if changedFiles[i] != diff.Id() { 111 109 t.Errorf("ChangedFiles()[%d] = %q, but Diff.Id() = %q", i, changedFiles[i], diff.Id()) 112 110 } 113 111 } 114 112 } 115 115 - 116 116 - func TestImplsInterfaces(t *testing.T) { 117 117 - nd := NiceDiff{} 118 118 - _ = isDiffsRenderer(nd) 119 119 - } 120 120 - 121 121 - func isDiffsRenderer[S DiffRenderer](S) bool { return true }

+2 -1

types/split.go

··· 22 22 TextFragments []SplitFragment `json:"fragments"` 23 23 } 24 24 25 25 - func (d SplitDiff) Id() string { 25 25 + // used by html elements as a unique ID for hrefs 26 26 + func (d *SplitDiff) Id() string { 26 27 return d.Name 27 28 } 28 29