+2

api/tangled/actorprofile.go

reviewed

··· 29 29 Location *string `json:"location,omitempty" cborgen:"location,omitempty"` 30 30 // pinnedRepositories: Any ATURI, it is up to appviews to validate these fields. 31 31 PinnedRepositories []string `json:"pinnedRepositories,omitempty" cborgen:"pinnedRepositories,omitempty"` 32 32 + // preferredHandle: A handle the user prefers to be displayed as. 33 33 + PreferredHandle *string `json:"preferredHandle,omitempty" cborgen:"preferredHandle,omitempty"` 32 34 // pronouns: Preferred gender pronouns. 33 35 Pronouns *string `json:"pronouns,omitempty" cborgen:"pronouns,omitempty"` 34 36 Stats []string `json:"stats,omitempty" cborgen:"stats,omitempty"`

+58 -1

api/tangled/cbor_gen.go

reviewed

··· 26 26 } 27 27 28 28 cw := cbg.NewCborWriter(w) 29 29 - fieldCount := 9 29 29 + fieldCount := 10 30 30 31 31 if t.Avatar == nil { 32 32 fieldCount-- ··· 45 45 } 46 46 47 47 if t.PinnedRepositories == nil { 48 48 + fieldCount-- 49 49 + } 50 50 + 51 51 + if t.PreferredHandle == nil { 48 52 fieldCount-- 49 53 } 50 54 ··· 282 286 } 283 287 } 284 288 289 289 + // t.PreferredHandle (string) (string) 290 290 + if t.PreferredHandle != nil { 291 291 + 292 292 + if len("preferredHandle") > 1000000 { 293 293 + return xerrors.Errorf("Value in field \"preferredHandle\" was too long") 294 294 + } 295 295 + 296 296 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("preferredHandle"))); err != nil { 297 297 + return err 298 298 + } 299 299 + if _, err := cw.WriteString(string("preferredHandle")); err != nil { 300 300 + return err 301 301 + } 302 302 + 303 303 + if t.PreferredHandle == nil { 304 304 + if _, err := cw.Write(cbg.CborNull); err != nil { 305 305 + return err 306 306 + } 307 307 + } else { 308 308 + if len(*t.PreferredHandle) > 1000000 { 309 309 + return xerrors.Errorf("Value in field t.PreferredHandle was too long") 310 310 + } 311 311 + 312 312 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.PreferredHandle))); err != nil { 313 313 + return err 314 314 + } 315 315 + if _, err := cw.WriteString(string(*t.PreferredHandle)); err != nil { 316 316 + return err 317 317 + } 318 318 + } 319 319 + } 320 320 + 285 321 // t.PinnedRepositories ([]string) (slice) 286 322 if t.PinnedRepositories != nil { 287 323 ··· 551 587 } 552 588 553 589 t.Description = (*string)(&sval) 590 590 + } 591 591 + } 592 592 + // t.PreferredHandle (string) (string) 593 593 + case "preferredHandle": 594 594 + 595 595 + { 596 596 + b, err := cr.ReadByte() 597 597 + if err != nil { 598 598 + return err 599 599 + } 600 600 + if b != cbg.CborNull[0] { 601 601 + if err := cr.UnreadByte(); err != nil { 602 602 + return err 603 603 + } 604 604 + 605 605 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 606 606 + if err != nil { 607 607 + return err 608 608 + } 609 609 + 610 610 + t.PreferredHandle = (*string)(&sval) 554 611 } 555 612 } 556 613 // t.PinnedRepositories ([]string) (slice)

+7

appview/db/db.go

reviewed

··· 1288 1288 return err 1289 1289 }) 1290 1290 1291 1291 + orm.RunMigration(conn, logger, "add-preferred-handle-profile", func(tx *sql.Tx) error { 1292 1292 + _, err := tx.Exec(` 1293 1293 + alter table profile add column preferred_handle text; 1294 1294 + `) 1295 1295 + return err 1296 1296 + }) 1297 1297 + 1291 1298 return &DB{ 1292 1299 db, 1293 1300 logger,

+42 -6

appview/db/profile.go

reviewed

··· 162 162 description, 163 163 include_bluesky, 164 164 location, 165 165 - pronouns 165 165 + pronouns, 166 166 + preferred_handle 166 167 ) 167 167 - values (?, ?, ?, ?, ?, ?)`, 168 168 + values (?, ?, ?, ?, ?, ?, ?)`, 168 169 profile.Did, 169 170 profile.Avatar, 170 171 profile.Description, 171 172 includeBskyValue, 172 173 profile.Location, 173 174 profile.Pronouns, 175 175 + string(profile.PreferredHandle), 174 176 ) 175 177 176 178 if err != nil { ··· 252 254 description, 253 255 include_bluesky, 254 256 location, 255 255 - pronouns 257 257 + pronouns, 258 258 + preferred_handle 256 259 from 257 260 profile 258 261 %s`, ··· 269 272 var profile models.Profile 270 273 var includeBluesky int 271 274 var pronouns sql.Null[string] 275 275 + var preferredHandle sql.Null[string] 272 276 273 273 - err = rows.Scan(&profile.ID, &profile.Did, &profile.Description, &includeBluesky, &profile.Location, &pronouns) 277 277 + err = rows.Scan(&profile.ID, &profile.Did, &profile.Description, &includeBluesky, &profile.Location, &pronouns, &preferredHandle) 274 278 if err != nil { 275 279 return nil, err 276 280 } ··· 283 287 profile.Pronouns = pronouns.V 284 288 } 285 289 290 290 + if preferredHandle.Valid { 291 291 + profile.PreferredHandle = syntax.Handle(preferredHandle.V) 292 292 + } 293 293 + 286 294 profileMap[profile.Did] = &profile 287 295 } 288 296 if err = rows.Err(); err != nil { ··· 346 354 return profileMap, nil 347 355 } 348 356 357 357 + func GetDidByPreferredHandle(e Execer, handle syntax.Handle) (syntax.DID, error) { 358 358 + var did string 359 359 + err := e.QueryRow( 360 360 + `select did from profile where preferred_handle = ?`, 361 361 + string(handle), 362 362 + ).Scan(&did) 363 363 + if err != nil { 364 364 + return "", err 365 365 + } 366 366 + return syntax.DID(did), nil 367 367 + } 368 368 + 349 369 func GetProfile(e Execer, did string) (*models.Profile, error) { 350 370 var profile models.Profile 351 371 var pronouns sql.Null[string] 352 372 var avatar sql.Null[string] 373 373 + var preferredHandle sql.Null[string] 353 374 354 375 profile.Did = did 355 376 356 377 includeBluesky := 0 357 378 358 379 err := e.QueryRow( 359 359 - `select avatar, description, include_bluesky, location, pronouns from profile where did = ?`, 380 380 + `select avatar, description, include_bluesky, location, pronouns, preferred_handle from profile where did = ?`, 360 381 did, 361 361 - ).Scan(&avatar, &profile.Description, &includeBluesky, &profile.Location, &pronouns) 382 382 + ).Scan(&avatar, &profile.Description, &includeBluesky, &profile.Location, &pronouns, &preferredHandle) 362 383 if err == sql.ErrNoRows { 363 384 return nil, nil 364 385 } ··· 377 398 378 399 if avatar.Valid { 379 400 profile.Avatar = avatar.V 401 401 + } 402 402 + 403 403 + if preferredHandle.Valid { 404 404 + profile.PreferredHandle = syntax.Handle(preferredHandle.V) 380 405 } 381 406 382 407 rows, err := e.Query(`select link from profile_links where did = ?`, did) ··· 480 505 // ensure pronouns are not too long 481 506 if len(profile.Pronouns) > 40 { 482 507 return fmt.Errorf("Entered pronouns are too long.") 508 508 + } 509 509 + 510 510 + if profile.PreferredHandle != "" { 511 511 + if _, err := syntax.ParseHandle(string(profile.PreferredHandle)); err != nil { 512 512 + return fmt.Errorf("Invalid preferred handle format.") 513 513 + } 514 514 + 515 515 + claimant, err := GetDidByPreferredHandle(e, profile.PreferredHandle) 516 516 + if err == nil && string(claimant) != profile.Did { 517 517 + return fmt.Errorf("Preferred handle is already claimed by another user.") 518 518 + } 483 519 } 484 520 485 521 // ensure links are in order

+22 -11

appview/ingester.go

reviewed

··· 66 66 case tangled.RepoArtifactNSID: 67 67 err = i.ingestArtifact(e) 68 68 case tangled.ActorProfileNSID: 69 69 - err = i.ingestProfile(e) 69 69 + err = i.ingestProfile(ctx, e) 70 70 case tangled.SpindleMemberNSID: 71 71 err = i.ingestSpindleMember(ctx, e) 72 72 case tangled.SpindleNSID: ··· 264 264 return nil 265 265 } 266 266 267 267 - func (i *Ingester) ingestProfile(e *jmodels.Event) error { 267 267 + func (i *Ingester) ingestProfile(ctx context.Context, e *jmodels.Event) error { 268 268 did := e.Did 269 269 var err error 270 270 ··· 328 328 } 329 329 } 330 330 331 331 + var preferredHandle syntax.Handle 332 332 + if record.PreferredHandle != nil { 333 333 + if h, err := syntax.ParseHandle(*record.PreferredHandle); err == nil { 334 334 + ident, identErr := i.IdResolver.ResolveIdent(ctx, did) 335 335 + if identErr == nil && slices.Contains(ident.AlsoKnownAs, "at://"+string(h)) { 336 336 + preferredHandle = h 337 337 + } 338 338 + } 339 339 + } 340 340 + 331 341 profile := models.Profile{ 332 332 - Did: did, 333 333 - Avatar: avatar, 334 334 - Description: description, 335 335 - IncludeBluesky: includeBluesky, 336 336 - Location: location, 337 337 - Links: links, 338 338 - Stats: stats, 339 339 - PinnedRepos: pinned, 340 340 - Pronouns: pronouns, 342 342 + Did: did, 343 343 + Avatar: avatar, 344 344 + Description: description, 345 345 + IncludeBluesky: includeBluesky, 346 346 + Location: location, 347 347 + Links: links, 348 348 + Stats: stats, 349 349 + PinnedRepos: pinned, 350 350 + Pronouns: pronouns, 351 351 + PreferredHandle: preferredHandle, 341 352 } 342 353 343 354 ddb, ok := i.Db.Execer.(*db.DB)

+9 -1

appview/middleware/middleware.go

reviewed

··· 11 11 "strings" 12 12 13 13 "github.com/bluesky-social/indigo/atproto/identity" 14 14 + "github.com/bluesky-social/indigo/atproto/syntax" 14 15 "github.com/go-chi/chi/v5" 15 16 "tangled.org/core/appview/db" 16 17 "tangled.org/core/appview/oauth" ··· 188 189 189 190 id, err := mw.idResolver.ResolveIdent(req.Context(), didOrHandle) 190 191 if err != nil { 191 191 - // invalid did or handle 192 192 + if h, parseErr := syntax.ParseHandle(didOrHandle); parseErr == nil { 193 193 + if did, lookupErr := db.GetDidByPreferredHandle(mw.db, h); lookupErr == nil { 194 194 + id, err = mw.idResolver.ResolveIdent(req.Context(), string(did)) 195 195 + } 196 196 + } 197 197 + } 198 198 + // invalid did or handle 199 199 + if err != nil { 192 200 log.Printf("failed to resolve did/handle '%s': %s\n", didOrHandle, err) 193 201 mw.pages.Error404(w) 194 202 return

+9 -8

appview/models/profile.go

reviewed

··· 13 13 Did string 14 14 15 15 // data 16 16 - Avatar string // CID of the avatar blob 17 17 - Description string 18 18 - IncludeBluesky bool 19 19 - Location string 20 20 - Links [5]string 21 21 - Stats [2]VanityStat 22 22 - PinnedRepos [6]syntax.ATURI 23 23 - Pronouns string 16 16 + Avatar string // CID of the avatar blob 17 17 + Description string 18 18 + IncludeBluesky bool 19 19 + Location string 20 20 + Links [5]string 21 21 + Stats [2]VanityStat 22 22 + PinnedRepos [6]syntax.ATURI 23 23 + Pronouns string 24 24 + PreferredHandle syntax.Handle 24 25 } 25 26 26 27 func (p Profile) IsLinksEmpty() bool {

+5 -1

appview/pages/funcmap.go

reviewed

··· 65 65 return mapValue.MapIndex(keyValue).IsValid() 66 66 }, 67 67 "resolve": func(s string) string { 68 68 - identity, err := p.resolver.ResolveIdent(context.Background(), s) 68 68 + profile, err := db.GetProfile(p.db, s) 69 69 + if err == nil && profile != nil && profile.PreferredHandle != "" { 70 70 + return string(profile.PreferredHandle) 71 71 + } 69 72 73 73 + identity, err := p.resolver.ResolveIdent(context.Background(), s) 70 74 if err != nil { 71 75 return s 72 76 }

+1

appview/pages/pages.go

reviewed

··· 731 731 type EditBioParams struct { 732 732 LoggedInUser *oauth.MultiAccountUser 733 733 Profile *models.Profile 734 734 + AlsoKnownAs []string 734 735 } 735 736 736 737 func (p *Pages) EditBioFragment(w io.Writer, params EditBioParams) error {

+19

appview/pages/templates/user/fragments/editBio.html

reviewed

··· 36 36 </div> 37 37 </div> 38 38 39 39 + {{ if gt (len .AlsoKnownAs) 1 }} 40 40 + <div class="flex flex-col gap-1"> 41 41 + <label class="m-0 p-0" for="preferredHandle">preferred handle</label> 42 42 + <div class="flex items-center gap-2 w-full"> 43 43 + {{ $preferredHandle := "" }} 44 44 + {{ if and .Profile .Profile.PreferredHandle }} 45 45 + {{ $preferredHandle = .Profile.PreferredHandle }} 46 46 + {{ end }} 47 47 + <span class="flex-shrink-0">{{ i "at-sign" "size-4" }}</span> 48 48 + <select name="preferredHandle" class="py-1 px-1 w-full border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"> 49 49 + {{ range .AlsoKnownAs }} 50 50 + {{ $h := trimPrefix . "at://" }} 51 51 + <option value="{{ $h }}" {{ if eq $h $preferredHandle }}selected{{ end }}>{{ $h }}</option> 52 52 + {{ end }} 53 53 + </select> 54 54 + </div> 55 55 + </div> 56 56 + {{ end }} 57 57 + 39 58 <div class="flex flex-col gap-1"> 40 59 <label class="m-0 p-0" for="location">location</label> 41 60 <div class="flex items-center gap-2 w-full">

+10 -1

appview/state/login.go

reviewed

··· 8 8 "time" 9 9 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 11 + "github.com/bluesky-social/indigo/atproto/identity" 12 12 + "github.com/bluesky-social/indigo/atproto/syntax" 11 13 "github.com/bluesky-social/indigo/xrpc" 12 14 "tangled.org/core/appview/oauth" 13 15 "tangled.org/core/appview/pages" ··· 69 71 } 70 72 71 73 ident, err := s.idResolver.ResolveIdent(r.Context(), handle) 74 74 + if err != nil && errors.Is(err, identity.ErrHandleMismatch) { 75 75 + if h, parseErr := syntax.ParseHandle(handle); parseErr == nil { 76 76 + if did, resolveErr := s.idResolver.ResolveHandle(r.Context(), h); resolveErr == nil { 77 77 + ident, err = s.idResolver.ResolveIdent(r.Context(), did.String()) 78 78 + } 79 79 + } 80 80 + } 72 81 if err != nil { 73 82 l.Warn("handle resolution failed", "handle", handle, "err", err) 74 83 s.pages.Notice(w, "login-msg", fmt.Sprintf("Could not resolve handle \"%s\". The account may not exist.", handle)) ··· 101 110 l.Error("failed to set auth return", "err", err) 102 111 } 103 112 104 104 - redirectURL, err := s.oauth.ClientApp.StartAuthFlow(r.Context(), handle) 113 113 + redirectURL, err := s.oauth.ClientApp.StartAuthFlow(r.Context(), ident.DID.String()) 105 114 if err != nil { 106 115 l.Error("failed to start auth", "err", err) 107 116 s.pages.Notice(

+30

appview/state/profile.go

reviewed

··· 663 663 profile.IncludeBluesky = r.FormValue("includeBluesky") == "on" 664 664 profile.Location = r.FormValue("location") 665 665 profile.Pronouns = r.FormValue("pronouns") 666 666 + rawPreferredHandle := strings.TrimSpace(r.FormValue("preferredHandle")) 667 667 + if rawPreferredHandle != "" { 668 668 + h, err := syntax.ParseHandle(rawPreferredHandle) 669 669 + if err != nil { 670 670 + s.pages.Notice(w, "update-profile", "Invalid handle format.") 671 671 + return 672 672 + } 673 673 + 674 674 + ident, err := s.idResolver.ResolveIdent(r.Context(), user.Active.Did) 675 675 + if err != nil || !slices.Contains(ident.AlsoKnownAs, "at://"+rawPreferredHandle) { 676 676 + s.pages.Notice(w, "update-profile", "Handle not found in your DID document.") 677 677 + return 678 678 + } 679 679 + profile.PreferredHandle = h 680 680 + } else { 681 681 + profile.PreferredHandle = "" 682 682 + } 666 683 667 684 var links [5]string 668 685 for i := range 5 { ··· 759 776 760 777 ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self") 761 778 var cid *string 779 779 + var existingAvatar *lexutil.LexBlob 762 780 if ex != nil { 763 781 cid = ex.Cid 782 782 + if rec, ok := ex.Value.Val.(*tangled.ActorProfile); ok { 783 783 + existingAvatar = rec.Avatar 784 784 + } 764 785 } 765 786 766 787 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ ··· 769 790 Rkey: "self", 770 791 Record: &lexutil.LexiconTypeDecoder{ 771 792 Val: &tangled.ActorProfile{ 793 793 + Avatar: existingAvatar, 772 794 Bluesky: profile.IncludeBluesky, 773 795 Description: &profile.Description, 774 796 Links: profile.Links[:], ··· 776 798 PinnedRepositories: pinnedRepoStrings, 777 799 Stats: vanityStats[:], 778 800 Pronouns: &profile.Pronouns, 801 801 + PreferredHandle: (*string)(&profile.PreferredHandle), 779 802 }}, 780 803 SwapRecord: cid, 781 804 }) ··· 808 831 profile = &models.Profile{Did: user.Active.Did} 809 832 } 810 833 834 834 + var alsoKnownAs []string 835 835 + ident, err := s.idResolver.ResolveIdent(r.Context(), user.Active.Did) 836 836 + if err == nil { 837 837 + alsoKnownAs = ident.AlsoKnownAs 838 838 + } 839 839 + 811 840 s.pages.EditBioFragment(w, pages.EditBioParams{ 812 841 LoggedInUser: user, 813 842 Profile: profile, 843 843 + AlsoKnownAs: alsoKnownAs, 814 844 }) 815 845 } 816 846

+17 -16

idresolver/resolver.go

reviewed

··· 15 15 16 16 type Resolver struct { 17 17 directory identity.Directory 18 18 + base *identity.BaseDirectory 18 19 } 19 20 20 20 - func BaseDirectory(plcUrl string) identity.Directory { 21 21 + func BaseDirectory(plcUrl string) *identity.BaseDirectory { 21 22 base := identity.BaseDirectory{ 22 23 PLCURL: plcUrl, 23 24 HTTPClient: http.Client{ ··· 40 41 UserAgent: "indigo-identity/" + versioninfo.Short(), 41 42 } 42 43 return &base 43 43 - } 44 44 - 45 45 - func RedisDirectory(url, plcUrl string) (identity.Directory, error) { 46 46 - hitTTL := time.Hour * 24 47 47 - errTTL := time.Second * 30 48 48 - invalidHandleTTL := time.Minute * 5 49 49 - return redisdir.NewRedisDirectory( 50 50 - BaseDirectory(plcUrl), 51 51 - url, 52 52 - hitTTL, 53 53 - errTTL, 54 54 - invalidHandleTTL, 55 55 - 10000, 56 56 - ) 57 44 } 58 45 59 46 func DefaultResolver(plcUrl string) *Resolver { ··· 61 48 cached := identity.NewCacheDirectory(base, 250_000, time.Hour*24, time.Minute*2, time.Minute*5) 62 49 return &Resolver{ 63 50 directory: cached, 51 51 + base: base, 64 52 } 53 53 + } 54 54 + 55 55 + func RedisDirectory(base *identity.BaseDirectory, url string) (identity.Directory, error) { 56 56 + hitTTL := time.Hour * 24 57 57 + errTTL := time.Second * 30 58 58 + invalidHandleTTL := time.Minute * 5 59 59 + return redisdir.NewRedisDirectory(base, url, hitTTL, errTTL, invalidHandleTTL, 10000) 65 60 } 66 61 67 62 func RedisResolver(redisUrl, plcUrl string) (*Resolver, error) { 68 68 - directory, err := RedisDirectory(redisUrl, plcUrl) 63 63 + base := BaseDirectory(plcUrl) 64 64 + directory, err := RedisDirectory(base, redisUrl) 69 65 if err != nil { 70 66 return nil, err 71 67 } 72 68 return &Resolver{ 73 69 directory: directory, 70 70 + base: base, 74 71 }, nil 72 72 + } 73 73 + 74 74 + func (r *Resolver) ResolveHandle(ctx context.Context, handle syntax.Handle) (syntax.DID, error) { 75 75 + return r.base.ResolveHandle(ctx, handle) 75 76 } 76 77 77 78 func (r *Resolver) ResolveIdent(ctx context.Context, arg string) (*identity.Identity, error) {

+6

lexicons/actor/profile.json

reviewed

··· 74 74 "type": "string", 75 75 "description": "Preferred gender pronouns.", 76 76 "maxLength": 40 77 77 + }, 78 78 + "preferredHandle": { 79 79 + "type": "string", 80 80 + "description": "A handle the user prefers to be displayed as.", 81 81 + "format": "handle", 82 82 + "maxLength": 253 77 83 } 78 84 } 79 85 }