summaryrefslogtreecommitdiff
path: root/internal/web
diff options
context:
space:
mode:
Diffstat (limited to 'internal/web')
-rw-r--r--internal/web/customcss.go4
-rw-r--r--internal/web/profile.go38
-rw-r--r--internal/web/thread.go69
3 files changed, 39 insertions, 72 deletions
diff --git a/internal/web/customcss.go b/internal/web/customcss.go
index f0c767503..f33164f1e 100644
--- a/internal/web/customcss.go
+++ b/internal/web/customcss.go
@@ -34,7 +34,7 @@ func (m *Module) customCSSGETHandler(c *gin.Context) {
return
}
- targetUsername, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
+ requestedUser, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
@@ -45,7 +45,7 @@ func (m *Module) customCSSGETHandler(c *gin.Context) {
// when custom CSS gets toggled on or off.
var customCSS string
if config.GetAccountsAllowCustomCSS() {
- customCSS, errWithCode = m.processor.Account().GetCustomCSSForUsername(c.Request.Context(), targetUsername)
+ customCSS, errWithCode = m.processor.Account().GetCustomCSSForUsername(c.Request.Context(), requestedUser)
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
diff --git a/internal/web/profile.go b/internal/web/profile.go
index 458557b8b..e619961d7 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -19,7 +19,6 @@ package web
import (
"context"
- "fmt"
"net/http"
"strings"
@@ -63,27 +62,32 @@ func (m *Module) prepareProfile(c *gin.Context) *profile {
}
// Parse + normalize account username from the URL.
- requestedUsername, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
+ requestedUser, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
return nil
}
- requestedUsername = strings.ToLower(requestedUsername)
+ requestedUser = strings.ToLower(requestedUser)
// Check what type of content is being requested.
// If we're getting an AP request on this endpoint
// we should render the AP representation instead.
- contentType, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)
+ accept, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...)
if err != nil {
apiutil.WebErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), instanceGet)
return nil
}
- if contentType == string(apiutil.AppActivityJSON) ||
- contentType == string(apiutil.AppActivityLDJSON) {
+ if apiutil.ASContentType(accept) {
// AP account representation has
// been requested, return that.
- m.returnAPAccount(c, requestedUsername, contentType)
+ user, errWithCode := m.processor.Fedi().UserGet(c.Request.Context(), requestedUser)
+ if errWithCode != nil {
+ apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
+ return nil
+ }
+
+ apiutil.JSONType(c, http.StatusOK, accept, user)
return nil
}
@@ -91,7 +95,7 @@ func (m *Module) prepareProfile(c *gin.Context) *profile {
//
// Proceed with getting the web
// representation of the account.
- account, errWithCode := m.processor.Account().GetWeb(ctx, requestedUsername)
+ account, errWithCode := m.processor.Account().GetWeb(ctx, requestedUser)
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
return nil
@@ -102,7 +106,7 @@ func (m *Module) prepareProfile(c *gin.Context) *profile {
//
// TODO: change this to 410?
if account.Suspended {
- err := fmt.Errorf("target account %s is suspended", requestedUsername)
+ err := gtserror.Newf("target account %s is suspended", requestedUser)
apiutil.WebErrorHandler(c, gtserror.NewErrorNotFound(err), instanceGet)
return nil
}
@@ -342,19 +346,3 @@ func (m *Module) profileGallery(c *gin.Context, p *profile) {
apiutil.TemplateWebPage(c, page)
}
-
-// returnAPAccount returns an ActivityPub representation of
-// target account. It will do http signature authentication.
-func (m *Module) returnAPAccount(
- c *gin.Context,
- targetUsername string,
- contentType string,
-) {
- user, errWithCode := m.processor.Fedi().UserGet(c.Request.Context(), targetUsername, c.Request.URL)
- if errWithCode != nil {
- apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
- return
- }
-
- apiutil.JSONType(c, http.StatusOK, contentType, user)
-}
diff --git a/internal/web/thread.go b/internal/web/thread.go
index 3844bc6f3..fa3e54fac 100644
--- a/internal/web/thread.go
+++ b/internal/web/thread.go
@@ -19,8 +19,6 @@ package web
import (
"context"
- "encoding/json"
- "fmt"
"net/http"
"strings"
@@ -47,14 +45,14 @@ func (m *Module) threadGETHandler(c *gin.Context) {
return instance, nil
}
- // Parse account targetUsername and status ID from the URL.
- targetUsername, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
+ // Parse account requestedUser and status ID from the URL.
+ requestedUser, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
return
}
- targetStatusID, errWithCode := apiutil.ParseWebStatusID(c.Param(apiutil.WebStatusIDKey))
+ statusID, errWithCode := apiutil.ParseWebStatusID(c.Param(apiutil.WebStatusIDKey))
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
return
@@ -67,8 +65,8 @@ func (m *Module) threadGETHandler(c *gin.Context) {
//
// todo: Update this logic when different username patterns
// are allowed, and/or when status slugs are introduced.
- targetUsername = strings.ToLower(targetUsername)
- targetStatusID = strings.ToUpper(targetStatusID)
+ requestedUser = strings.ToLower(requestedUser)
+ statusID = strings.ToUpper(statusID)
// Check what type of content is being requested. If we're getting an AP
// request on this endpoint we should render the AP representation instead.
@@ -78,38 +76,44 @@ func (m *Module) threadGETHandler(c *gin.Context) {
return
}
- if accept == string(apiutil.AppActivityJSON) || accept == string(apiutil.AppActivityLDJSON) {
+ if apiutil.ASContentType(accept) {
// AP status representation has been requested.
- m.returnAPStatus(c, targetUsername, targetStatusID, accept, instanceGet)
+ status, errWithCode := m.processor.Fedi().StatusGet(c.Request.Context(), requestedUser, statusID)
+ if errWithCode != nil {
+ apiutil.WebErrorHandler(c, errWithCode, instanceGet)
+ return
+ }
+
+ apiutil.JSONType(c, http.StatusOK, accept, status)
return
}
// text/html has been requested. Proceed with getting the web view of the status.
// Fetch the target account so we can do some checks on it.
- targetAccount, errWithCode := m.processor.Account().GetWeb(ctx, targetUsername)
+ acct, errWithCode := m.processor.Account().GetWeb(ctx, requestedUser)
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
return
}
- // If target account is suspended, this page should not be visible.
- if targetAccount.Suspended {
- err := fmt.Errorf("target account %s is suspended", targetUsername)
+ // If requested account is suspended, this page should not be visible.
+ if acct.Suspended {
+ err := gtserror.Newf("account %s is suspended", requestedUser)
apiutil.WebErrorHandler(c, gtserror.NewErrorNotFound(err), instanceGet)
return
}
- // Get the thread context. This will fetch the target status as well.
- context, errWithCode := m.processor.Status().WebContextGet(ctx, targetStatusID)
+ // Get the thread context. This will fetch the status as well.
+ context, errWithCode := m.processor.Status().WebContextGet(ctx, statusID)
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
return
}
- // Ensure status actually belongs to target account.
- if context.Status.Account.ID != targetAccount.ID {
- err := fmt.Errorf("target account %s does not own status %s", targetUsername, targetStatusID)
+ // Ensure status actually belongs to requested account.
+ if context.Status.Account.ID != acct.ID {
+ err := gtserror.Newf("account %s does not own status %s", requestedUser, statusID)
apiutil.WebErrorHandler(c, gtserror.NewErrorNotFound(err), instanceGet)
return
}
@@ -128,7 +132,7 @@ func (m *Module) threadGETHandler(c *gin.Context) {
)
// User-selected theme if set.
- if theme := targetAccount.Theme; theme != "" {
+ if theme := acct.Theme; theme != "" {
stylesheets = append(
stylesheets,
themesPathPrefix+"/"+theme,
@@ -138,7 +142,7 @@ func (m *Module) threadGETHandler(c *gin.Context) {
// Custom CSS for this user last in cascade.
stylesheets = append(
stylesheets,
- "/@"+targetAccount.Username+"/custom.css",
+ "/@"+acct.Username+"/custom.css",
)
page := apiutil.WebPage{
@@ -164,28 +168,3 @@ func (m *Module) threadGETHandler(c *gin.Context) {
apiutil.TemplateWebPage(c, page)
}
-
-// returnAPStatus returns an ActivityPub representation of target status,
-// created by targetUsername. It will do http signature authentication.
-func (m *Module) returnAPStatus(
- c *gin.Context,
- targetUsername string,
- targetStatusID string,
- accept string,
- instanceGet func(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode),
-) {
- status, errWithCode := m.processor.Fedi().StatusGet(c.Request.Context(), targetUsername, targetStatusID)
- if errWithCode != nil {
- apiutil.WebErrorHandler(c, errWithCode, instanceGet)
- return
- }
-
- b, err := json.Marshal(status)
- if err != nil {
- err := gtserror.Newf("could not marshal json: %w", err)
- apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), instanceGet)
- return
- }
-
- c.Data(http.StatusOK, accept, b)
-}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-02 15:52:41 +0000