zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Support previews for links using DIDs and not just handles

zio/stable
Jaz 2024-02-03 22:24:54 -08:00
parent 15e90356e7
commit 3ed1877e4b
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bskyweb/cmd/bskyweb/server.go
View File

@ -203,20 +203,20 @@ func serve(cctx *cli.Context) error {
e.GET("/support/copyright", server.WebGeneric) e.GET("/support/copyright", server.WebGeneric)
// profile endpoints; only first populates info // profile endpoints; only first populates info
e.GET("/profile/:handle", server.WebProfile) e.GET("/profile/:handleOrDID", server.WebProfile)
e.GET("/profile/:handle/follows", server.WebGeneric) e.GET("/profile/:handleOrDID/follows", server.WebGeneric)
e.GET("/profile/:handle/followers", server.WebGeneric) e.GET("/profile/:handleOrDID/followers", server.WebGeneric)
e.GET("/profile/:handle/lists/:rkey", server.WebGeneric) e.GET("/profile/:handleOrDID/lists/:rkey", server.WebGeneric)
e.GET("/profile/:handle/feed/:rkey", server.WebGeneric) e.GET("/profile/:handleOrDID/feed/:rkey", server.WebGeneric)
e.GET("/profile/:handle/feed/:rkey/liked-by", server.WebGeneric) e.GET("/profile/:handleOrDID/feed/:rkey/liked-by", server.WebGeneric)
// profile RSS feed (DID not handle) // profile RSS feed (DID not handle)
e.GET("/profile/:ident/rss", server.WebProfileRSS) e.GET("/profile/:ident/rss", server.WebProfileRSS)
// post endpoints; only first populates info // post endpoints; only first populates info
e.GET("/profile/:handle/post/:rkey", server.WebPost) e.GET("/profile/:handleOrDID/post/:rkey", server.WebPost)
e.GET("/profile/:handle/post/:rkey/liked-by", server.WebGeneric) e.GET("/profile/:handleOrDID/post/:rkey/liked-by", server.WebGeneric)
e.GET("/profile/:handle/post/:rkey/reposted-by", server.WebGeneric) e.GET("/profile/:handleOrDID/post/:rkey/reposted-by", server.WebGeneric)
// Mailmodo // Mailmodo
e.POST("/api/waitlist", server.apiWaitlist) e.POST("/api/waitlist", server.apiWaitlist)
@ -299,17 +299,18 @@ func (srv *Server) WebPost(c echo.Context) error {
if err != nil { if err != nil {
return c.Render(http.StatusOK, "post.html", data) return c.Render(http.StatusOK, "post.html", data)
} }
handleParam := c.Param("handle") handleOrDIDParam := c.Param("handleOrDID")
handle, err := syntax.ParseHandle(handleParam) handleOrDID, err := syntax.ParseAtIdentifier(handleOrDIDParam)
if err != nil { if err != nil {
return c.Render(http.StatusOK, "post.html", data) return c.Render(http.StatusOK, "post.html", data)
} }
handle = handle.Normalize()
identifier := handleOrDID.Normalize().String()
// requires two fetches: first fetch profile (!) // requires two fetches: first fetch profile (!)
pv, err := appbsky.ActorGetProfile(ctx, srv.xrpcc, handle.String()) pv, err := appbsky.ActorGetProfile(ctx, srv.xrpcc, identifier)
if err != nil { if err != nil {
log.Warnf("failed to fetch handle: %s\t%v", handle, err) log.Warnf("failed to fetch profile for: %s\t%v", identifier, err)
return c.Render(http.StatusOK, "post.html", data) return c.Render(http.StatusOK, "post.html", data)
} }
unauthedViewingOkay := true unauthedViewingOkay := true
@ -367,16 +368,16 @@ func (srv *Server) WebProfile(c echo.Context) error {
data := pongo2.Context{} data := pongo2.Context{}
// sanity check arguments. don't 4xx, just let app handle if not expected format // sanity check arguments. don't 4xx, just let app handle if not expected format
handleParam := c.Param("handle") handleOrDIDParam := c.Param("handleOrDID")
handle, err := syntax.ParseHandle(handleParam) handleOrDID, err := syntax.ParseAtIdentifier(handleOrDIDParam)
if err != nil { if err != nil {
return c.Render(http.StatusOK, "profile.html", data) return c.Render(http.StatusOK, "profile.html", data)
} }
handle = handle.Normalize() identifier := handleOrDID.Normalize().String()
pv, err := appbsky.ActorGetProfile(ctx, srv.xrpcc, handle.String()) pv, err := appbsky.ActorGetProfile(ctx, srv.xrpcc, identifier)
if err != nil { if err != nil {
log.Warnf("failed to fetch handle: %s\t%v", handle, err) log.Warnf("failed to fetch profile for: %s\t%v", identifier, err)
return c.Render(http.StatusOK, "profile.html", data) return c.Render(http.StatusOK, "profile.html", data)
} }
unauthedViewingOkay := true unauthedViewingOkay := true