appview: remove oauth.User type #1027

+19 -19

appview/issues/issues.go

··· 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()) ··· 181 181 return 182 182 } 183 183 184 184 - ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueNSID, user.Active.Did, newIssue.Rkey) 184 184 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueNSID, user.Did, newIssue.Rkey) 185 185 if err != nil { 186 186 l.Error("failed to get record", "err", err) 187 187 rp.pages.Notice(w, noticeId, "Failed to edit issue, no record found on PDS.") ··· 190 190 191 191 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 192 192 Collection: tangled.RepoIssueNSID, 193 193 - Repo: user.Active.Did, 193 193 + Repo: user.Did, 194 194 Rkey: newIssue.Rkey, 195 195 SwapRecord: ex.Cid, 196 196 Record: &lexutil.LexiconTypeDecoder{ ··· 305 305 return 306 306 } 307 307 308 308 - roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 308 308 + roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 309 309 isRepoOwner := roles.IsOwner() 310 310 isCollaborator := roles.IsCollaborator() 311 311 - isIssueOwner := user.Active.Did == issue.Did 311 311 + isIssueOwner := user.Did == issue.Did 312 312 313 313 // TODO: make this more granular 314 314 if isIssueOwner || isRepoOwner || isCollaborator { ··· 325 325 issue.Open = false 326 326 327 327 // notify about the issue closure 328 328 - rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Active.Did), issue) 328 328 + rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Did), issue) 329 329 330 330 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 331 331 rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", ownerSlashRepo, issue.IssueId)) ··· 353 353 return 354 354 } 355 355 356 356 - roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 356 356 + roles := repoinfo.RolesInRepo{Roles: rp.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 357 357 isRepoOwner := roles.IsOwner() 358 358 isCollaborator := roles.IsCollaborator() 359 359 - isIssueOwner := user.Active.Did == issue.Did 359 359 + isIssueOwner := user.Did == issue.Did 360 360 361 361 if isCollaborator || isRepoOwner || isIssueOwner { 362 362 err := db.ReopenIssues( ··· 372 372 issue.Open = true 373 373 374 374 // notify about the issue reopen 375 375 - rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Active.Did), issue) 375 375 + rp.notifier.NewIssueState(r.Context(), syntax.DID(user.Did), issue) 376 376 377 377 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) 378 378 rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", ownerSlashRepo, issue.IssueId)) ··· 415 415 mentions, references := rp.mentionsResolver.Resolve(r.Context(), body) 416 416 417 417 comment := models.IssueComment{ 418 418 - Did: user.Active.Did, 418 418 + Did: user.Did, 419 419 Rkey: tid.TID(), 420 420 IssueAt: issue.AtUri().String(), 421 421 ReplyTo: replyTo, ··· 556 556 } 557 557 comment := comments[0] 558 558 559 559 - if comment.Did != user.Active.Did { 560 560 - l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Active.Did) 559 559 + if comment.Did != user.Did { 560 560 + l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Did) 561 561 http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 562 562 return 563 563 } ··· 607 607 // rkey is optional, it was introduced later 608 608 if newComment.Rkey != "" { 609 609 // update the record on pds 610 610 - ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueCommentNSID, user.Active.Did, comment.Rkey) 610 610 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueCommentNSID, user.Did, comment.Rkey) 611 611 if err != nil { 612 612 l.Error("failed to get record", "err", err, "did", newComment.Did, "rkey", newComment.Rkey) 613 613 rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "Failed to update description, no record found on PDS.") ··· 616 616 617 617 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 618 618 Collection: tangled.RepoIssueCommentNSID, 619 619 - Repo: user.Active.Did, 619 619 + Repo: user.Did, 620 620 Rkey: newComment.Rkey, 621 621 SwapRecord: ex.Cid, 622 622 Record: &lexutil.LexiconTypeDecoder{ ··· 738 738 } 739 739 comment := comments[0] 740 740 741 741 - if comment.Did != user.Active.Did { 742 742 - l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Active.Did) 741 741 + if comment.Did != user.Did { 742 742 + l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Did) 743 743 http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 744 744 return 745 745 } ··· 768 768 } 769 769 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 770 770 Collection: tangled.RepoIssueCommentNSID, 771 771 - Repo: user.Active.Did, 771 771 + Repo: user.Did, 772 772 Rkey: comment.Rkey, 773 773 }) 774 774 if err != nil { ··· 920 920 Title: r.FormValue("title"), 921 921 Body: body, 922 922 Open: true, 923 923 - Did: user.Active.Did, 923 923 + Did: user.Did, 924 924 Created: time.Now(), 925 925 Mentions: mentions, 926 926 References: references, ··· 944 944 } 945 945 resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 946 946 Collection: tangled.RepoIssueNSID, 947 947 - Repo: user.Active.Did, 947 947 + Repo: user.Did, 948 948 Rkey: issue.Rkey, 949 949 Record: &lexutil.LexiconTypeDecoder{ 950 950 Val: &record,

+24 -24

appview/knots/knots.go

··· 60 60 user := k.OAuth.GetMultiAccountUser(r) 61 61 registrations, err := db.GetRegistrations( 62 62 k.Db, 63 63 - orm.FilterEq("did", user.Active.Did), 63 63 + orm.FilterEq("did", user.Did), 64 64 ) 65 65 if err != nil { 66 66 k.Logger.Error("failed to fetch knot registrations", "err", err) ··· 78 78 l := k.Logger.With("handler", "dashboard") 79 79 80 80 user := k.OAuth.GetMultiAccountUser(r) 81 81 - l = l.With("user", user.Active.Did) 81 81 + l = l.With("user", user.Did) 82 82 83 83 domain := chi.URLParam(r, "domain") 84 84 if domain == "" { ··· 88 88 89 89 registrations, err := db.GetRegistrations( 90 90 k.Db, 91 91 - orm.FilterEq("did", user.Active.Did), 91 91 + orm.FilterEq("did", user.Did), 92 92 orm.FilterEq("domain", domain), 93 93 ) 94 94 if err != nil { ··· 158 158 return 159 159 } 160 160 l = l.With("domain", domain) 161 161 - l = l.With("user", user.Active.Did) 161 161 + l = l.With("user", user.Did) 162 162 163 163 tx, err := k.Db.Begin() 164 164 if err != nil { ··· 171 171 k.Enforcer.E.LoadPolicy() 172 172 }() 173 173 174 174 - err = db.AddKnot(tx, domain, user.Active.Did) 174 174 + err = db.AddKnot(tx, domain, user.Did) 175 175 if err != nil { 176 176 l.Error("failed to insert", "err", err) 177 177 fail() ··· 193 193 return 194 194 } 195 195 196 196 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Active.Did, domain) 196 196 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Did, domain) 197 197 var exCid *string 198 198 if ex != nil { 199 199 exCid = ex.Cid ··· 202 202 // re-announce by registering under same rkey 203 203 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 204 204 Collection: tangled.KnotNSID, 205 205 - Repo: user.Active.Did, 205 205 + Repo: user.Did, 206 206 Rkey: domain, 207 207 Record: &lexutil.LexiconTypeDecoder{ 208 208 Val: &tangled.Knot{ ··· 233 233 } 234 234 235 235 // begin verification 236 236 - err = serververify.RunVerification(r.Context(), domain, user.Active.Did, k.Config.Core.Dev) 236 236 + err = serververify.RunVerification(r.Context(), domain, user.Did, k.Config.Core.Dev) 237 237 if err != nil { 238 238 l.Error("verification failed", "err", err) 239 239 k.Pages.HxRefresh(w) 240 240 return 241 241 } 242 242 243 243 - err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Active.Did) 243 243 + err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Did) 244 244 if err != nil { 245 245 l.Error("failed to mark verified", "err", err) 246 246 k.Pages.HxRefresh(w) ··· 277 277 // get record from db first 278 278 registrations, err := db.GetRegistrations( 279 279 k.Db, 280 280 - orm.FilterEq("did", user.Active.Did), 280 280 + orm.FilterEq("did", user.Did), 281 281 orm.FilterEq("domain", domain), 282 282 ) 283 283 if err != nil { ··· 305 305 306 306 err = db.DeleteKnot( 307 307 tx, 308 308 - orm.FilterEq("did", user.Active.Did), 308 308 + orm.FilterEq("did", user.Did), 309 309 orm.FilterEq("domain", domain), 310 310 ) 311 311 if err != nil { ··· 333 333 334 334 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 335 335 Collection: tangled.KnotNSID, 336 336 - Repo: user.Active.Did, 336 336 + Repo: user.Did, 337 337 Rkey: domain, 338 338 }) 339 339 if err != nil { ··· 381 381 return 382 382 } 383 383 l = l.With("domain", domain) 384 384 - l = l.With("user", user.Active.Did) 384 384 + l = l.With("user", user.Did) 385 385 386 386 // get record from db first 387 387 registrations, err := db.GetRegistrations( 388 388 k.Db, 389 389 - orm.FilterEq("did", user.Active.Did), 389 389 + orm.FilterEq("did", user.Did), 390 390 orm.FilterEq("domain", domain), 391 391 ) 392 392 if err != nil { ··· 402 402 registration := registrations[0] 403 403 404 404 // begin verification 405 405 - err = serververify.RunVerification(r.Context(), domain, user.Active.Did, k.Config.Core.Dev) 405 405 + err = serververify.RunVerification(r.Context(), domain, user.Did, k.Config.Core.Dev) 406 406 if err != nil { 407 407 l.Error("verification failed", "err", err) 408 408 ··· 420 420 return 421 421 } 422 422 423 423 - err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Active.Did) 423 423 + err = serververify.MarkKnotVerified(k.Db, k.Enforcer, domain, user.Did) 424 424 if err != nil { 425 425 l.Error("failed to mark verified", "err", err) 426 426 k.Pages.Notice(w, noticeId, err.Error()) ··· 439 439 return 440 440 } 441 441 442 442 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Active.Did, domain) 442 442 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Did, domain) 443 443 var exCid *string 444 444 if ex != nil { 445 445 exCid = ex.Cid ··· 448 448 // ignore the error here 449 449 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 450 450 Collection: tangled.KnotNSID, 451 451 - Repo: user.Active.Did, 451 451 + Repo: user.Did, 452 452 Rkey: domain, 453 453 Record: &lexutil.LexiconTypeDecoder{ 454 454 Val: &tangled.Knot{ ··· 477 477 // Get updated registration to show 478 478 registrations, err = db.GetRegistrations( 479 479 k.Db, 480 480 - orm.FilterEq("did", user.Active.Did), 480 480 + orm.FilterEq("did", user.Did), 481 481 orm.FilterEq("domain", domain), 482 482 ) 483 483 if err != nil { ··· 509 509 return 510 510 } 511 511 l = l.With("domain", domain) 512 512 - l = l.With("user", user.Active.Did) 512 512 + l = l.With("user", user.Did) 513 513 514 514 registrations, err := db.GetRegistrations( 515 515 k.Db, 516 516 - orm.FilterEq("did", user.Active.Did), 516 516 + orm.FilterEq("did", user.Did), 517 517 orm.FilterEq("domain", domain), 518 518 orm.FilterIsNot("registered", "null"), 519 519 ) ··· 566 566 567 567 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 568 568 Collection: tangled.KnotMemberNSID, 569 569 - Repo: user.Active.Did, 569 569 + Repo: user.Did, 570 570 Rkey: rkey, 571 571 Record: &lexutil.LexiconTypeDecoder{ 572 572 Val: &tangled.KnotMember{ ··· 617 617 return 618 618 } 619 619 l = l.With("domain", domain) 620 620 - l = l.With("user", user.Active.Did) 620 620 + l = l.With("user", user.Did) 621 621 622 622 registrations, err := db.GetRegistrations( 623 623 k.Db, 624 624 - orm.FilterEq("did", user.Active.Did), 624 624 + orm.FilterEq("did", user.Did), 625 625 orm.FilterEq("domain", domain), 626 626 orm.FilterIsNot("registered", "null"), 627 627 )

+1 -1

appview/labels/labels.go

··· 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()

+4 -4

appview/middleware/middleware.go

··· 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 + log.Printf("%s does not have perms of a %s in domain %s", actor.Did, group, domain) 134 134 http.Error(w, "Forbiden", http.StatusUnauthorized) 135 135 return 136 136 } ··· 161 161 return 162 162 } 163 163 164 164 - ok, err := mw.enforcer.E.Enforce(actor.Active.Did, f.Knot, f.DidSlashRepo(), requiredPerm) 164 164 + ok, err := mw.enforcer.E.Enforce(actor.Did, f.Knot, f.DidSlashRepo(), requiredPerm) 165 165 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()) 166 166 + log.Printf("%s does not have perms of a %s in repo %s", actor.Did, requiredPerm, f.DidSlashRepo()) 167 167 http.Error(w, "Forbiden", http.StatusUnauthorized) 168 168 return 169 169 }

+4 -4

appview/notifications/notifications.go

··· 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 } ··· 98 98 99 99 count, err := db.CountNotifications( 100 100 n.db, 101 101 - orm.FilterEq("recipient_did", user.Active.Did), 101 101 + orm.FilterEq("recipient_did", user.Did), 102 102 orm.FilterEq("read", 0), 103 103 ) 104 104 if err != nil {

+2 -8

appview/oauth/accounts.go

··· 22 22 } 23 23 24 24 type MultiAccountUser struct { 25 25 - Active User 25 25 + Did string 26 26 Accounts []AccountInfo 27 27 } 28 28 29 29 - func (m *MultiAccountUser) Did() string { 30 30 - return m.Active.Did 31 31 - } 32 32 - 33 29 func (o *OAuth) GetAccounts(r *http.Request) *AccountRegistry { 34 30 session, err := o.SessStore.Get(r, AccountsName) 35 31 if err != nil || session.IsNew { ··· 116 112 117 113 registry := o.GetAccounts(r) 118 114 return &MultiAccountUser{ 119 119 - Active: User{ 120 120 - Did: sess.Data.AccountDID.String(), 121 121 - }, 115 115 + Did: sess.Data.AccountDID.String(), 122 116 Accounts: registry.Accounts, 123 117 } 124 118 }

+1 -5

appview/oauth/oauth.go

··· 231 231 return o.saveAccounts(w, r, registry) 232 232 } 233 233 234 234 - type User struct { 235 235 - Did string 236 236 - } 237 237 - 238 234 func (o *OAuth) GetDid(r *http.Request) string { 239 235 if u := o.GetMultiAccountUser(r); u != nil { 240 240 - return u.Did() 236 236 + return u.Did 241 237 } 242 238 243 239 return ""

+22 -22

appview/pulls/pulls.go

··· 128 128 mergeCheckResponse := s.mergeCheck(r, f, pull, stack) 129 129 branchDeleteStatus := s.branchDeleteStatus(r, f, pull) 130 130 resubmitResult := pages.Unknown 131 131 - if user.Active.Did == pull.OwnerDid { 131 131 + if user.Did == pull.OwnerDid { 132 132 resubmitResult = s.resubmitCheck(r, f, pull, stack) 133 133 } 134 134 ··· 191 191 mergeCheckResponse := s.mergeCheck(r, f, pull, stack) 192 192 branchDeleteStatus := s.branchDeleteStatus(r, f, pull) 193 193 resubmitResult := pages.Unknown 194 194 - if user != nil && user.Active.Did == pull.OwnerDid { 194 194 + if user != nil && user.Did == pull.OwnerDid { 195 195 resubmitResult = s.resubmitCheck(r, f, pull, stack) 196 196 } 197 197 ··· 232 232 233 233 userReactions := map[models.ReactionKind]bool{} 234 234 if user != nil { 235 235 - userReactions = db.GetReactionStatusMap(s.db, user.Active.Did, pull.AtUri()) 235 235 + userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.AtUri()) 236 236 } 237 237 238 238 labelDefs, err := db.GetLabelDefinitions( ··· 402 402 } 403 403 404 404 // user can only delete branch if they are a collaborator in the repo that the branch belongs to 405 405 - perms := s.enforcer.GetPermissionsInRepo(user.Active.Did, repo.Knot, repo.DidSlashRepo()) 405 405 + perms := s.enforcer.GetPermissionsInRepo(user.Did, repo.Knot, repo.DidSlashRepo()) 406 406 if !slices.Contains(perms, "repo:push") { 407 407 return nil 408 408 } ··· 737 737 } 738 738 atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 739 739 Collection: tangled.RepoPullCommentNSID, 740 740 - Repo: user.Active.Did, 740 740 + Repo: user.Did, 741 741 Rkey: tid.TID(), 742 742 Record: &lexutil.LexiconTypeDecoder{ 743 743 Val: &tangled.RepoPullComment{ ··· 754 754 } 755 755 756 756 comment := &models.PullComment{ 757 757 - OwnerDid: user.Active.Did, 757 757 + OwnerDid: user.Did, 758 758 RepoAt: f.RepoAt().String(), 759 759 PullId: pull.PullId, 760 760 Body: body, ··· 849 849 fromFork := r.FormValue("fork") 850 850 sourceBranch := r.FormValue("sourceBranch") 851 851 patch := r.FormValue("patch") 852 852 - userDid := syntax.DID(user.Active.Did) 852 852 + userDid := syntax.DID(user.Did) 853 853 854 854 if targetBranch == "" { 855 855 s.pages.Notice(w, "pull", "Target branch is required.") ··· 1479 1479 func (s *Pulls) CompareForksFragment(w http.ResponseWriter, r *http.Request) { 1480 1480 user := s.oauth.GetMultiAccountUser(r) 1481 1481 1482 1482 - forks, err := db.GetForksByDid(s.db, user.Active.Did) 1482 1482 + forks, err := db.GetForksByDid(s.db, user.Did) 1483 1483 if err != nil { 1484 1484 log.Println("failed to get forks", err) 1485 1485 return ··· 1626 1626 return 1627 1627 } 1628 1628 1629 1629 - if user == nil || user.Active.Did != pull.OwnerDid { 1629 1629 + if user == nil || user.Did != pull.OwnerDid { 1630 1630 log.Println("unauthorized user") 1631 1631 w.WriteHeader(http.StatusUnauthorized) 1632 1632 return ··· 1640 1640 1641 1641 patch := r.FormValue("patch") 1642 1642 1643 1643 - s.resubmitPullHelper(w, r, f, syntax.DID(user.Active.Did), pull, patch, "", "") 1643 1643 + s.resubmitPullHelper(w, r, f, syntax.DID(user.Did), pull, patch, "", "") 1644 1644 } 1645 1645 1646 1646 func (s *Pulls) resubmitBranch(w http.ResponseWriter, r *http.Request) { ··· 1653 1653 return 1654 1654 } 1655 1655 1656 1656 - if user == nil || user.Active.Did != pull.OwnerDid { 1656 1656 + if user == nil || user.Did != pull.OwnerDid { 1657 1657 log.Println("unauthorized user") 1658 1658 w.WriteHeader(http.StatusUnauthorized) 1659 1659 return ··· 1665 1665 return 1666 1666 } 1667 1667 1668 1668 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 1668 1668 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 1669 1669 if !roles.IsPushAllowed() { 1670 1670 log.Println("unauthorized user") 1671 1671 w.WriteHeader(http.StatusUnauthorized) ··· 1705 1705 patch := comparison.FormatPatchRaw 1706 1706 combined := comparison.CombinedPatchRaw 1707 1707 1708 1708 - s.resubmitPullHelper(w, r, f, syntax.DID(user.Active.Did), pull, patch, combined, sourceRev) 1708 1708 + s.resubmitPullHelper(w, r, f, syntax.DID(user.Did), pull, patch, combined, sourceRev) 1709 1709 } 1710 1710 1711 1711 func (s *Pulls) resubmitFork(w http.ResponseWriter, r *http.Request) { ··· 1718 1718 return 1719 1719 } 1720 1720 1721 1721 - if user == nil || user.Active.Did != pull.OwnerDid { 1721 1721 + if user == nil || user.Did != pull.OwnerDid { 1722 1722 log.Println("unauthorized user") 1723 1723 w.WriteHeader(http.StatusUnauthorized) 1724 1724 return ··· 1802 1802 patch := comparison.FormatPatchRaw 1803 1803 combined := comparison.CombinedPatchRaw 1804 1804 1805 1805 - s.resubmitPullHelper(w, r, f, syntax.DID(user.Active.Did), pull, patch, combined, sourceRev) 1805 1805 + s.resubmitPullHelper(w, r, f, syntax.DID(user.Did), pull, patch, combined, sourceRev) 1806 1806 } 1807 1807 1808 1808 func (s *Pulls) resubmitPullHelper( ··· 2227 2227 2228 2228 // notify about the pull merge 2229 2229 for _, p := range pullsToMerge { 2230 2230 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Active.Did), p) 2230 2230 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2231 2231 } 2232 2232 2233 2233 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) ··· 2251 2251 } 2252 2252 2253 2253 // auth filter: only owner or collaborators can close 2254 2254 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 2254 2254 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 2255 2255 isOwner := roles.IsOwner() 2256 2256 isCollaborator := roles.IsCollaborator() 2257 2257 - isPullAuthor := user.Active.Did == pull.OwnerDid 2257 2257 + isPullAuthor := user.Did == pull.OwnerDid 2258 2258 isCloseAllowed := isOwner || isCollaborator || isPullAuthor 2259 2259 if !isCloseAllowed { 2260 2260 log.Println("failed to close pull") ··· 2300 2300 } 2301 2301 2302 2302 for _, p := range pullsToClose { 2303 2303 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Active.Did), p) 2303 2303 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2304 2304 } 2305 2305 2306 2306 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) ··· 2325 2325 } 2326 2326 2327 2327 // auth filter: only owner or collaborators can close 2328 2328 - roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Active.Did, f.Knot, f.DidSlashRepo())} 2328 2328 + roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} 2329 2329 isOwner := roles.IsOwner() 2330 2330 isCollaborator := roles.IsCollaborator() 2331 2331 - isPullAuthor := user.Active.Did == pull.OwnerDid 2331 2331 + isPullAuthor := user.Did == pull.OwnerDid 2332 2332 isCloseAllowed := isOwner || isCollaborator || isPullAuthor 2333 2333 if !isCloseAllowed { 2334 2334 log.Println("failed to close pull") ··· 2374 2374 } 2375 2375 2376 2376 for _, p := range pullsToReopen { 2377 2377 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Active.Did), p) 2377 2377 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2378 2378 } 2379 2379 2380 2380 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)

+4 -4

appview/repo/artifact.go

··· 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, ··· 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 {

+21 -21

appview/repo/repo.go

··· 83 83 func (rp *Repo) EditSpindle(w http.ResponseWriter, r *http.Request) { 84 84 user := rp.oauth.GetMultiAccountUser(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 ··· 170 170 func (rp *Repo) AddLabelDef(w http.ResponseWriter, r *http.Request) { 171 171 user := rp.oauth.GetMultiAccountUser(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, ··· 329 329 func (rp *Repo) DeleteLabelDef(w http.ResponseWriter, r *http.Request) { 330 330 user := rp.oauth.GetMultiAccountUser(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 { ··· 437 437 func (rp *Repo) SubscribeLabel(w http.ResponseWriter, r *http.Request) { 438 438 user := rp.oauth.GetMultiAccountUser(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 { ··· 523 523 func (rp *Repo) UnsubscribeLabel(w http.ResponseWriter, r *http.Request) { 524 524 user := rp.oauth.GetMultiAccountUser(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 { ··· 694 694 func (rp *Repo) AddCollaborator(w http.ResponseWriter, r *http.Request) { 695 695 user := rp.oauth.GetMultiAccountUser(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 } ··· 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(), ··· 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 { ··· 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, ··· 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) 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

+1 -1

appview/repo/settings.go

··· 70 70 func (rp *Repo) Secrets(w http.ResponseWriter, r *http.Request) { 71 71 user := rp.oauth.GetMultiAccountUser(r) 72 72 l := rp.logger.With("handler", "Secrets") 73 73 - l = l.With("did", user.Active.Did) 73 73 + l = l.With("did", user.Did) 74 74 75 75 f, err := rp.repoResolver.Resolve(r) 76 76 if err != nil {

+2 -2

appview/reporesolver/resolver.go

··· 70 70 isStarred := false 71 71 roles := repoinfo.RolesInRepo{} 72 72 if user != 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()) 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

+2 -2

appview/settings/settings.go

··· 121 121 122 122 func (s *Settings) keysSettings(w http.ResponseWriter, r *http.Request) { 123 123 user := s.OAuth.GetMultiAccountUser(r) 124 124 - pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Active.Did) 124 124 + pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Did) 125 125 if err != nil { 126 126 log.Println(err) 127 127 } ··· 134 134 135 135 func (s *Settings) emailsSettings(w http.ResponseWriter, r *http.Request) { 136 136 user := s.OAuth.GetMultiAccountUser(r) 137 137 - emails, err := db.GetAllEmails(s.Db, user.Active.Did) 137 137 + emails, err := db.GetAllEmails(s.Db, user.Did) 138 138 if err != nil { 139 139 log.Println(err) 140 140 }

+34 -34

appview/spindles/spindles.go

··· 59 59 user := s.OAuth.GetMultiAccountUser(r) 60 60 all, err := db.GetSpindles( 61 61 s.Db, 62 62 - orm.FilterEq("owner", user.Active.Did), 62 62 + orm.FilterEq("owner", user.Did), 63 63 ) 64 64 if err != nil { 65 65 s.Logger.Error("failed to fetch spindles", "err", err) ··· 78 78 l := s.Logger.With("handler", "dashboard") 79 79 80 80 user := s.OAuth.GetMultiAccountUser(r) 81 81 - l = l.With("user", user.Active.Did) 81 81 + l = l.With("user", user.Did) 82 82 83 83 instance := chi.URLParam(r, "instance") 84 84 if instance == "" { ··· 89 89 spindles, err := db.GetSpindles( 90 90 s.Db, 91 91 orm.FilterEq("instance", instance), 92 92 - orm.FilterEq("owner", user.Active.Did), 92 92 + orm.FilterEq("owner", user.Did), 93 93 orm.FilterIsNot("verified", "null"), 94 94 ) 95 95 if err != nil || len(spindles) != 1 { ··· 161 161 return 162 162 } 163 163 l = l.With("instance", instance) 164 164 - l = l.With("user", user.Active.Did) 164 164 + l = l.With("user", user.Did) 165 165 166 166 tx, err := s.Db.Begin() 167 167 if err != nil { ··· 175 175 }() 176 176 177 177 err = db.AddSpindle(tx, models.Spindle{ 178 178 - Owner: syntax.DID(user.Active.Did), 178 178 + Owner: syntax.DID(user.Did), 179 179 Instance: instance, 180 180 }) 181 181 if err != nil { ··· 199 199 return 200 200 } 201 201 202 202 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.SpindleNSID, user.Active.Did, instance) 202 202 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.SpindleNSID, user.Did, instance) 203 203 var exCid *string 204 204 if ex != nil { 205 205 exCid = ex.Cid ··· 208 208 // re-announce by registering under same rkey 209 209 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 210 210 Collection: tangled.SpindleNSID, 211 211 - Repo: user.Active.Did, 211 211 + Repo: user.Did, 212 212 Rkey: instance, 213 213 Record: &lexutil.LexiconTypeDecoder{ 214 214 Val: &tangled.Spindle{ ··· 239 239 } 240 240 241 241 // begin verification 242 242 - err = serververify.RunVerification(r.Context(), instance, user.Active.Did, s.Config.Core.Dev) 242 242 + err = serververify.RunVerification(r.Context(), instance, user.Did, s.Config.Core.Dev) 243 243 if err != nil { 244 244 l.Error("verification failed", "err", err) 245 245 s.Pages.HxRefresh(w) 246 246 return 247 247 } 248 248 249 249 - _, err = serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Active.Did) 249 249 + _, err = serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Did) 250 250 if err != nil { 251 251 l.Error("failed to mark verified", "err", err) 252 252 s.Pages.HxRefresh(w) ··· 276 276 277 277 spindles, err := db.GetSpindles( 278 278 s.Db, 279 279 - orm.FilterEq("owner", user.Active.Did), 279 279 + orm.FilterEq("owner", user.Did), 280 280 orm.FilterEq("instance", instance), 281 281 ) 282 282 if err != nil || len(spindles) != 1 { ··· 285 285 return 286 286 } 287 287 288 288 - if string(spindles[0].Owner) != user.Active.Did { 289 289 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 288 288 + if string(spindles[0].Owner) != user.Did { 289 289 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 290 290 s.Pages.Notice(w, noticeId, "Failed to delete spindle, unauthorized deletion attempt.") 291 291 return 292 292 } ··· 305 305 // remove spindle members first 306 306 err = db.RemoveSpindleMember( 307 307 tx, 308 308 - orm.FilterEq("did", user.Active.Did), 308 308 + orm.FilterEq("did", user.Did), 309 309 orm.FilterEq("instance", instance), 310 310 ) 311 311 if err != nil { ··· 316 316 317 317 err = db.DeleteSpindle( 318 318 tx, 319 319 - orm.FilterEq("owner", user.Active.Did), 319 319 + orm.FilterEq("owner", user.Did), 320 320 orm.FilterEq("instance", instance), 321 321 ) 322 322 if err != nil { ··· 344 344 345 345 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 346 346 Collection: tangled.SpindleNSID, 347 347 - Repo: user.Active.Did, 347 347 + Repo: user.Did, 348 348 Rkey: instance, 349 349 }) 350 350 if err != nil { ··· 392 392 return 393 393 } 394 394 l = l.With("instance", instance) 395 395 - l = l.With("user", user.Active.Did) 395 395 + l = l.With("user", user.Did) 396 396 397 397 spindles, err := db.GetSpindles( 398 398 s.Db, 399 399 - orm.FilterEq("owner", user.Active.Did), 399 399 + orm.FilterEq("owner", user.Did), 400 400 orm.FilterEq("instance", instance), 401 401 ) 402 402 if err != nil || len(spindles) != 1 { ··· 405 405 return 406 406 } 407 407 408 408 - if string(spindles[0].Owner) != user.Active.Did { 409 409 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 408 408 + if string(spindles[0].Owner) != user.Did { 409 409 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 410 410 s.Pages.Notice(w, noticeId, "Failed to verify spindle, unauthorized verification attempt.") 411 411 return 412 412 } 413 413 414 414 // begin verification 415 415 - err = serververify.RunVerification(r.Context(), instance, user.Active.Did, s.Config.Core.Dev) 415 415 + err = serververify.RunVerification(r.Context(), instance, user.Did, s.Config.Core.Dev) 416 416 if err != nil { 417 417 l.Error("verification failed", "err", err) 418 418 ··· 430 430 return 431 431 } 432 432 433 433 - rowId, err := serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Active.Did) 433 433 + rowId, err := serververify.MarkSpindleVerified(s.Db, s.Enforcer, instance, user.Did) 434 434 if err != nil { 435 435 l.Error("failed to mark verified", "err", err) 436 436 s.Pages.Notice(w, noticeId, err.Error()) ··· 468 468 return 469 469 } 470 470 l = l.With("instance", instance) 471 471 - l = l.With("user", user.Active.Did) 471 471 + l = l.With("user", user.Did) 472 472 473 473 spindles, err := db.GetSpindles( 474 474 s.Db, 475 475 - orm.FilterEq("owner", user.Active.Did), 475 475 + orm.FilterEq("owner", user.Did), 476 476 orm.FilterEq("instance", instance), 477 477 ) 478 478 if err != nil || len(spindles) != 1 { ··· 487 487 s.Pages.Notice(w, noticeId, defaultErr) 488 488 } 489 489 490 490 - if string(spindles[0].Owner) != user.Active.Did { 491 491 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 490 490 + if string(spindles[0].Owner) != user.Did { 491 491 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 492 492 s.Pages.Notice(w, noticeId, "Failed to add member, unauthorized attempt.") 493 493 return 494 494 } ··· 537 537 538 538 // add member to db 539 539 if err = db.AddSpindleMember(tx, models.SpindleMember{ 540 540 - Did: syntax.DID(user.Active.Did), 540 540 + Did: syntax.DID(user.Did), 541 541 Rkey: rkey, 542 542 Instance: instance, 543 543 Subject: memberId.DID, ··· 555 555 556 556 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 557 557 Collection: tangled.SpindleMemberNSID, 558 558 - Repo: user.Active.Did, 558 558 + Repo: user.Did, 559 559 Rkey: rkey, 560 560 Record: &lexutil.LexiconTypeDecoder{ 561 561 Val: &tangled.SpindleMember{ ··· 604 604 return 605 605 } 606 606 l = l.With("instance", instance) 607 607 - l = l.With("user", user.Active.Did) 607 607 + l = l.With("user", user.Did) 608 608 609 609 spindles, err := db.GetSpindles( 610 610 s.Db, 611 611 - orm.FilterEq("owner", user.Active.Did), 611 611 + orm.FilterEq("owner", user.Did), 612 612 orm.FilterEq("instance", instance), 613 613 ) 614 614 if err != nil || len(spindles) != 1 { ··· 617 617 return 618 618 } 619 619 620 620 - if string(spindles[0].Owner) != user.Active.Did { 621 621 - l.Error("unauthorized", "user", user.Active.Did, "owner", spindles[0].Owner) 620 620 + if string(spindles[0].Owner) != user.Did { 621 621 + l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner) 622 622 s.Pages.Notice(w, noticeId, "Failed to remove member, unauthorized attempt.") 623 623 return 624 624 } ··· 653 653 // get the record from the DB first: 654 654 members, err := db.GetSpindleMembers( 655 655 s.Db, 656 656 - orm.FilterEq("did", user.Active.Did), 656 656 + orm.FilterEq("did", user.Did), 657 657 orm.FilterEq("instance", instance), 658 658 orm.FilterEq("subject", memberId.DID), 659 659 ) ··· 666 666 // remove from db 667 667 if err = db.RemoveSpindleMember( 668 668 tx, 669 669 - orm.FilterEq("did", user.Active.Did), 669 669 + orm.FilterEq("did", user.Did), 670 670 orm.FilterEq("instance", instance), 671 671 orm.FilterEq("subject", memberId.DID), 672 672 ); err != nil { ··· 692 692 // remove from pds 693 693 _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 694 694 Collection: tangled.SpindleMemberNSID, 695 695 - Repo: user.Active.Did, 695 695 + Repo: user.Did, 696 696 Rkey: members[0].Rkey, 697 697 }) 698 698 if err != nil {

+1 -1

appview/state/accounts.go

··· 41 41 } 42 42 43 43 currentUser := s.oauth.GetMultiAccountUser(r) 44 44 - isCurrentAccount := currentUser != nil && currentUser.Active.Did == did 44 44 + isCurrentAccount := currentUser != nil && currentUser.Did == did 45 45 46 46 var remainingAccounts []string 47 47 if currentUser != nil {

+6 -6

appview/state/follow.go

··· 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/login.go

··· 74 74 return 75 75 } 76 76 77 77 - currentDid := currentUser.Active.Did 77 77 + currentDid := currentUser.Did 78 78 79 79 var remainingAccounts []string 80 80 for _, acc := range currentUser.Accounts {

+29 -29

appview/state/profile.go

··· 80 80 loggedInUser := s.oauth.GetMultiAccountUser(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() ··· 305 305 306 306 loggedInUserFollowing := make(map[string]struct{}) 307 307 if loggedInUser != nil { 308 308 - following, err := db.GetFollowing(s.db, loggedInUser.Active.Did) 308 308 + following, err := db.GetFollowing(s.db, loggedInUser.Did) 309 309 if err != nil { 310 310 - l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Active.Did) 310 310 + l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Did) 311 311 return &params, err 312 312 } 313 313 loggedInUserFollowing = make(map[string]struct{}, len(following)) ··· 322 322 followStatus := models.IsNotFollowing 323 323 if _, exists := loggedInUserFollowing[did]; exists { 324 324 followStatus = models.IsFollowing 325 325 - } else if loggedInUser != nil && loggedInUser.Active.Did == did { 325 325 + } else if loggedInUser != nil && loggedInUser.Did == did { 326 326 followStatus = models.IsSelf 327 327 } 328 328 ··· 528 528 return 529 529 } 530 530 531 531 - profile, err := db.GetProfile(s.db, user.Active.Did) 531 531 + profile, err := db.GetProfile(s.db, user.Did) 532 532 if err != nil { 533 533 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 533 533 + log.Printf("getting profile data for %s: %s", user.Did, err) 534 534 } 535 535 536 536 profile.Description = r.FormValue("description") ··· 576 576 return 577 577 } 578 578 579 579 - profile, err := db.GetProfile(s.db, user.Active.Did) 579 579 + profile, err := db.GetProfile(s.db, user.Did) 580 580 if err != nil { 581 581 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 581 581 + log.Printf("getting profile data for %s: %s", user.Did, err) 582 582 } 583 583 584 584 i := 0 ··· 633 633 vanityStats = append(vanityStats, string(v.Kind)) 634 634 } 635 635 636 636 - ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 636 636 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 637 637 var cid *string 638 638 if ex != nil { 639 639 cid = ex.Cid ··· 641 641 642 642 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 643 643 Collection: tangled.ActorProfileNSID, 644 644 - Repo: user.Active.Did, 644 644 + Repo: user.Did, 645 645 Rkey: "self", 646 646 Record: &lexutil.LexiconTypeDecoder{ 647 647 Val: &tangled.ActorProfile{ ··· 670 670 671 671 s.notifier.UpdateProfile(r.Context(), profile) 672 672 673 673 - s.pages.HxRedirect(w, "/"+user.Active.Did) 673 673 + s.pages.HxRedirect(w, "/"+user.Did) 674 674 } 675 675 676 676 func (s *State) EditBioFragment(w http.ResponseWriter, r *http.Request) { 677 677 user := s.oauth.GetMultiAccountUser(r) 678 678 679 679 - profile, err := db.GetProfile(s.db, user.Active.Did) 679 679 + profile, err := db.GetProfile(s.db, user.Did) 680 680 if err != nil { 681 681 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 681 681 + log.Printf("getting profile data for %s: %s", user.Did, err) 682 682 } 683 683 684 684 s.pages.EditBioFragment(w, pages.EditBioParams{ ··· 690 690 func (s *State) EditPinsFragment(w http.ResponseWriter, r *http.Request) { 691 691 user := s.oauth.GetMultiAccountUser(r) 692 692 693 693 - profile, err := db.GetProfile(s.db, user.Active.Did) 693 693 + profile, err := db.GetProfile(s.db, user.Did) 694 694 if err != nil { 695 695 - log.Printf("getting profile data for %s: %s", user.Active.Did, err) 695 695 + log.Printf("getting profile data for %s: %s", user.Did, err) 696 696 } 697 697 698 698 - repos, err := db.GetRepos(s.db, 0, orm.FilterEq("did", user.Active.Did)) 698 698 + repos, err := db.GetRepos(s.db, 0, orm.FilterEq("did", user.Did)) 699 699 if err != nil { 700 700 - log.Printf("getting repos for %s: %s", user.Active.Did, err) 700 700 + log.Printf("getting repos for %s: %s", user.Did, err) 701 701 } 702 702 703 703 - collaboratingRepos, err := db.CollaboratingIn(s.db, user.Active.Did) 703 703 + collaboratingRepos, err := db.CollaboratingIn(s.db, user.Did) 704 704 if err != nil { 705 705 - log.Printf("getting collaborating repos for %s: %s", user.Active.Did, err) 705 705 + log.Printf("getting collaborating repos for %s: %s", user.Did, err) 706 706 } 707 707 708 708 allRepos := []pages.PinnedRepo{} ··· 732 732 func (s *State) UploadProfileAvatar(w http.ResponseWriter, r *http.Request) { 733 733 l := s.logger.With("handler", "UploadProfileAvatar") 734 734 user := s.oauth.GetMultiAccountUser(r) 735 735 - l = l.With("did", user.Active.Did) 735 735 + l = l.With("did", user.Did) 736 736 737 737 // Parse multipart form (10MB max) 738 738 if err := r.ParseMultipartForm(10 << 20); err != nil { ··· 779 779 l.Info("uploaded avatar blob", "cid", uploadBlobResp.Blob.Ref.String()) 780 780 781 781 // get current profile record from PDS to get its CID for swap 782 782 - getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 782 782 + getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 783 783 if err != nil { 784 784 l.Error("failed to get current profile record", "err", err) 785 785 s.pages.Notice(w, "avatar-error", "Failed to get current profile from your PDS") ··· 803 803 804 804 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 805 805 Collection: tangled.ActorProfileNSID, 806 806 - Repo: user.Active.Did, 806 806 + Repo: user.Did, 807 807 Rkey: "self", 808 808 Record: &lexutil.LexiconTypeDecoder{Val: profileRecord}, 809 809 SwapRecord: getRecordResp.Cid, ··· 817 817 818 818 l.Info("successfully updated profile with avatar") 819 819 820 820 - profile, err := db.GetProfile(s.db, user.Active.Did) 820 820 + profile, err := db.GetProfile(s.db, user.Did) 821 821 if err != nil { 822 822 l.Warn("getting profile data from DB", "err", err) 823 823 - profile = &models.Profile{Did: user.Active.Did} 823 823 + profile = &models.Profile{Did: user.Did} 824 824 } 825 825 profile.Avatar = uploadBlobResp.Blob.Ref.String() 826 826 ··· 846 846 func (s *State) RemoveProfileAvatar(w http.ResponseWriter, r *http.Request) { 847 847 l := s.logger.With("handler", "RemoveProfileAvatar") 848 848 user := s.oauth.GetMultiAccountUser(r) 849 849 - l = l.With("did", user.Active.Did) 849 849 + l = l.With("did", user.Did) 850 850 851 851 client, err := s.oauth.AuthorizedClient(r) 852 852 if err != nil { ··· 855 855 return 856 856 } 857 857 858 858 - getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 858 858 + getRecordResp, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 859 859 if err != nil { 860 860 l.Error("failed to get current profile record", "err", err) 861 861 s.pages.Notice(w, "avatar-error", "Failed to get current profile from your PDS") ··· 879 879 880 880 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 881 881 Collection: tangled.ActorProfileNSID, 882 882 - Repo: user.Active.Did, 882 882 + Repo: user.Did, 883 883 Rkey: "self", 884 884 Record: &lexutil.LexiconTypeDecoder{Val: profileRecord}, 885 885 SwapRecord: getRecordResp.Cid, ··· 893 893 894 894 l.Info("successfully removed avatar from PDS") 895 895 896 896 - profile, err := db.GetProfile(s.db, user.Active.Did) 896 896 + profile, err := db.GetProfile(s.db, user.Did) 897 897 if err != nil { 898 898 l.Warn("getting profile data from DB", "err", err) 899 899 - profile = &models.Profile{Did: user.Active.Did} 899 899 + profile = &models.Profile{Did: user.Did} 900 900 } 901 901 profile.Avatar = "" 902 902

+6 -6

appview/state/reaction.go

··· 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

+5 -5

appview/state/star.go

··· 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

+13 -13

appview/state/state.go

··· 249 249 250 250 var userDid string 251 251 if user != nil { 252 252 - userDid = user.Active.Did 252 252 + userDid = user.Did 253 253 } 254 254 timeline, err := db.MakeTimeline(s.db, 50, userDid, filtered) 255 255 if err != nil { ··· 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 { ··· 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) 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 ··· 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) 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

+12 -12

appview/strings/strings.go

··· 156 156 user := s.OAuth.GetMultiAccountUser(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{ ··· 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 } ··· 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 } ··· 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 ··· 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) {