diff --git a/appview/state/login.go b/appview/state/login.go
index c68501fd..c9174252 100644
--- a/appview/state/login.go
+++ b/appview/state/login.go
@@ -8,6 +8,8 @@ import (
"time"
comatproto "github.com/bluesky-social/indigo/api/atproto"
+ "github.com/bluesky-social/indigo/atproto/identity"
+ "github.com/bluesky-social/indigo/atproto/syntax"
"github.com/bluesky-social/indigo/xrpc"
"tangled.org/core/appview/oauth"
"tangled.org/core/appview/pages"
@@ -69,6 +71,13 @@ func (s *State) Login(w http.ResponseWriter, r *http.Request) {
}
ident, err := s.idResolver.ResolveIdent(r.Context(), handle)
+ if err != nil && errors.Is(err, identity.ErrHandleMismatch) {
+ if h, parseErr := syntax.ParseHandle(handle); parseErr == nil {
+ if did, resolveErr := s.idResolver.ResolveHandle(r.Context(), h); resolveErr == nil {
+ ident, err = s.idResolver.ResolveIdent(r.Context(), did.String())
+ }
+ }
+ }
if err != nil {
l.Warn("handle resolution failed", "handle", handle, "err", err)
s.pages.Notice(w, "login-msg", fmt.Sprintf("Could not resolve handle \"%s\". The account may not exist.", handle))
@@ -101,7 +110,7 @@ func (s *State) Login(w http.ResponseWriter, r *http.Request) {
l.Error("failed to set auth return", "err", err)
}
- redirectURL, err := s.oauth.ClientApp.StartAuthFlow(r.Context(), handle)
+ redirectURL, err := s.oauth.ClientApp.StartAuthFlow(r.Context(), ident.DID.String())
if err != nil {
l.Error("failed to start auth", "err", err)
s.pages.Notice(
diff --git a/appview/state/profile.go b/appview/state/profile.go
index 342eee24..13a92f0d 100644
--- a/appview/state/profile.go
+++ b/appview/state/profile.go
@@ -663,6 +663,23 @@ func (s *State) UpdateProfileBio(w http.ResponseWriter, r *http.Request) {
profile.IncludeBluesky = r.FormValue("includeBluesky") == "on"
profile.Location = r.FormValue("location")
profile.Pronouns = r.FormValue("pronouns")
+ rawPreferredHandle := strings.TrimSpace(r.FormValue("preferredHandle"))
+ if rawPreferredHandle != "" {
+ h, err := syntax.ParseHandle(rawPreferredHandle)
+ if err != nil {
+ s.pages.Notice(w, "update-profile", "Invalid handle format.")
+ return
+ }
+
+ ident, err := s.idResolver.ResolveIdent(r.Context(), user.Active.Did)
+ if err != nil || !slices.Contains(ident.AlsoKnownAs, "at://"+rawPreferredHandle) {
+ s.pages.Notice(w, "update-profile", "Handle not found in your DID document.")
+ return
+ }
+ profile.PreferredHandle = h
+ } else {
+ profile.PreferredHandle = ""
+ }
var links [5]string
for i := range 5 {
@@ -759,8 +776,12 @@ func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r
ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Active.Did, "self")
var cid *string
+ var existingAvatar *lexutil.LexBlob
if ex != nil {
cid = ex.Cid
+ if rec, ok := ex.Value.Val.(*tangled.ActorProfile); ok {
+ existingAvatar = rec.Avatar
+ }
}
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
@@ -769,6 +790,7 @@ func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r
Rkey: "self",
Record: &lexutil.LexiconTypeDecoder{
Val: &tangled.ActorProfile{
+ Avatar: existingAvatar,
Bluesky: profile.IncludeBluesky,
Description: &profile.Description,
Links: profile.Links[:],
@@ -776,6 +798,7 @@ func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r
PinnedRepositories: pinnedRepoStrings,
Stats: vanityStats[:],
Pronouns: &profile.Pronouns,
+ PreferredHandle: (*string)(&profile.PreferredHandle),
}},
SwapRecord: cid,
})
@@ -808,9 +831,16 @@ func (s *State) EditBioFragment(w http.ResponseWriter, r *http.Request) {
profile = &models.Profile{Did: user.Active.Did}
}
+ var alsoKnownAs []string
+ ident, err := s.idResolver.ResolveIdent(r.Context(), user.Active.Did)
+ if err == nil {
+ alsoKnownAs = ident.AlsoKnownAs
+ }
+
s.pages.EditBioFragment(w, pages.EditBioParams{
LoggedInUser: user,
Profile: profile,
+ AlsoKnownAs: alsoKnownAs,
})
}
diff --git a/idresolver/resolver.go b/idresolver/resolver.go
index c8b8c003..3440f296 100644
--- a/idresolver/resolver.go
+++ b/idresolver/resolver.go
@@ -15,9 +15,10 @@ import (
type Resolver struct {
directory identity.Directory
+ base *identity.BaseDirectory
}
-func BaseDirectory(plcUrl string) identity.Directory {
+func BaseDirectory(plcUrl string) *identity.BaseDirectory {
base := identity.BaseDirectory{
PLCURL: plcUrl,
HTTPClient: http.Client{
@@ -42,38 +43,38 @@ func BaseDirectory(plcUrl string) identity.Directory {
return &base
}
-func RedisDirectory(url, plcUrl string) (identity.Directory, error) {
- hitTTL := time.Hour * 24
- errTTL := time.Second * 30
- invalidHandleTTL := time.Minute * 5
- return redisdir.NewRedisDirectory(
- BaseDirectory(plcUrl),
- url,
- hitTTL,
- errTTL,
- invalidHandleTTL,
- 10000,
- )
-}
-
func DefaultResolver(plcUrl string) *Resolver {
base := BaseDirectory(plcUrl)
cached := identity.NewCacheDirectory(base, 250_000, time.Hour*24, time.Minute*2, time.Minute*5)
return &Resolver{
directory: cached,
+ base: base,
}
}
+func RedisDirectory(base *identity.BaseDirectory, url string) (identity.Directory, error) {
+ hitTTL := time.Hour * 24
+ errTTL := time.Second * 30
+ invalidHandleTTL := time.Minute * 5
+ return redisdir.NewRedisDirectory(base, url, hitTTL, errTTL, invalidHandleTTL, 10000)
+}
+
func RedisResolver(redisUrl, plcUrl string) (*Resolver, error) {
- directory, err := RedisDirectory(redisUrl, plcUrl)
+ base := BaseDirectory(plcUrl)
+ directory, err := RedisDirectory(base, redisUrl)
if err != nil {
return nil, err
}
return &Resolver{
directory: directory,
+ base: base,
}, nil
}
+func (r *Resolver) ResolveHandle(ctx context.Context, handle syntax.Handle) (syntax.DID, error) {
+ return r.base.ResolveHandle(ctx, handle)
+}
+
func (r *Resolver) ResolveIdent(ctx context.Context, arg string) (*identity.Identity, error) {
id, err := syntax.ParseAtIdentifier(arg)
if err != nil {
diff --git a/lexicons/actor/profile.json b/lexicons/actor/profile.json
index d7127214..0b862589 100644
--- a/lexicons/actor/profile.json
+++ b/lexicons/actor/profile.json
@@ -74,6 +74,12 @@
"type": "string",
"description": "Preferred gender pronouns.",
"maxLength": 40
+ },
+ "preferredHandle": {
+ "type": "string",
+ "description": "A handle the user prefers to be displayed as.",
+ "format": "handle",
+ "maxLength": 253
}
}
}