+76

appview/db/collaborators.go

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "strings" 6 6 + "time" 7 7 + 8 8 + "github.com/bluesky-social/indigo/atproto/syntax" 9 9 + ) 10 10 + 11 11 + type Collaborator struct { 12 12 + // identifiers for the record 13 13 + Id int64 14 14 + Did syntax.DID 15 15 + Rkey string 16 16 + 17 17 + // content 18 18 + SubjectDid syntax.DID 19 19 + RepoAt syntax.ATURI 20 20 + 21 21 + // meta 22 22 + Created time.Time 23 23 + } 24 24 + 25 25 + func AddCollaborator(e Execer, c Collaborator) error { 26 26 + _, err := e.Exec( 27 27 + `insert into collaborators (did, rkey, subject_did, repo_at) values (?, ?, ?, ?);`, 28 28 + c.Did, c.Rkey, c.SubjectDid, c.RepoAt, 29 29 + ) 30 30 + return err 31 31 + } 32 32 + 33 33 + func DeleteCollaborator(e Execer, filters ...filter) error { 34 34 + var conditions []string 35 35 + var args []any 36 36 + for _, filter := range filters { 37 37 + conditions = append(conditions, filter.Condition()) 38 38 + args = append(args, filter.Arg()...) 39 39 + } 40 40 + 41 41 + whereClause := "" 42 42 + if conditions != nil { 43 43 + whereClause = " where " + strings.Join(conditions, " and ") 44 44 + } 45 45 + 46 46 + query := fmt.Sprintf(`delete from collaborators %s`, whereClause) 47 47 + 48 48 + _, err := e.Exec(query, args...) 49 49 + return err 50 50 + } 51 51 + 52 52 + func CollaboratingIn(e Execer, collaborator string) ([]Repo, error) { 53 53 + rows, err := e.Query(`select repo_at from collaborators where did = ?`, collaborator) 54 54 + if err != nil { 55 55 + return nil, err 56 56 + } 57 57 + defer rows.Close() 58 58 + 59 59 + var repoAts []string 60 60 + for rows.Next() { 61 61 + var aturi string 62 62 + err := rows.Scan(&aturi) 63 63 + if err != nil { 64 64 + return nil, err 65 65 + } 66 66 + repoAts = append(repoAts, aturi) 67 67 + } 68 68 + if err := rows.Err(); err != nil { 69 69 + return nil, err 70 70 + } 71 71 + if repoAts == nil { 72 72 + return nil, nil 73 73 + } 74 74 + 75 75 + return GetRepos(e, 0, FilterIn("at_uri", repoAts)) 76 76 + }

+55

appview/db/db.go

··· 578 578 return nil 579 579 }) 580 580 581 581 + // recreate and add rkey + created columns with default constraint 582 582 + runMigration(db, "rework-collaborators-table", func(tx *sql.Tx) error { 583 583 + // create new table 584 584 + // - repo_at instead of repo integer 585 585 + // - rkey field 586 586 + // - created field 587 587 + _, err := tx.Exec(` 588 588 + create table collaborators_new ( 589 589 + -- identifiers for the record 590 590 + id integer primary key autoincrement, 591 591 + did text not null, 592 592 + rkey text, 593 593 + 594 594 + -- content 595 595 + subject_did text not null, 596 596 + repo_at text not null, 597 597 + 598 598 + -- meta 599 599 + created text default (strftime('%y-%m-%dt%h:%m:%sz', 'now')), 600 600 + 601 601 + -- constraints 602 602 + foreign key (repo_at) references repos(at_uri) on delete cascade 603 603 + ) 604 604 + `) 605 605 + if err != nil { 606 606 + return err 607 607 + } 608 608 + 609 609 + // copy data 610 610 + _, err = tx.Exec(` 611 611 + insert into collaborators_new (id, did, rkey, subject_did, repo_at) 612 612 + select 613 613 + c.id, 614 614 + r.did, 615 615 + '', 616 616 + c.did, 617 617 + r.at_uri 618 618 + from collaborators c 619 619 + join repos r on c.repo = r.id 620 620 + `) 621 621 + if err != nil { 622 622 + return err 623 623 + } 624 624 + 625 625 + // drop old table 626 626 + _, err = tx.Exec(`drop table collaborators`) 627 627 + if err != nil { 628 628 + return err 629 629 + } 630 630 + 631 631 + // rename new table 632 632 + _, err = tx.Exec(`alter table collaborators_new rename to collaborators`) 633 633 + return err 634 634 + }) 635 635 + 581 636 return &DB{db}, nil 582 637 } 583 638

-34

appview/db/repos.go

··· 550 550 return &repo, nil 551 551 } 552 552 553 553 - func AddCollaborator(e Execer, collaborator, repoOwnerDid, repoName, repoKnot string) error { 554 554 - _, err := e.Exec( 555 555 - `insert into collaborators (did, repo) 556 556 - values (?, (select id from repos where did = ? and name = ? and knot = ?));`, 557 557 - collaborator, repoOwnerDid, repoName, repoKnot) 558 558 - return err 559 559 - } 560 560 - 561 553 func UpdateDescription(e Execer, repoAt, newDescription string) error { 562 554 _, err := e.Exec( 563 555 `update repos set description = ? where at_uri = ?`, newDescription, repoAt) ··· 568 560 _, err := e.Exec( 569 561 `update repos set spindle = ? where at_uri = ?`, spindle, repoAt) 570 562 return err 571 571 - } 572 572 - 573 573 - func CollaboratingIn(e Execer, collaborator string) ([]Repo, error) { 574 574 - rows, err := e.Query(`select repo from collaborators where did = ?`, collaborator) 575 575 - if err != nil { 576 576 - return nil, err 577 577 - } 578 578 - defer rows.Close() 579 579 - 580 580 - var repoIds []int 581 581 - for rows.Next() { 582 582 - var id int 583 583 - err := rows.Scan(&id) 584 584 - if err != nil { 585 585 - return nil, err 586 586 - } 587 587 - repoIds = append(repoIds, id) 588 588 - } 589 589 - if err := rows.Err(); err != nil { 590 590 - return nil, err 591 591 - } 592 592 - if repoIds == nil { 593 593 - return nil, nil 594 594 - } 595 595 - 596 596 - return GetRepos(e, 0, FilterIn("id", repoIds)) 597 563 } 598 564 599 565 type RepoStats struct {

+39 -3

appview/repo/repo.go

··· 39 39 "github.com/go-git/go-git/v5/plumbing" 40 40 41 41 comatproto "github.com/bluesky-social/indigo/api/atproto" 42 42 + "github.com/bluesky-social/indigo/atproto/syntax" 42 43 lexutil "github.com/bluesky-social/indigo/lex/util" 43 44 ) 44 45 ··· 751 752 fail("You seem to be adding yourself as a collaborator.", nil) 752 753 return 753 754 } 754 754 - 755 755 l = l.With("collaborator", collaboratorIdent.Handle) 756 756 l = l.With("knot", f.Knot) 757 757 - l.Info("adding to knot") 757 757 + 758 758 + // announce this relation into the firehose, store into owners' pds 759 759 + client, err := rp.oauth.AuthorizedClient(r) 760 760 + if err != nil { 761 761 + fail("Failed to write to PDS.", err) 762 762 + return 763 763 + } 764 764 + 765 765 + // emit a record 766 766 + currentUser := rp.oauth.GetUser(r) 767 767 + rkey := tid.TID() 768 768 + createdAt := time.Now() 769 769 + resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 770 770 + Collection: tangled.RepoCollaboratorNSID, 771 771 + Repo: currentUser.Did, 772 772 + Rkey: rkey, 773 773 + Record: &lexutil.LexiconTypeDecoder{ 774 774 + Val: &tangled.RepoCollaborator{ 775 775 + Subject: collaboratorIdent.DID.String(), 776 776 + Repo: string(f.RepoAt), 777 777 + CreatedAt: createdAt.Format(time.RFC3339), 778 778 + }}, 779 779 + }) 780 780 + // invalid record 781 781 + if err != nil { 782 782 + fail("Failed to write record to PDS.", err) 783 783 + return 784 784 + } 785 785 + l = l.With("at-uri", resp.Uri) 786 786 + l.Info("wrote record to PDS") 758 787 788 788 + l.Info("adding to knot") 759 789 secret, err := db.GetRegistrationKey(rp.db, f.Knot) 760 790 if err != nil { 761 791 fail("Failed to add to knot.", err) ··· 798 828 return 799 829 } 800 830 801 801 - err = db.AddCollaborator(rp.db, collaboratorIdent.DID.String(), f.OwnerDid(), f.RepoName, f.Knot) 831 831 + err = db.AddCollaborator(rp.db, db.Collaborator{ 832 832 + Did: syntax.DID(currentUser.Did), 833 833 + Rkey: rkey, 834 834 + SubjectDid: collaboratorIdent.DID, 835 835 + RepoAt: f.RepoAt, 836 836 + Created: createdAt, 837 837 + }) 802 838 if err != nil { 803 839 fail("Failed to add collaborator.", err) 804 840 return