diff --git a/bskyweb/cmd/bskyweb/server.go b/bskyweb/cmd/bskyweb/server.go index f9fe641ede..76016e6df6 100644 --- a/bskyweb/cmd/bskyweb/server.go +++ b/bskyweb/cmd/bskyweb/server.go @@ -536,6 +536,22 @@ func (srv *Server) WebPost(c echo.Context) error { } } + if postView.Record != nil { + postRecord, ok := postView.Record.Val.(*appbsky.FeedPost) + if ok { + data["postText"] = ExpandPostText(postRecord) + } + + if !isEmbedHidden && postRecord.Labels != nil && postRecord.Labels.LabelDefs_SelfLabels != nil { + for _, label := range postRecord.Labels.LabelDefs_SelfLabels.Values { + if hideEmbedLabels[label.Val] { + isEmbedHidden = true + break + } + } + } + } + if postView.Embed != nil && !isEmbedHidden { hasImages := postView.Embed.EmbedImages_View != nil hasMedia := postView.Embed.EmbedRecordWithMedia_View != nil && postView.Embed.EmbedRecordWithMedia_View.Media != nil && postView.Embed.EmbedRecordWithMedia_View.Media.EmbedImages_View != nil @@ -555,13 +571,6 @@ func (srv *Server) WebPost(c echo.Context) error { } } - if postView.Record != nil { - postRecord, ok := postView.Record.Val.(*appbsky.FeedPost) - if ok { - data["postText"] = ExpandPostText(postRecord) - } - } - return c.Render(http.StatusOK, "post.html", data) }