appview: unified comment fragments/handlers · siidorow.dev/tangled-core@8970e77

+11

appview/db/comments.go

··· 154 154 return err 155 155 } 156 156 157 + func GetComment(e Execer, filters ...orm.Filter) (models.Comment, error) { 158 + comments, err := GetComments(e, filters...) 159 + if err != nil { 160 + return models.Comment{}, err 161 + } 162 + if len(comments) != 1 { 163 + return models.Comment{}, fmt.Errorf("expected 1 comment, got %d", len(comments)) 164 + } 165 + return comments[0], nil 166 + } 167 + 157 168 func GetComments(e Execer, filters ...orm.Filter) ([]models.Comment, error) { 158 169 var comments []models.Comment 159 170

+6 -1

appview/ingester.go

··· 1621 1621 return fmt.Errorf("failed to validate comment: %w", err) 1622 1622 } 1623 1623 1624 + var mentions []syntax.DID 1624 1625 var references []syntax.ATURI 1625 1626 if comment.Body.Original != nil { 1626 - _, references = i.MentionsResolver.Resolve(ctx, *comment.Body.Original) 1627 + mentions, references = i.MentionsResolver.Resolve(ctx, *comment.Body.Original) 1627 1628 } 1628 1629 1629 1630 tx, err := i.Db.Begin() ··· 1639 1640 1640 1641 if err := tx.Commit(); err != nil { 1641 1642 return err 1643 + } 1644 + 1645 + if e.Commit.Operation == jmodels.CommitOperationCreate { 1646 + i.Notifier.NewComment(ctx, comment, mentions) 1642 1647 } 1643 1648 1644 1649 case jmodels.CommitOperationDelete:

-463

appview/issues/issues.go

··· 14 14 "github.com/bluesky-social/indigo/atproto/atclient" 15 15 "github.com/bluesky-social/indigo/atproto/syntax" 16 16 lexutil "github.com/bluesky-social/indigo/lex/util" 17 - indigoxrpc "github.com/bluesky-social/indigo/xrpc" 18 - "github.com/go-chi/chi/v5" 19 17 20 18 "tangled.org/core/api/tangled" 21 19 "tangled.org/core/appview/config" ··· 401 399 http.Error(w, "forbidden", http.StatusUnauthorized) 402 400 return 403 401 } 404 - } 405 - 406 - func (rp *Issues) NewIssueComment(w http.ResponseWriter, r *http.Request) { 407 - l := rp.logger.With("handler", "NewIssueComment") 408 - user := rp.oauth.GetMultiAccountUser(r) 409 - f, err := rp.repoResolver.Resolve(r) 410 - if err != nil { 411 - l.Error("failed to get repo and knot", "err", err) 412 - return 413 - } 414 - 415 - issue, ok := r.Context().Value("issue").(*models.Issue) 416 - if !ok { 417 - l.Error("failed to get issue") 418 - rp.pages.Error404(w) 419 - return 420 - } 421 - 422 - body := r.FormValue("body") 423 - if body == "" { 424 - rp.pages.Notice(w, "issue-comment", "Body is required") 425 - return 426 - } 427 - 428 - // TODO(boltless): normalize markdown body 429 - normalizedBody := body 430 - _, references := rp.mentionsResolver.Resolve(r.Context(), body) 431 - 432 - markdownBody := tangled.MarkupMarkdown{ 433 - Text: normalizedBody, 434 - Original: &body, 435 - Blobs: nil, 436 - } 437 - 438 - // ingest CID of issue record on-demand. 439 - // TODO(boltless): appview should ingest CID of atproto records 440 - cid, err := func() (syntax.CID, error) { 441 - ident, err := rp.idResolver.ResolveIdent(r.Context(), issue.Did) 442 - if err != nil { 443 - return "", err 444 - } 445 - 446 - xrpcc := indigoxrpc.Client{Host: ident.PDSEndpoint()} 447 - out, err := comatproto.RepoGetRecord(r.Context(), &xrpcc, "", tangled.RepoIssueNSID, issue.Did, issue.Rkey) 448 - if err != nil { 449 - return "", err 450 - } 451 - if out.Cid == nil { 452 - return "", fmt.Errorf("record CID is empty") 453 - } 454 - 455 - cid, err := syntax.ParseCID(*out.Cid) 456 - if err != nil { 457 - return "", err 458 - } 459 - 460 - return cid, nil 461 - }() 462 - if err != nil { 463 - rp.logger.Error("failed to backfill subject PR record", "err", err) 464 - rp.pages.Notice(w, "issue-comment", "failed to backfill subject record") 465 - return 466 - } 467 - issueStrongRef := comatproto.RepoStrongRef{ 468 - Uri: issue.AtUri().String(), 469 - Cid: cid.String(), 470 - } 471 - 472 - var replyTo *comatproto.RepoStrongRef 473 - replyToUriRaw := r.FormValue("reply-to-uri") 474 - replyToCidRaw := r.FormValue("reply-to-cid") 475 - if replyToUriRaw != "" && replyToCidRaw != "" { 476 - uri, err := syntax.ParseATURI(replyToUriRaw) 477 - if err != nil { 478 - rp.pages.Notice(w, "issue-comment", "reply-to-uri should be valid AT-URI") 479 - return 480 - } 481 - cid, err := syntax.ParseCID(replyToCidRaw) 482 - if err != nil { 483 - rp.pages.Notice(w, "issue-comment", "reply-to-cid should be valid CID") 484 - return 485 - } 486 - replyTo = &comatproto.RepoStrongRef{ 487 - Uri: uri.String(), 488 - Cid: cid.String(), 489 - } 490 - } 491 - 492 - mentions, references := rp.mentionsResolver.Resolve(r.Context(), body) 493 - 494 - comment := models.Comment{ 495 - Did: syntax.DID(user.Did), 496 - Collection: tangled.FeedCommentNSID, 497 - Rkey: syntax.RecordKey(tid.TID()), 498 - 499 - Subject: issueStrongRef, 500 - Body: markdownBody, 501 - Created: time.Now(), 502 - ReplyTo: replyTo, 503 - } 504 - if err = comment.Validate(); err != nil { 505 - l.Error("failed to validate comment", "err", err) 506 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 507 - return 508 - } 509 - 510 - client, err := rp.oauth.AuthorizedClient(r) 511 - if err != nil { 512 - l.Error("failed to get authorized client", "err", err) 513 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 514 - return 515 - } 516 - 517 - // create a record first 518 - out, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 519 - Collection: comment.Collection.String(), 520 - Repo: comment.Did.String(), 521 - Rkey: comment.Rkey.String(), 522 - Record: &lexutil.LexiconTypeDecoder{Val: comment.AsRecord()}, 523 - }) 524 - if err != nil { 525 - l.Error("failed to create comment", "err", err) 526 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 527 - return 528 - } 529 - 530 - comment.Cid = syntax.CID(out.Cid) 531 - 532 - tx, err := rp.db.Begin() 533 - if err != nil { 534 - l.Error("failed to start transaction", "err", err) 535 - rp.pages.Notice(w, "issue-comment", "Failed to create comment, try again later.") 536 - return 537 - } 538 - defer tx.Rollback() 539 - 540 - err = db.PutComment(tx, &comment, references) 541 - if err != nil { 542 - l.Error("failed to create comment", "err", err) 543 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 544 - return 545 - } 546 - 547 - err = tx.Commit() 548 - if err != nil { 549 - l.Error("failed to commit transaction", "err", err) 550 - rp.pages.Notice(w, "issue-comment", "Failed to create comment, try again later.") 551 - return 552 - } 553 - 554 - rp.notifier.NewComment(r.Context(), &comment, mentions) 555 - 556 - ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 557 - rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d#comment-%d", ownerSlashRepo, issue.IssueId, comment.Id)) 558 - } 559 - 560 - func (rp *Issues) IssueComment(w http.ResponseWriter, r *http.Request) { 561 - l := rp.logger.With("handler", "IssueComment") 562 - user := rp.oauth.GetMultiAccountUser(r) 563 - 564 - issue, ok := r.Context().Value("issue").(*models.Issue) 565 - if !ok { 566 - l.Error("failed to get issue") 567 - rp.pages.Error404(w) 568 - return 569 - } 570 - 571 - commentId := chi.URLParam(r, "commentId") 572 - comments, err := db.GetComments( 573 - rp.db, 574 - orm.FilterEq("id", commentId), 575 - ) 576 - if err != nil { 577 - l.Error("failed to fetch comment", "id", commentId) 578 - http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 579 - return 580 - } 581 - if len(comments) != 1 { 582 - l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 583 - http.Error(w, "invalid comment id", http.StatusBadRequest) 584 - return 585 - } 586 - comment := comments[0] 587 - 588 - rp.pages.IssueCommentBodyFragment(w, pages.IssueCommentBodyParams{ 589 - LoggedInUser: user, 590 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 591 - Issue: issue, 592 - Comment: &comment, 593 - }) 594 - } 595 - 596 - func (rp *Issues) EditIssueComment(w http.ResponseWriter, r *http.Request) { 597 - l := rp.logger.With("handler", "EditIssueComment") 598 - user := rp.oauth.GetMultiAccountUser(r) 599 - 600 - issue, ok := r.Context().Value("issue").(*models.Issue) 601 - if !ok { 602 - l.Error("failed to get issue") 603 - rp.pages.Error404(w) 604 - return 605 - } 606 - 607 - commentId := chi.URLParam(r, "commentId") 608 - comments, err := db.GetComments( 609 - rp.db, 610 - orm.FilterEq("id", commentId), 611 - ) 612 - if err != nil { 613 - l.Error("failed to fetch comment", "id", commentId) 614 - http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 615 - return 616 - } 617 - if len(comments) != 1 { 618 - l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 619 - http.Error(w, "invalid comment id", http.StatusBadRequest) 620 - return 621 - } 622 - comment := comments[0] 623 - 624 - if comment.Did.String() != user.Did { 625 - l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Did) 626 - http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 627 - return 628 - } 629 - 630 - switch r.Method { 631 - case http.MethodGet: 632 - rp.pages.EditIssueCommentFragment(w, pages.EditIssueCommentParams{ 633 - LoggedInUser: user, 634 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 635 - Issue: issue, 636 - Comment: &comment, 637 - }) 638 - case http.MethodPost: 639 - // extract form value 640 - body := r.FormValue("body") 641 - if body == "" { 642 - rp.pages.Notice(w, "issue-comment", "Body is required") 643 - return 644 - } 645 - 646 - // TODO(boltless): normalize markdown body 647 - normalizedBody := body 648 - _, references := rp.mentionsResolver.Resolve(r.Context(), body) 649 - 650 - now := time.Now() 651 - newComment := comment 652 - newComment.Body = tangled.MarkupMarkdown{ 653 - Text: normalizedBody, 654 - Original: &body, 655 - Blobs: nil, 656 - } 657 - newComment.Edited = &now 658 - 659 - client, err := rp.oauth.AuthorizedClient(r) 660 - if err != nil { 661 - l.Error("failed to get authorized client", "err", err) 662 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 663 - return 664 - } 665 - 666 - // update a record first 667 - exCid := comment.Cid.String() 668 - resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 669 - Collection: newComment.Collection.String(), 670 - Repo: newComment.Did.String(), 671 - Rkey: newComment.Rkey.String(), 672 - SwapRecord: &exCid, 673 - Record: &lexutil.LexiconTypeDecoder{ 674 - Val: newComment.AsRecord(), 675 - }, 676 - }) 677 - if err != nil { 678 - l.Error("failed to update comment", "err", err) 679 - rp.pages.Notice(w, "issue-comment", "Failed to update comment, try again later.") 680 - return 681 - } 682 - 683 - newComment.Cid = syntax.CID(resp.Cid) 684 - 685 - tx, err := rp.db.Begin() 686 - if err != nil { 687 - l.Error("failed to start transaction", "err", err) 688 - rp.pages.Notice(w, "repo-notice", "Failed to update description, try again later.") 689 - return 690 - } 691 - defer tx.Rollback() 692 - 693 - err = db.PutComment(tx, &newComment, references) 694 - if err != nil { 695 - l.Error("failed to perform update-description query", "err", err) 696 - rp.pages.Notice(w, "repo-notice", "Failed to update description, try again later.") 697 - return 698 - } 699 - err = tx.Commit() 700 - if err != nil { 701 - l.Error("failed to commit transaction", "err", err) 702 - rp.pages.Notice(w, "issue-comment", "Failed to update comment, try again later.") 703 - return 704 - } 705 - 706 - // return new comment body with htmx 707 - rp.pages.IssueCommentBodyFragment(w, pages.IssueCommentBodyParams{ 708 - LoggedInUser: user, 709 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 710 - Issue: issue, 711 - Comment: &newComment, 712 - }) 713 - } 714 - } 715 - 716 - func (rp *Issues) ReplyIssueCommentPlaceholder(w http.ResponseWriter, r *http.Request) { 717 - l := rp.logger.With("handler", "ReplyIssueCommentPlaceholder") 718 - user := rp.oauth.GetMultiAccountUser(r) 719 - 720 - issue, ok := r.Context().Value("issue").(*models.Issue) 721 - if !ok { 722 - l.Error("failed to get issue") 723 - rp.pages.Error404(w) 724 - return 725 - } 726 - 727 - commentId := chi.URLParam(r, "commentId") 728 - comments, err := db.GetComments( 729 - rp.db, 730 - orm.FilterEq("id", commentId), 731 - ) 732 - if err != nil { 733 - l.Error("failed to fetch comment", "id", commentId) 734 - http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 735 - return 736 - } 737 - if len(comments) != 1 { 738 - l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 739 - http.Error(w, "invalid comment id", http.StatusBadRequest) 740 - return 741 - } 742 - comment := comments[0] 743 - 744 - rp.pages.ReplyIssueCommentPlaceholderFragment(w, pages.ReplyIssueCommentPlaceholderParams{ 745 - LoggedInUser: user, 746 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 747 - Issue: issue, 748 - Comment: &comment, 749 - }) 750 - } 751 - 752 - func (rp *Issues) ReplyIssueComment(w http.ResponseWriter, r *http.Request) { 753 - l := rp.logger.With("handler", "ReplyIssueComment") 754 - user := rp.oauth.GetMultiAccountUser(r) 755 - 756 - issue, ok := r.Context().Value("issue").(*models.Issue) 757 - if !ok { 758 - l.Error("failed to get issue") 759 - rp.pages.Error404(w) 760 - return 761 - } 762 - 763 - commentId := chi.URLParam(r, "commentId") 764 - comments, err := db.GetComments( 765 - rp.db, 766 - orm.FilterEq("id", commentId), 767 - ) 768 - if err != nil { 769 - l.Error("failed to fetch comment", "id", commentId) 770 - http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 771 - return 772 - } 773 - if len(comments) != 1 { 774 - l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 775 - http.Error(w, "invalid comment id", http.StatusBadRequest) 776 - return 777 - } 778 - comment := comments[0] 779 - 780 - rp.pages.ReplyIssueCommentFragment(w, pages.ReplyIssueCommentParams{ 781 - LoggedInUser: user, 782 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 783 - Issue: issue, 784 - Comment: &comment, 785 - }) 786 - } 787 - 788 - func (rp *Issues) DeleteIssueComment(w http.ResponseWriter, r *http.Request) { 789 - l := rp.logger.With("handler", "DeleteIssueComment") 790 - user := rp.oauth.GetMultiAccountUser(r) 791 - 792 - issue, ok := r.Context().Value("issue").(*models.Issue) 793 - if !ok { 794 - l.Error("failed to get issue") 795 - rp.pages.Error404(w) 796 - return 797 - } 798 - 799 - commentId := chi.URLParam(r, "commentId") 800 - comments, err := db.GetComments( 801 - rp.db, 802 - orm.FilterEq("id", commentId), 803 - ) 804 - if err != nil { 805 - l.Error("failed to fetch comment", "id", commentId) 806 - http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 807 - return 808 - } 809 - if len(comments) != 1 { 810 - l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 811 - http.Error(w, "invalid comment id", http.StatusBadRequest) 812 - return 813 - } 814 - comment := comments[0] 815 - 816 - if comment.Did.String() != user.Did { 817 - l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Did) 818 - http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 819 - return 820 - } 821 - 822 - if comment.Deleted != nil { 823 - http.Error(w, "comment already deleted", http.StatusBadRequest) 824 - return 825 - } 826 - 827 - // optimistic deletion 828 - deleted := time.Now() 829 - err = db.DeleteComments(rp.db, orm.FilterEq("id", comment.Id)) 830 - if err != nil { 831 - l.Error("failed to delete comment", "err", err) 832 - rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "failed to delete comment") 833 - return 834 - } 835 - 836 - // delete from pds 837 - if comment.Rkey != "" { 838 - client, err := rp.oauth.AuthorizedClient(r) 839 - if err != nil { 840 - l.Error("failed to get authorized client", "err", err) 841 - rp.pages.Notice(w, "issue-comment", "Failed to delete comment.") 842 - return 843 - } 844 - _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 845 - Collection: comment.Collection.String(), 846 - Repo: comment.Did.String(), 847 - Rkey: comment.Rkey.String(), 848 - }) 849 - if err != nil { 850 - l.Error("failed to delete from PDS", "err", err) 851 - } 852 - } 853 - 854 - // optimistic update for htmx 855 - comment.Body = tangled.MarkupMarkdown{} 856 - comment.Deleted = &deleted 857 - 858 - // htmx fragment of comment after deletion 859 - rp.pages.IssueCommentBodyFragment(w, pages.IssueCommentBodyParams{ 860 - LoggedInUser: user, 861 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 862 - Issue: issue, 863 - Comment: &comment, 864 - }) 865 402 } 866 403 867 404 func (rp *Issues) RepoIssues(w http.ResponseWriter, r *http.Request) {

-9

appview/issues/router.go

··· 21 21 // authenticated routes 22 22 r.Group(func(r chi.Router) { 23 23 r.Use(middleware.AuthMiddleware(i.oauth)) 24 - r.Post("/comment", i.NewIssueComment) 25 - r.Route("/comment/{commentId}/", func(r chi.Router) { 26 - r.Get("/", i.IssueComment) 27 - r.Delete("/", i.DeleteIssueComment) 28 - r.Get("/edit", i.EditIssueComment) 29 - r.Post("/edit", i.EditIssueComment) 30 - r.Get("/reply", i.ReplyIssueComment) 31 - r.Get("/replyPlaceholder", i.ReplyIssueCommentPlaceholder) 32 - }) 33 24 r.Get("/edit", i.EditIssue) 34 25 r.Post("/edit", i.EditIssue) 35 26 r.Delete("/", i.DeleteIssue)

+5 -5

appview/models/comment.go

··· 31 31 Deleted *time.Time 32 32 } 33 33 34 - func (c *Comment) AtUri() syntax.ATURI { 34 + func (c Comment) AtUri() syntax.ATURI { 35 35 return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", c.Did, c.Collection, c.Rkey)) 36 36 } 37 37 38 - func (c *Comment) StrongRef() comatproto.RepoStrongRef { 38 + func (c Comment) StrongRef() comatproto.RepoStrongRef { 39 39 return comatproto.RepoStrongRef{ 40 40 Uri: c.AtUri().String(), 41 41 Cid: c.Cid.String(), 42 42 } 43 43 } 44 44 45 - func (c *Comment) AsRecord() typegen.CBORMarshaler { 45 + func (c Comment) AsRecord() typegen.CBORMarshaler { 46 46 // can't convert to record for legacy types 47 47 if c.Collection != tangled.FeedCommentNSID { 48 48 return nil ··· 61 61 } 62 62 } 63 63 64 - func (c *Comment) EditableBody() string { 64 + func (c Comment) EditableBody() string { 65 65 if c.Body.Original != nil { 66 66 return *c.Body.Original 67 67 } 68 68 return c.Body.Text 69 69 } 70 70 71 - func (c *Comment) IsLegacy() bool { 71 + func (c Comment) IsLegacy() bool { 72 72 return c.Collection != tangled.FeedCommentNSID 73 73 } 74 74

+34 -44

appview/pages/pages.go

··· 1238 1238 return p.executeRepo("repo/issues/new", w, params) 1239 1239 } 1240 1240 1241 - type EditIssueCommentParams struct { 1242 - LoggedInUser *oauth.MultiAccountUser 1243 - RepoInfo repoinfo.RepoInfo 1244 - Issue *models.Issue 1245 - Comment *models.Comment 1246 - } 1247 - 1248 - func (p *Pages) EditIssueCommentFragment(w io.Writer, params EditIssueCommentParams) error { 1249 - return p.executePlain("repo/issues/fragments/editIssueComment", w, params) 1250 - } 1251 - 1252 - type ReplyIssueCommentPlaceholderParams struct { 1253 - LoggedInUser *oauth.MultiAccountUser 1254 - RepoInfo repoinfo.RepoInfo 1255 - Issue *models.Issue 1256 - Comment *models.Comment 1257 - } 1258 - 1259 - func (p *Pages) ReplyIssueCommentPlaceholderFragment(w io.Writer, params ReplyIssueCommentPlaceholderParams) error { 1260 - return p.executePlain("repo/issues/fragments/replyIssueCommentPlaceholder", w, params) 1261 - } 1262 - 1263 - type ReplyIssueCommentParams struct { 1264 - LoggedInUser *oauth.MultiAccountUser 1265 - RepoInfo repoinfo.RepoInfo 1266 - Issue *models.Issue 1267 - Comment *models.Comment 1268 - } 1269 - 1270 - func (p *Pages) ReplyIssueCommentFragment(w io.Writer, params ReplyIssueCommentParams) error { 1271 - return p.executePlain("repo/issues/fragments/replyComment", w, params) 1272 - } 1273 - 1274 - type IssueCommentBodyParams struct { 1275 - LoggedInUser *oauth.MultiAccountUser 1276 - RepoInfo repoinfo.RepoInfo 1277 - Issue *models.Issue 1278 - Comment *models.Comment 1279 - } 1280 - 1281 - func (p *Pages) IssueCommentBodyFragment(w io.Writer, params IssueCommentBodyParams) error { 1282 - return p.executePlain("repo/issues/fragments/issueCommentBody", w, params) 1283 - } 1284 - 1285 1241 type StackedDiff struct { 1286 1242 Diff *types.NiceDiff 1287 1243 Opts types.DiffOpts ··· 1714 1670 1715 1671 func (p *Pages) Home(w io.Writer, params TimelineParams) error { 1716 1672 return p.execute("timeline/home", w, params) 1673 + } 1674 + 1675 + type CommentBodyFragmentParams struct { 1676 + Comment models.Comment 1677 + Reactions map[models.ReactionKind]models.ReactionDisplayData 1678 + UserReacted map[models.ReactionKind]bool 1679 + } 1680 + 1681 + func (p *Pages) CommentBodyFragment(w io.Writer, params CommentBodyFragmentParams) error { 1682 + return p.executePlain("fragments/comment/commentBody", w, params) 1683 + } 1684 + 1685 + type EditCommentFragmentParams struct { 1686 + Comment models.Comment 1687 + } 1688 + 1689 + func (p *Pages) EditCommentFragment(w io.Writer, params EditCommentFragmentParams) error { 1690 + return p.executePlain("fragments/comment/edit", w, params) 1691 + } 1692 + 1693 + type ReplyCommentFragmentParams struct { 1694 + LoggedInUser *oauth.MultiAccountUser 1695 + } 1696 + 1697 + func (p *Pages) ReplyCommentFragment(w io.Writer, params ReplyCommentFragmentParams) error { 1698 + return p.executePlain("fragments/comment/reply", w, params) 1699 + } 1700 + 1701 + type ReplyPlaceholderFragmentParams struct { 1702 + LoggedInUser *oauth.MultiAccountUser 1703 + } 1704 + 1705 + func (p *Pages) ReplyPlaceholderFragment(w io.Writer, params ReplyPlaceholderFragmentParams) error { 1706 + return p.executePlain("fragments/comment/replyPlaceholder", w, params) 1717 1707 } 1718 1708 1719 1709 func (p *Pages) Static() http.Handler {

+49

appview/pages/templates/fragments/comment/edit.html

··· 1 + {{ define "fragments/comment/edit" }} 2 + <form 3 + class="pt-2" 4 + hx-patch="/comment" 5 + hx-swap="outerHTML" 6 + hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:find textarea" 7 + hx-indicator="find button[type='submit']" 8 + hx-disabled-elt="find button[type='submit']" 9 + > 10 + <input name="aturi" type="hidden" value="{{ .Comment.AtUri }}"> 11 + <textarea 12 + name="body" 13 + class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 14 + rows="5" 15 + autofocus>{{ .Comment.EditableBody }}</textarea> 16 + <div id="comment-error" class="error"></div> 17 + {{ template "editActions" $ }} 18 + </form> 19 + {{ end }} 20 + 21 + {{ define "editActions" }} 22 + <div class="flex flex-wrap items-center justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm pt-2"> 23 + {{ template "cancel" . }} 24 + {{ template "save" . }} 25 + </div> 26 + {{ end }} 27 + 28 + {{ define "save" }} 29 + <button 30 + type="submit" 31 + class="btn-create py-0 flex gap-1 items-center group text-sm" 32 + > 33 + {{ i "check" "size-4" }} 34 + save 35 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 36 + </button> 37 + {{ end }} 38 + 39 + {{ define "cancel" }} 40 + <button 41 + class="btn py-0 text-red-500 dark:text-red-400 flex gap-1 items-center group" 42 + hx-get="/comment?aturi={{ .Comment.AtUri }}" 43 + hx-target="closest form" 44 + hx-swap="outerHTML" 45 + > 46 + {{ i "x" "size-4" }} 47 + cancel 48 + </button> 49 + {{ end }}

+50

appview/pages/templates/fragments/comment/reply.html

··· 1 + {{ define "fragments/comment/reply" }} 2 + <form 3 + class="p-2 group w-full border-t border-gray-200 dark:border-gray-700 flex flex-col gap-2" 4 + hx-post="/comment" 5 + hx-swap="none" 6 + hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:find textarea" 7 + hx-on::after-request="if(event.detail.successful) this.reset()" 8 + hx-disabled-elt="find button[type='submit']" 9 + > 10 + {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 11 + <textarea 12 + name="body" 13 + class="w-full p-2" 14 + placeholder="Leave a reply..." 15 + autofocus 16 + rows="3"></textarea> 17 + <div id="comment-error" class="error"></div> 18 + {{ template "replyActions" . }} 19 + </form> 20 + {{ end }} 21 + 22 + {{ define "replyActions" }} 23 + <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 24 + {{ template "cancel" . }} 25 + {{ template "reply" . }} 26 + </div> 27 + {{ end }} 28 + 29 + {{ define "cancel" }} 30 + <button 31 + class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 32 + hx-get="/comment/reply/placeholder" 33 + hx-target="closest form" 34 + hx-swap="outerHTML" 35 + > 36 + {{ i "x" "size-4" }} 37 + cancel 38 + </button> 39 + {{ end }} 40 + 41 + {{ define "reply" }} 42 + <button 43 + type="submit" 44 + class="btn-create flex items-center gap-2 no-underline hover:no-underline" 45 + > 46 + {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 47 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 48 + reply 49 + </button> 50 + {{ end }}

+15

appview/pages/templates/fragments/comment/replyPlaceholder.html

··· 1 + {{ define "fragments/comment/replyPlaceholder" }} 2 + <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 + {{ if .LoggedInUser }} 4 + {{ template "user/fragments/pic" (list .LoggedInUser.Did "size-8 mr-1") }} 5 + {{ end }} 6 + <input 7 + class="w-full p-0 border-none focus:outline-none bg-transparent" 8 + placeholder="Leave a reply..." 9 + hx-get="/comment/reply" 10 + hx-trigger="focus" 11 + hx-target="closest div" 12 + hx-swap="outerHTML" 13 + > 14 + </div> 15 + {{ end }}

+1 -2

appview/pages/templates/fragments/line-quote-button.html

··· 18 18 const btnEnd = document.getElementById('line-quote-btn-end'); 19 19 20 20 const textarea = () => 21 - document.getElementById('pull-comment-textarea') 22 - || document.getElementById('comment-textarea'); 21 + document.getElementById('comment-textarea'); 23 22 24 23 const lineOf = (el) => 25 24 el?.closest?.('span[id*="-O"]')

+26 -20

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

··· 1 1 {{ define "repo/issues/fragments/commentList" }} 2 2 <div class="flex flex-col gap-4"> 3 3 {{ range $item := .CommentList }} 4 - {{ template "commentListing" (list $ .) }} 4 + {{ template "commentListItem" (list $ .) }} 5 5 {{ end }} 6 6 </div> 7 7 {{ end }} 8 8 9 - {{ define "commentListing" }} 9 + {{ define "commentListItem" }} 10 10 {{ $root := index . 0 }} 11 - {{ $comment := index . 1 }} 11 + {{ $item := index . 1 }} 12 12 {{ $params := 13 13 (dict 14 - "RepoInfo" $root.RepoInfo 15 - "LoggedInUser" $root.LoggedInUser 16 - "Issue" $root.Issue 17 - "Comment" $comment.Self 18 - "VouchRelationship" (index $root.VouchRelationships $comment.Self.Did) 19 - ) }} 14 + "LoggedInUser" $root.LoggedInUser 15 + "VouchRelationship" (index $root.VouchRelationships $item.Self.Did) 16 + "Comment" $item.Self) }} 20 17 21 18 <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"> 22 19 {{ template "topLevelComment" $params }} 23 20 24 21 <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 25 - {{ range $index, $reply := $comment.Replies }} 22 + {{ range $index, $reply := $item.Replies }} 26 23 <div class="-ml-4"> 27 24 {{ 28 25 template "replyComment" 29 26 (dict 30 - "RepoInfo" $root.RepoInfo 31 - "LoggedInUser" $root.LoggedInUser 32 - "Issue" $root.Issue 33 - "Comment" $reply 27 + "LoggedInUser" $root.LoggedInUser 34 28 "VouchRelationship" (index $root.VouchRelationships $reply.Did) 35 - ) }} 29 + "Comment" $reply) }} 36 30 </div> 37 31 {{ end }} 38 32 </div> 39 33 40 - {{ template "repo/issues/fragments/replyIssueCommentPlaceholder" $params }} 34 + <div hx-include="this"> 35 + <input name="subject-uri" type="hidden" value="{{ $item.Self.Subject.Uri }}"> 36 + <input name="subject-cid" type="hidden" value="{{ $item.Self.Subject.Cid }}"> 37 + <input name="reply-to-uri" type="hidden" value="{{ $item.Self.AtUri }}"> 38 + <input name="reply-to-cid" type="hidden" value="{{ $item.Self.Cid }}"> 39 + {{ if $item.Self.IsLegacy }} 40 + <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 41 + <span class="text-orange-500">Can't reply to legacy comment.</span> 42 + </div> 43 + {{ else }} 44 + {{ template "fragments/comment/replyPlaceholder" (dict "LoggedInUser" $root.LoggedInUser) }} 45 + {{ end }} 46 + </div> 41 47 </div> 42 48 {{ end }} 43 49 ··· 47 53 {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8 mr-1" .VouchRelationship) }} 48 54 </div> 49 55 <div class="flex-1 min-w-0"> 50 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 51 - {{ template "repo/issues/fragments/issueCommentBody" . }} 56 + {{ template "fragments/comment/commentHeader" . }} 57 + {{ template "fragments/comment/commentBody" . }} 52 58 </div> 53 59 </div> 54 60 {{ end }} ··· 59 65 {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8 mr-1" .VouchRelationship) }} 60 66 </div> 61 67 <div class="flex-1 min-w-0"> 62 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 63 - {{ template "repo/issues/fragments/issueCommentBody" . }} 68 + {{ template "fragments/comment/commentHeader" . }} 69 + {{ template "fragments/comment/commentBody" . }} 64 70 </div> 65 71 </div> 66 72 {{ end }}

-44

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

··· 1 - {{ define "repo/issues/fragments/editIssueComment" }} 2 - <div id="comment-body-{{.Comment.Id}}" class="pt-2"> 3 - <textarea 4 - id="edit-textarea-{{ .Comment.Id }}" 5 - name="body" 6 - class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 7 - rows="5" 8 - autofocus>{{ .Comment.EditableBody }}</textarea> 9 - 10 - {{ template "editActions" $ }} 11 - </div> 12 - {{ end }} 13 - 14 - {{ define "editActions" }} 15 - <div class="flex flex-wrap items-center justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm pt-2"> 16 - {{ template "cancel" . }} 17 - {{ template "save" . }} 18 - </div> 19 - {{ end }} 20 - 21 - {{ define "save" }} 22 - <button 23 - class="btn-create py-0 flex gap-1 items-center group text-sm" 24 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit" 25 - hx-trigger="click, keydown[(ctrlKey || metaKey) && key=='Enter'] from:#edit-textarea-{{ .Comment.Id }}" 26 - hx-include="#edit-textarea-{{ .Comment.Id }}" 27 - hx-target="#comment-body-{{ .Comment.Id }}" 28 - hx-swap="outerHTML"> 29 - {{ i "check" "size-4" }} 30 - save 31 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 32 - </button> 33 - {{ end }} 34 - 35 - {{ define "cancel" }} 36 - <button 37 - class="btn py-0 text-red-500 dark:text-red-400 flex gap-1 items-center group" 38 - hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/" 39 - hx-target="#comment-body-{{ .Comment.Id }}" 40 - hx-swap="outerHTML"> 41 - {{ i "x" "size-4" }} 42 - cancel 43 - </button> 44 - {{ end }}

+2 -2

appview/pages/templates/repo/issues/fragments/issueCommentBody.html appview/pages/templates/fragments/comment/commentBody.html

··· 1 - {{ define "repo/issues/fragments/issueCommentBody" }} 2 - <div id="comment-body-{{.Comment.Id}}"> 1 + {{ define "fragments/comment/commentBody" }} 2 + <div class="comment-body"> 3 3 {{ if not .Comment.Deleted }} 4 4 <div class="prose dark:prose-invert">{{ .Comment.Body.Text | markdown }}</div> 5 5 {{ else }}

+13 -13

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

··· 1 - {{ define "repo/issues/fragments/issueCommentHeader" }} 2 - <div class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "> 1 + {{ define "fragments/comment/commentHeader" }} 2 + <div 3 + class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 " 4 + hx-target="next .comment-body" 5 + > 3 6 {{ $handle := resolve .Comment.Did.String }} 4 7 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="/{{ $handle }}">{{ $handle }}</a> 5 8 {{ template "hats" $ }} ··· 8 11 {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did.String) }} 9 12 {{ if and $isCommentOwner (not .Comment.Deleted) }} 10 13 {{ if not .Comment.IsLegacy }} 11 - {{ template "editIssueComment" . }} 14 + {{ template "editCommentBtn" . }} 12 15 {{ end }} 13 - {{ template "deleteIssueComment" . }} 16 + {{ template "deleteCommentBtn" . }} 14 17 {{ end }} 15 18 </div> 16 19 {{ end }} ··· 36 39 </a> 37 40 {{ end }} 38 41 39 - {{ define "editIssueComment" }} 42 + {{ define "editCommentBtn" }} 40 43 <a 41 44 class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group cursor-pointer" 42 - hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit" 43 - hx-swap="outerHTML" 44 - hx-target="#comment-body-{{.Comment.Id}}"> 45 + hx-get="/comment/edit?aturi={{ .Comment.AtUri }}" 46 + > 45 47 {{ i "pencil" "size-3 inline group-[.htmx-request]:hidden" }} 46 48 {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 47 49 </a> 48 50 {{ end }} 49 51 50 - {{ define "deleteIssueComment" }} 52 + {{ define "deleteCommentBtn" }} 51 53 <a 52 54 class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group cursor-pointer" 53 - hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/" 55 + hx-delete="/comment?aturi={{ .Comment.AtUri }}" 54 56 hx-confirm="Are you sure you want to delete your comment?" 55 - hx-swap="outerHTML" 56 - hx-target="#comment-body-{{.Comment.Id}}" 57 - > 57 + > 58 58 {{ i "trash-2" "size-3 inline group-[.htmx-request]:hidden" }} 59 59 {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 60 60 </a>

+16 -37

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

··· 1 1 {{ define "repo/issues/fragments/newComment" }} 2 2 {{ if .LoggedInUser }} 3 3 <form 4 - id="comment-form" 5 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 6 - hx-trigger="submit, keydown[commentButtonEnabled() && (ctrlKey || metaKey) && key=='Enter'] from:#comment-textarea" 7 - hx-disabled-elt="#comment-form button" 8 - hx-on::after-request="if(event.detail.successful) this.reset()" 9 - class="group/form" 4 + hx-post="/comment" 5 + hx-trigger="submit, click from:#close-button, keydown[commentButtonEnabled() && (ctrlKey || metaKey) && key=='Enter'] from:#comment-textarea" 6 + hx-disabled-elt="find button[type='submit']" 7 + hx-on::after-request="if(event.detail.successful) this.reset()" 8 + class="group/form" 10 9 > 10 + <input name="subject-uri" type="hidden" value="{{ .Issue.AtUri }}"> 11 11 <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full"> 12 12 <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 13 13 {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 14 14 </div> 15 - <textarea 16 - id="comment-textarea" 17 - name="body" 18 - class="w-full p-2 rounded" 19 - placeholder="Add to the discussion. Markdown is supported." 20 - onkeyup="updateCommentForm()" 21 - rows="5" 22 - ></textarea> 23 - <div id="issue-comment"></div> 15 + <textarea 16 + id="comment-textarea" 17 + name="body" 18 + class="w-full p-2 rounded" 19 + placeholder="Add to the discussion. Markdown is supported." 20 + onkeyup="updateCommentForm()" 21 + rows="5" 22 + required 23 + ></textarea> 24 + <div id="comment-error" class="error"></div> 24 25 <div id="issue-action" class="error"></div> 25 26 </div> 26 27 ··· 51 52 <span id="close-button-text">close</span> 52 53 </button> 53 54 <div 54 - id="close-with-comment" 55 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 56 - hx-trigger="click from:#close-button" 57 - hx-disabled-elt="#close-with-comment" 58 - hx-target="#issue-comment" 59 - hx-vals="js:{body: document.getElementById('comment-textarea').value.trim() !== '' ? document.getElementById('comment-textarea').value : ''}" 60 - hx-swap="none" 61 - hx-indicator="#close-button" 62 - > 63 - </div> 64 - <div 65 55 id="close-issue" 66 56 hx-disabled-elt="#close-issue" 67 57 hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/close" ··· 71 61 hx-indicator="#close-button" 72 62 > 73 63 </div> 74 - <script> 75 - document.addEventListener('htmx:configRequest', function(evt) { 76 - if (evt.target.id === 'close-with-comment') { 77 - const commentText = document.getElementById('comment-textarea').value.trim(); 78 - if (commentText === '') { 79 - evt.detail.parameters = {}; 80 - evt.preventDefault(); 81 - } 82 - } 83 - }); 84 - </script> 85 64 {{ else if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (not .Issue.Open) }} 86 65 <button 87 66 type="button"

-66

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

··· 1 - {{ define "repo/issues/fragments/replyComment" }} 2 - <form 3 - class="p-2 group w-full border-t border-gray-200 dark:border-gray-700 flex flex-col gap-2" 4 - id="reply-form-{{ .Comment.Id }}" 5 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 6 - hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:#reply-{{.Comment.Id}}-textarea" 7 - hx-on::after-request="if(event.detail.successful) this.reset()" 8 - hx-disabled-elt="#reply-{{ .Comment.Id }}" 9 - > 10 - {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 11 - <textarea 12 - id="reply-{{.Comment.Id}}-textarea" 13 - name="body" 14 - class="w-full p-2" 15 - placeholder="Leave a reply..." 16 - autofocus 17 - rows="3"></textarea> 18 - 19 - <input 20 - type="text" 21 - id="reply-to-uri" 22 - name="reply-to-uri" 23 - required 24 - value="{{ .Comment.AtUri }}" 25 - class="hidden" 26 - /> 27 - <input 28 - type="text" 29 - id="reply-to-cid" 30 - name="reply-to-cid" 31 - required 32 - value="{{ .Comment.Cid }}" 33 - class="hidden" 34 - /> 35 - {{ template "replyActions" . }} 36 - </form> 37 - {{ end }} 38 - 39 - {{ define "replyActions" }} 40 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 41 - {{ template "cancel" . }} 42 - {{ template "reply" . }} 43 - </div> 44 - {{ end }} 45 - 46 - {{ define "cancel" }} 47 - <button 48 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 49 - hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/replyPlaceholder" 50 - hx-target="#reply-form-{{ .Comment.Id }}" 51 - hx-swap="outerHTML"> 52 - {{ i "x" "size-4" }} 53 - cancel 54 - </button> 55 - {{ end }} 56 - 57 - {{ define "reply" }} 58 - <button 59 - id="reply-{{ .Comment.Id }}" 60 - type="submit" 61 - class="btn-create flex items-center gap-2 no-underline hover:no-underline"> 62 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 63 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 64 - reply 65 - </button> 66 - {{ end }}

-22

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

··· 1 - {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }} 2 - <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 - {{ if .Comment.IsLegacy }} 4 - {{ if .LoggedInUser }} 5 - <span class="text-orange-500">Can't reply to legacy comment.</span> 6 - {{ end }} 7 - {{ else }} 8 - {{ if .LoggedInUser }} 9 - {{ template "user/fragments/pic" (list .LoggedInUser.Did "size-8 mr-1") }} 10 - {{ end }} 11 - <input 12 - class="w-full p-0 border-none focus:outline-none bg-transparent" 13 - placeholder="Leave a reply..." 14 - hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply" 15 - hx-trigger="focus" 16 - hx-target="closest div" 17 - hx-swap="outerHTML" 18 - > 19 - </input> 20 - {{ end }} 21 - </div> 22 - {{ end }}

+8 -18

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 - <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative p-2"> 25 + <div id="actions-{{$roundNumber}}" hx-target="this" class="flex flex-wrap gap-2 relative p-2"> 26 26 <button 27 27 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 - hx-target="#actions-{{$roundNumber}}" 29 - hx-swap="outerHtml" 30 28 class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 29 {{ i "message-square-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 32 30 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} ··· 44 42 </button> 45 43 {{ end }} 46 44 {{ if and $isPushAllowed $isOpen $isLastRound }} 47 - {{ $disabled := "" }} 48 - {{ if $isConflicted }} 49 - {{ $disabled = "disabled" }} 50 - {{ end }} 51 45 <button 52 46 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 53 47 hx-swap="none" 54 48 hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 55 - class="btn-flat p-2 flex items-center gap-2 group" {{ $disabled }}> 49 + class="btn-flat p-2 flex items-center gap-2 group" 50 + {{ if $isConflicted }}disabled{{ end }} 51 + > 56 52 {{ i "git-merge" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 57 53 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 58 54 merge{{if $stackCount}} {{$stackCount}}{{end}} ··· 60 56 {{ end }} 61 57 62 58 {{ if and $isPullAuthor $isOpen $isLastRound }} 63 - {{ $disabled := "" }} 64 - {{ if $isUpToDate }} 65 - {{ $disabled = "disabled" }} 66 - {{ end }} 67 59 <button id="resubmitBtn" 68 60 {{ if not .Pull.IsPatchBased }} 69 61 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 62 + hx-swap="none" 70 63 {{ else }} 71 64 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 72 - hx-target="#actions-{{$roundNumber}}" 73 - hx-swap="outerHtml" 74 65 {{ end }} 75 66 76 67 hx-disabled-elt="#resubmitBtn" 77 - class="btn-flat p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 68 + class="btn-flat p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" 78 69 79 - {{ if $disabled }} 70 + {{ if not $isUpToDate }} 80 71 title="Update this branch to resubmit this pull request" 72 + disabled 81 73 {{ else }} 82 74 title="Resubmit this pull request" 83 75 {{ end }} ··· 111 103 {{ end }} 112 104 </div> 113 105 {{ end }} 114 - 115 -

+13 -13

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

··· 1 1 {{ define "repo/pulls/fragments/pullNewComment" }} 2 - <div 3 - id="pull-comment-card-{{ .RoundNumber }}" 4 - class="w-full flex flex-col gap-2"> 2 + <div class="w-full flex flex-col gap-2"> 5 3 {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 6 4 <form 7 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment" 8 - hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:#pull-comment-textarea" 5 + class="w-full flex flex-wrap gap-2 group" 6 + hx-post="/comment" 7 + hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:find textarea" 9 8 hx-swap="none" 9 + hx-indicator="find button[type='submit']" 10 + hx-disabled-elt="find button[type='submit']" 10 11 hx-on::after-request="if(event.detail.successful) this.reset()" 11 - hx-disabled-elt="#reply-{{ .RoundNumber }}" 12 - class="w-full flex flex-wrap gap-2 group" 13 12 > 13 + <input name="subject-uri" type="hidden" value="{{ .Pull.AtUri }}"> 14 + <input name="pull-round-idx" type="hidden" value="{{ .RoundNumber }}"> 14 15 <textarea 15 - id="pull-comment-textarea" 16 - name="body" 17 - class="w-full p-2 rounded border" 18 - rows=8 19 - placeholder="Add to the discussion..."></textarea 16 + id="comment-textarea" 17 + name="body" 18 + class="w-full p-2 rounded border" 19 + rows=8 20 + placeholder="Add to the discussion..."></textarea 20 21 > 21 22 {{ template "replyActions" . }} 22 23 <div id="pull-comment"></div> ··· 47 48 {{ define "reply" }} 48 49 <button 49 50 type="submit" 50 - id="reply-{{ .RoundNumber }}" 51 51 class="btn-create-flat flex items-center gap-2"> 52 52 {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 53 53 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

+22 -2

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

··· 595 595 </summary> 596 596 <div> 597 597 {{ range $item.Comments }} 598 - {{ template "submissionComment" (list . $root) }} 598 + {{/* template "submissionComment" . */}} 599 + {{ template "comment" 600 + (dict "LoggedInUser" $root.LoggedInUser 601 + "VouchRelationship" (index $root.VouchRelationships .Did) 602 + "Comment" .) }} 599 603 {{ end }} 600 604 </div> 601 605 {{ if gt $c 0}} ··· 610 614 {{ block "resubmitStatus" $root }} {{ end }} 611 615 {{ end }} 612 616 </div> 613 - <div class="relative -ml-10 bg-gray-50 dark:bg-gray-900"> 617 + <div hx-include="this" class="relative -ml-10 bg-gray-50 dark:bg-gray-900"> 614 618 {{ if $root.LoggedInUser }} 619 + <input name="subject-uri" type="hidden" value="{{ $root.Pull.AtUri }}"> 620 + <input name="pull-round-idx" type="hidden" value="{{ $item.RoundNumber }}"> 615 621 {{ template "repo/pulls/fragments/pullActions" 616 622 (dict 617 623 "LoggedInUser" $root.LoggedInUser ··· 625 631 {{ end }} 626 632 </div> 627 633 </details> 634 + {{ end }} 635 + 636 + {{ define "comment" }} 637 + <div class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 638 +  639 + <div class="flex-shrink-0 h-fit relative"> 640 + {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8") }} 641 + </div> 642 +  643 + <div class="flex-1 min-w-0"> 644 + {{ template "fragments/comment/commentHeader" . }} 645 + {{ template "fragments/comment/commentBody" . }} 646 + </div> 647 + </div> 628 648 {{ end }} 629 649 630 650 {{ define "submissionComment" }}

-134

appview/pulls/comment.go

··· 1 1 package pulls 2 2 3 3 import ( 4 - "fmt" 5 4 "net/http" 6 5 "strconv" 7 - "time" 8 6 9 - "tangled.org/core/api/tangled" 10 - "tangled.org/core/appview/db" 11 7 "tangled.org/core/appview/models" 12 8 "tangled.org/core/appview/pages" 13 - "tangled.org/core/appview/reporesolver" 14 - "tangled.org/core/tid" 15 9 16 - comatproto "github.com/bluesky-social/indigo/api/atproto" 17 - "github.com/bluesky-social/indigo/atproto/syntax" 18 - lexutil "github.com/bluesky-social/indigo/lex/util" 19 - indigoxrpc "github.com/bluesky-social/indigo/xrpc" 20 10 "github.com/go-chi/chi/v5" 21 11 ) 22 12 ··· 26 16 user := s.oauth.GetMultiAccountUser(r) 27 17 if user != nil { 28 18 l = l.With("user", user.Did) 29 - } 30 - 31 - f, err := s.repoResolver.Resolve(r) 32 - if err != nil { 33 - l.Error("failed to get repo and knot", "err", err) 34 - return 35 19 } 36 20 37 21 pull, ok := r.Context().Value("pull").(*models.Pull) ··· 58 42 Pull: pull, 59 43 RoundNumber: roundNumber, 60 44 }) 61 - return 62 - case http.MethodPost: 63 - body := r.FormValue("body") 64 - if body == "" { 65 - s.pages.Notice(w, "pull-comment", "Comment body is required") 66 - return 67 - } 68 - 69 - // TODO(boltless): normalize markdown body 70 - normalizedBody := body 71 - mentions, references := s.mentionsResolver.Resolve(r.Context(), body) 72 - 73 - markdownBody := tangled.MarkupMarkdown{ 74 - Text: normalizedBody, 75 - Original: &body, 76 - Blobs: nil, 77 - } 78 - 79 - // ingest CID of PR record on-demand. 80 - // TODO(boltless): appview should ingest CID of atproto records 81 - cid, err := func() (syntax.CID, error) { 82 - ident, err := s.idResolver.ResolveIdent(r.Context(), pull.OwnerDid) 83 - if err != nil { 84 - return "", err 85 - } 86 - 87 - xrpcc := indigoxrpc.Client{Host: ident.PDSEndpoint()} 88 - out, err := comatproto.RepoGetRecord(r.Context(), &xrpcc, "", tangled.RepoPullNSID, pull.OwnerDid, pull.Rkey) 89 - if err != nil { 90 - return "", err 91 - } 92 - if out.Cid == nil { 93 - return "", fmt.Errorf("record CID is empty") 94 - } 95 - 96 - cid, err := syntax.ParseCID(*out.Cid) 97 - if err != nil { 98 - return "", err 99 - } 100 - 101 - return cid, nil 102 - }() 103 - if err != nil { 104 - s.logger.Error("failed to backfill subject PR record", "err", err) 105 - s.pages.Notice(w, "pull-comment", "failed to backfill subject record") 106 - return 107 - } 108 - pullStrongRef := comatproto.RepoStrongRef{ 109 - Uri: pull.AtUri().String(), 110 - Cid: cid.String(), 111 - } 112 - 113 - comment := models.Comment{ 114 - Did: syntax.DID(user.Did), 115 - Collection: tangled.FeedCommentNSID, 116 - Rkey: syntax.RecordKey(tid.TID()), 117 - 118 - Subject: pullStrongRef, 119 - Body: markdownBody, 120 - Created: time.Now(), 121 - ReplyTo: nil, 122 - PullRoundIdx: &roundNumber, 123 - } 124 - if err = comment.Validate(); err != nil { 125 - s.logger.Error("failed to validate comment", "err", err) 126 - s.pages.Notice(w, "pull-comment", "Failed to create comment.") 127 - return 128 - } 129 - 130 - client, err := s.oauth.AuthorizedClient(r) 131 - if err != nil { 132 - s.logger.Error("failed to get authorized client", "err", err) 133 - s.pages.Notice(w, "pull-comment", "Failed to create comment.") 134 - return 135 - } 136 - 137 - out, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 138 - Collection: comment.Collection.String(), 139 - Repo: comment.Did.String(), 140 - Rkey: comment.Rkey.String(), 141 - Record: &lexutil.LexiconTypeDecoder{Val: comment.AsRecord()}, 142 - }) 143 - if err != nil { 144 - s.logger.Error("failed to create pull comment", "err", err) 145 - s.pages.Notice(w, "pull-comment", "Failed to create comment.") 146 - return 147 - } 148 - 149 - comment.Cid = syntax.CID(out.Cid) 150 - 151 - // Start a transaction 152 - tx, err := s.db.BeginTx(r.Context(), nil) 153 - if err != nil { 154 - l.Error("failed to start transaction", "err", err) 155 - s.pages.Notice(w, "pull-comment", "Failed to create comment.") 156 - return 157 - } 158 - defer tx.Rollback() 159 - 160 - // Create the pull comment in the database 161 - err = db.PutComment(tx, &comment, references) 162 - if err != nil { 163 - l.Error("failed to create pull comment in database", "err", err) 164 - s.pages.Notice(w, "pull-comment", "Failed to create comment.") 165 - return 166 - } 167 - 168 - // Commit the transaction 169 - if err = tx.Commit(); err != nil { 170 - l.Error("failed to commit transaction", "err", err) 171 - s.pages.Notice(w, "pull-comment", "Failed to create comment.") 172 - return 173 - } 174 - 175 - s.notifier.NewComment(r.Context(), &comment, mentions) 176 - 177 - ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 178 - s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", ownerSlashRepo, pull.PullId, comment.Id)) 179 45 return 180 46 } 181 47 }

+1 -4

appview/pulls/router.go

··· 27 27 r.Get("/", s.RepoPullPatch) 28 28 r.Get("/interdiff", s.RepoPullInterdiff) 29 29 r.Get("/actions", s.PullActions) 30 - r.With(middleware.AuthMiddleware(s.oauth)).Route("/comment", func(r chi.Router) { 31 - r.Get("/", s.PullComment) 32 - r.Post("/", s.PullComment) 33 - }) 30 + r.Get("/comment", s.PullComment) 34 31 }) 35 32 36 33 r.Route("/round/{round}.patch", func(r chi.Router) {

+422

appview/state/comment.go

··· 1 + package state 2 + 3 + import ( 4 + "fmt" 5 + "net/http" 6 + "strconv" 7 + "time" 8 + 9 + comatproto "github.com/bluesky-social/indigo/api/atproto" 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 + lexutil "github.com/bluesky-social/indigo/lex/util" 12 + indigoxrpc "github.com/bluesky-social/indigo/xrpc" 13 + 14 + "tangled.org/core/api/tangled" 15 + "tangled.org/core/appview/db" 16 + "tangled.org/core/appview/models" 17 + "tangled.org/core/appview/pages" 18 + "tangled.org/core/orm" 19 + "tangled.org/core/tid" 20 + ) 21 + 22 + func (s *State) CommentBodyFragment(w http.ResponseWriter, r *http.Request) { 23 + l := s.logger.With("handler", "CommentBodyFragment") 24 + user := s.oauth.GetMultiAccountUser(r) 25 + 26 + commentAt := r.URL.Query().Get("aturi") 27 + comment, err := db.GetComment(s.db, orm.FilterEq("at_uri", commentAt)) 28 + if err != nil { 29 + l.Error("failed to fetch comment", "aturi", commentAt) 30 + http.Error(w, "Failed to fetch comment", http.StatusInternalServerError) 31 + return 32 + } 33 + 34 + reactions, err := db.GetReactionMap(s.db, 20, comment.AtUri()) 35 + if err != nil { 36 + l.Error("failed to get reactions", "err", err) 37 + } 38 + var userReactions map[models.ReactionKind]bool 39 + if user != nil { 40 + userReactions, err = db.GetReactionStatusMap(s.db, syntax.DID(user.Did), comment.AtUri()) 41 + if err != nil { 42 + l.Error("failed to get user reactions", "err", err) 43 + } 44 + } 45 + 46 + err = s.pages.CommentBodyFragment(w, pages.CommentBodyFragmentParams{ 47 + Comment: comment, 48 + Reactions: reactions, 49 + UserReacted: userReactions, 50 + }) 51 + if err != nil { 52 + l.Error("failed to render") 53 + } 54 + } 55 + 56 + func (s *State) EditCommentFragment(w http.ResponseWriter, r *http.Request) { 57 + l := s.logger.With("handler", "EditCommentFragment") 58 + 59 + commentAt := r.URL.Query().Get("aturi") 60 + comment, err := db.GetComment(s.db, orm.FilterEq("at_uri", commentAt)) 61 + if err != nil { 62 + l.Error("failed to fetch comment", "aturi", commentAt) 63 + http.Error(w, "Failed to fetch comment", http.StatusInternalServerError) 64 + return 65 + } 66 + 67 + err = s.pages.EditCommentFragment(w, pages.EditCommentFragmentParams{ 68 + Comment: comment, 69 + }) 70 + if err != nil { 71 + l.Error("failed to render") 72 + } 73 + } 74 + 75 + func (s *State) NewReplyCommentFragment(w http.ResponseWriter, r *http.Request) { 76 + s.pages.ReplyCommentFragment(w, pages.ReplyCommentFragmentParams{ 77 + LoggedInUser: s.oauth.GetMultiAccountUser(r), 78 + }) 79 + } 80 + 81 + func (s *State) ReplyPlaceholderFragment(w http.ResponseWriter, r *http.Request) { 82 + s.pages.ReplyPlaceholderFragment(w, pages.ReplyPlaceholderFragmentParams{ 83 + LoggedInUser: s.oauth.GetMultiAccountUser(r), 84 + }) 85 + } 86 + 87 + func (s *State) NewComment(w http.ResponseWriter, r *http.Request) { 88 + l := s.logger.With("handler", "NewComment") 89 + user := s.oauth.GetMultiAccountUser(r) 90 + 91 + noticeId := "comment-error" 92 + ctx := r.Context() 93 + 94 + body := r.FormValue("body") 95 + if body == "" { 96 + s.pages.Notice(w, noticeId, "Body is required") 97 + return 98 + } 99 + 100 + // TODO(boltless): normalize markdown body 101 + normalizedBody := body 102 + _, references := s.mentionsResolver.Resolve(ctx, body) 103 + 104 + markdownBody := tangled.MarkupMarkdown{ 105 + Text: normalizedBody, 106 + Original: &body, 107 + Blobs: nil, 108 + } 109 + 110 + subjectUri, err := syntax.ParseATURI(r.FormValue("subject-uri")) 111 + if err != nil { 112 + l.Warn("invalid subject uri", "err", err) 113 + s.pages.Notice(w, noticeId, "Subject URI should be valid AT-URI") 114 + return 115 + } 116 + l = l.With("subject.uri", subjectUri) 117 + 118 + // ingest CID of subject record on-demand. 119 + // TODO(boltless): appview should ingest CID of all atproto records 120 + var subjectCid syntax.CID 121 + if subjectCidRaw := r.FormValue("subject-cid"); subjectCidRaw != "" { 122 + subjectCid, err = syntax.ParseCID(subjectCidRaw) 123 + if err != nil { 124 + l.Warn("invalid subject cid", "err", err) 125 + s.pages.Notice(w, noticeId, "Subject CID should be valid CID") 126 + return 127 + } 128 + } else { 129 + l.Debug("fetching subject record CID") 130 + subjectCid, err = func(uri syntax.ATURI) (syntax.CID, error) { 131 + ident, err := s.idResolver.ResolveIdent(ctx, uri.Authority().String()) 132 + if err != nil { 133 + return "", err 134 + } 135 + 136 + xrpcc := indigoxrpc.Client{Host: ident.PDSEndpoint()} 137 + out, err := comatproto.RepoGetRecord(ctx, &xrpcc, "", uri.Collection().String(), ident.DID.String(), uri.RecordKey().String()) 138 + if err != nil { 139 + return "", err 140 + } 141 + if out.Cid == nil { 142 + return "", fmt.Errorf("record CID is empty") 143 + } 144 + 145 + cid, err := syntax.ParseCID(*out.Cid) 146 + if err != nil { 147 + return "", err 148 + } 149 + 150 + return cid, nil 151 + }(subjectUri) 152 + if err != nil { 153 + l.Error("failed to backfill subject record", "err", err) 154 + s.pages.Notice(w, noticeId, "failed to backfill subject record") 155 + return 156 + } 157 + } 158 + l = l.With("subject.cid", subjectCid) 159 + 160 + subject := comatproto.RepoStrongRef{ 161 + Uri: subjectUri.String(), 162 + Cid: subjectCid.String(), 163 + } 164 + 165 + var pullRoundIdx *int 166 + if pullRoundIdxRaw := r.FormValue("pull-round-idx"); pullRoundIdxRaw != "" { 167 + roundIdx, err := strconv.Atoi(pullRoundIdxRaw) 168 + if err != nil { 169 + l.Warn("invalid round idx", "err", err) 170 + s.pages.Notice(w, noticeId, "pull round index should be valid integer") 171 + return 172 + } 173 + pullRoundIdx = &roundIdx 174 + } 175 + 176 + var replyTo *comatproto.RepoStrongRef 177 + replyToUriRaw := r.FormValue("reply-to-uri") 178 + replyToCidRaw := r.FormValue("reply-to-cid") 179 + if replyToUriRaw != "" && replyToCidRaw != "" { 180 + uri, err := syntax.ParseATURI(replyToUriRaw) 181 + if err != nil { 182 + s.pages.Notice(w, noticeId, "reply-to-uri should be valid AT-URI") 183 + return 184 + } 185 + cid, err := syntax.ParseCID(replyToCidRaw) 186 + if err != nil { 187 + s.pages.Notice(w, noticeId, "reply-to-cid should be valid CID") 188 + return 189 + } 190 + replyTo = &comatproto.RepoStrongRef{ 191 + Uri: uri.String(), 192 + Cid: cid.String(), 193 + } 194 + } 195 + 196 + comment := models.Comment{ 197 + Did: syntax.DID(user.Did), 198 + Collection: tangled.FeedCommentNSID, 199 + Rkey: syntax.RecordKey(tid.TID()), 200 + 201 + Subject: subject, 202 + Body: markdownBody, 203 + Created: time.Now(), 204 + ReplyTo: replyTo, 205 + PullRoundIdx: pullRoundIdx, 206 + } 207 + if err = comment.Validate(); err != nil { 208 + l.Error("failed to validate comment", "err", err) 209 + s.pages.Notice(w, noticeId, "Failed to create comment.") 210 + return 211 + } 212 + 213 + client, err := s.oauth.AuthorizedClient(r) 214 + if err != nil { 215 + l.Error("failed to get authorized client", "err", err) 216 + s.pages.Notice(w, noticeId, "Failed to create comment.") 217 + return 218 + } 219 + 220 + // create a record first 221 + out, err := comatproto.RepoPutRecord(ctx, client, &comatproto.RepoPutRecord_Input{ 222 + Collection: comment.Collection.String(), 223 + Repo: comment.Did.String(), 224 + Rkey: comment.Rkey.String(), 225 + Record: &lexutil.LexiconTypeDecoder{Val: comment.AsRecord()}, 226 + }) 227 + if err != nil { 228 + l.Error("failed to create comment", "err", err) 229 + s.pages.Notice(w, noticeId, "Failed to create comment.") 230 + return 231 + } 232 + 233 + comment.Cid = syntax.CID(out.Cid) 234 + 235 + tx, err := s.db.Begin() 236 + if err != nil { 237 + l.Error("failed to start transaction", "err", err) 238 + s.pages.Notice(w, noticeId, "Failed to create comment, try again later.") 239 + return 240 + } 241 + defer tx.Rollback() 242 + 243 + err = db.PutComment(tx, &comment, references) 244 + if err != nil { 245 + l.Error("failed to create comment", "err", err) 246 + s.pages.Notice(w, noticeId, "Failed to create comment.") 247 + return 248 + } 249 + 250 + err = tx.Commit() 251 + if err != nil { 252 + l.Error("failed to commit transaction", "err", err) 253 + s.pages.Notice(w, noticeId, "Failed to create comment, try again later.") 254 + return 255 + } 256 + 257 + // TODO: return comment or reply-comment fragment 258 + // onattach, htmx-callback to focus on comment. 259 + s.pages.HxRefresh(w) 260 + } 261 + 262 + func (s *State) EditComment(w http.ResponseWriter, r *http.Request) { 263 + l := s.logger.With("handler", "EditComment") 264 + user := s.oauth.GetMultiAccountUser(r) 265 + 266 + noticeId := "comment-error" 267 + ctx := r.Context() 268 + 269 + commentAt := r.FormValue("aturi") 270 + comment, err := db.GetComment(s.db, orm.FilterEq("at_uri", commentAt)) 271 + if err != nil { 272 + l.Error("failed to fetch comment", "aturi", commentAt, "err", err) 273 + s.pages.Notice(w, noticeId, "Failed to fetch comment") 274 + return 275 + } 276 + 277 + if comment.Did.String() != user.Did { 278 + l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Did) 279 + s.pages.Notice(w, noticeId, "You are not the author of this comment") 280 + return 281 + } 282 + 283 + body := r.FormValue("body") 284 + if body == "" { 285 + s.pages.Notice(w, noticeId, "Body is required") 286 + return 287 + } 288 + 289 + // TODO(boltless): normalize markdown body 290 + normalizedBody := body 291 + _, references := s.mentionsResolver.Resolve(ctx, body) 292 + 293 + now := time.Now() 294 + newComment := comment 295 + newComment.Body = tangled.MarkupMarkdown{ 296 + Text: normalizedBody, 297 + Original: &body, 298 + Blobs: nil, 299 + } 300 + newComment.Edited = &now 301 + if err := newComment.Validate(); err != nil { 302 + l.Error("failed to validate comment", "err", err) 303 + s.pages.Notice(w, noticeId, "Failed to update comment.") 304 + return 305 + } 306 + 307 + client, err := s.oauth.AuthorizedClient(r) 308 + if err != nil { 309 + l.Error("failed to get authorized client", "err", err) 310 + s.pages.Notice(w, noticeId, "Failed to create comment. try again later.") 311 + return 312 + } 313 + 314 + // update the record first 315 + exCid := comment.Cid.String() 316 + out, err := comatproto.RepoPutRecord(ctx, client, &comatproto.RepoPutRecord_Input{ 317 + Collection: newComment.Collection.String(), 318 + Repo: newComment.Did.String(), 319 + Rkey: newComment.Rkey.String(), 320 + SwapRecord: &exCid, 321 + Record: &lexutil.LexiconTypeDecoder{ 322 + Val: newComment.AsRecord(), 323 + }, 324 + }) 325 + if err != nil { 326 + l.Error("failed to update comment", "err", err) 327 + s.pages.Notice(w, noticeId, "Failed to update comment, try again later.") 328 + return 329 + } 330 + 331 + newComment.Cid = syntax.CID(out.Cid) 332 + 333 + tx, err := s.db.Begin() 334 + if err != nil { 335 + l.Error("failed to start transaction", "err", err) 336 + s.pages.Notice(w, noticeId, "Failed to update comment, try again later.") 337 + return 338 + } 339 + defer tx.Rollback() 340 + 341 + err = db.PutComment(tx, &newComment, references) 342 + if err != nil { 343 + l.Error("failed to perform update-description query", "err", err) 344 + s.pages.Notice(w, noticeId, "Failed to update comment, try again later.") 345 + return 346 + } 347 + err = tx.Commit() 348 + if err != nil { 349 + l.Error("failed to commit transaction", "err", err) 350 + s.pages.Notice(w, noticeId, "Failed to update comment, try again later.") 351 + return 352 + } 353 + 354 + reactions, err := db.GetReactionMap(s.db, 20, comment.AtUri()) 355 + if err != nil { 356 + l.Error("failed to get reactions", "err", err) 357 + } 358 + userReactions, err := db.GetReactionStatusMap(s.db, syntax.DID(user.Did), comment.AtUri()) 359 + if err != nil { 360 + l.Error("failed to get user reactions", "err", err) 361 + } 362 + 363 + // TODO: return full comment fragment so we can update comment header too 364 + s.pages.CommentBodyFragment(w, pages.CommentBodyFragmentParams{ 365 + Comment: newComment, 366 + Reactions: reactions, 367 + UserReacted: userReactions, 368 + }) 369 + } 370 + 371 + func (s *State) DeleteComment(w http.ResponseWriter, r *http.Request) { 372 + l := s.logger.With("handler", "DeleteComment") 373 + user := s.oauth.GetMultiAccountUser(r) 374 + 375 + noticeId := "comment" 376 + ctx := r.Context() 377 + 378 + commentAt := r.URL.Query().Get("aturi") 379 + comment, err := db.GetComment(s.db, orm.FilterEq("at_uri", commentAt)) 380 + if err != nil { 381 + l.Error("failed to fetch comment", "aturi", commentAt) 382 + s.pages.Notice(w, noticeId, "Failed to fetch comment.") 383 + return 384 + } 385 + 386 + if comment.Did.String() != user.Did { 387 + l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Did) 388 + s.pages.Notice(w, noticeId, "you are not the author of this comment") 389 + return 390 + } 391 + 392 + if comment.Deleted != nil { 393 + s.pages.Notice(w, noticeId, "Comment already deleted") 394 + return 395 + } 396 + 397 + client, err := s.oauth.AuthorizedClient(r) 398 + if err != nil { 399 + l.Error("failed to get authorized client", "err", err) 400 + s.pages.Notice(w, "comment", "Failed to delete comment.") 401 + return 402 + } 403 + _, err = comatproto.RepoDeleteRecord(ctx, client, &comatproto.RepoDeleteRecord_Input{ 404 + Collection: comment.Collection.String(), 405 + Repo: comment.Did.String(), 406 + Rkey: comment.Rkey.String(), 407 + }) 408 + if err != nil { 409 + l.Error("failed to delete from PDS", "err", err) 410 + s.pages.Notice(w, noticeId, "Failed to delete comment, try again later.") 411 + return 412 + } 413 + 414 + // optimistic update for htmx response 415 + now := time.Now() 416 + comment.Body = tangled.MarkupMarkdown{} 417 + comment.Deleted = &now 418 + 419 + s.pages.CommentBodyFragment(w, pages.CommentBodyFragmentParams{ 420 + Comment: comment, 421 + }) 422 + }

+10

appview/state/router.go

··· 212 212 r.Delete("/", s.React) 213 213 }) 214 214 215 + r.With(middleware.AuthMiddleware(s.oauth)).Route("/comment", func(r chi.Router) { 216 + r.Get("/", s.CommentBodyFragment) 217 + r.Get("/edit", s.EditCommentFragment) 218 + r.Get("/reply", s.NewReplyCommentFragment) 219 + r.Get("/reply/placeholder", s.ReplyPlaceholderFragment) 220 + r.Post("/", s.NewComment) 221 + r.Patch("/", s.EditComment) 222 + r.Delete("/", s.DeleteComment) 223 + }) 224 + 215 225 r.Get("/profile/popover", s.ProfilePopover) 216 226 217 227 r.Route("/profile", func(r chi.Router) {

-6

appview/strings/strings.go

··· 55 55 r.Get("/raw", s.contents) 56 56 r.Get("/edit", s.edit) 57 57 r.Post("/edit", s.edit) 58 - r. 59 - With(middleware.AuthMiddleware(s.OAuth)). 60 - Post("/comment", s.comment) 61 58 }) 62 59 }) 63 60 ··· 437 434 438 435 s.Pages.HxRedirect(w, "/strings/"+user.Did) 439 436 } 440 - 441 - func (s *Strings) comment(w http.ResponseWriter, r *http.Request) { 442 - }

Configure Feed

Configure Feed