summaryrefslogtreecommitdiff
path: root/internal/web
diff options
context:
space:
mode:
Diffstat (limited to 'internal/web')
-rw-r--r--internal/web/assets.go2
-rw-r--r--internal/web/etag.go19
-rw-r--r--internal/web/profile.go13
-rw-r--r--internal/web/rss.go86
4 files changed, 88 insertions, 32 deletions
diff --git a/internal/web/assets.go b/internal/web/assets.go
index 8e453850d..f58568be3 100644
--- a/internal/web/assets.go
+++ b/internal/web/assets.go
@@ -82,7 +82,7 @@ func getAssetETag(
return cachedETag.eTag, nil
}
- eTag, err := generateEtag(file)
+ eTag, err := generateETag(file)
if err != nil {
return "", fmt.Errorf("error generating etag: %s", err)
}
diff --git a/internal/web/etag.go b/internal/web/etag.go
index fcd55603b..42a6083f0 100644
--- a/internal/web/etag.go
+++ b/internal/web/etag.go
@@ -27,6 +27,7 @@ import (
"code.superseriousbusiness.org/gotosocial/internal/log"
"codeberg.org/gruf/go-cache/v3"
+ "codeberg.org/gruf/go-fastcopy"
)
type withETagCache interface {
@@ -47,13 +48,19 @@ type eTagCacheEntry struct {
lastModified time.Time
}
-// generateEtag generates a strong (byte-for-byte) etag using
-// the entirety of the provided reader.
-func generateEtag(r io.Reader) (string, error) {
- // nolint:gosec
- hash := sha1.New()
+// generateEtag generates a strong (byte-for-byte) etag
+// using the entirety of the provided reader.
+func generateETag(r io.Reader) (string, error) {
+ return generateETagFrom(func(w io.Writer) error {
+ _, err := fastcopy.Copy(w, r)
+ return err
+ })
+}
+
+func generateETagFrom(writeTo func(io.Writer) error) (string, error) {
+ hash := sha1.New() // nolint:gosec
- if _, err := io.Copy(hash, r); err != nil {
+ if err := writeTo(hash); err != nil {
return "", err
}
diff --git a/internal/web/profile.go b/internal/web/profile.go
index 98abe5741..458557b8b 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -27,6 +27,7 @@ import (
apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util"
"code.superseriousbusiness.org/gotosocial/internal/gtserror"
"code.superseriousbusiness.org/gotosocial/internal/log"
+ "code.superseriousbusiness.org/gotosocial/internal/paging"
"github.com/gin-gonic/gin"
)
@@ -122,14 +123,15 @@ func (m *Module) prepareProfile(c *gin.Context) *profile {
// Check if paging.
maxStatusID := apiutil.ParseMaxID(c.Query(apiutil.MaxIDKey), "")
- paging := maxStatusID != ""
+ doPaging := (maxStatusID != "")
- // If not paging, load pinned statuses.
var (
mediaOnly = account.WebLayout == "gallery"
pinnedStatuses []*apimodel.WebStatus
)
- if !paging {
+
+ if !doPaging {
+ // If not paging, load pinned statuses.
var errWithCode gtserror.WithCode
pinnedStatuses, errWithCode = m.processor.Account().WebStatusesGetPinned(
ctx,
@@ -156,9 +158,8 @@ func (m *Module) prepareProfile(c *gin.Context) *profile {
statusResp, errWithCode := m.processor.Account().WebStatusesGet(
ctx,
account.ID,
+ &paging.Page{Max: paging.MaxID(maxStatusID), Limit: limit},
mediaOnly,
- limit,
- maxStatusID,
)
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, instanceGet)
@@ -172,7 +173,7 @@ func (m *Module) prepareProfile(c *gin.Context) *profile {
robotsMeta: robotsMeta,
pinnedStatuses: pinnedStatuses,
statusResp: statusResp,
- paging: paging,
+ paging: doPaging,
}
}
diff --git a/internal/web/rss.go b/internal/web/rss.go
index 006ba4ec1..d812ddc33 100644
--- a/internal/web/rss.go
+++ b/internal/web/rss.go
@@ -18,7 +18,6 @@
package web
import (
- "bytes"
"net/http"
"strings"
"time"
@@ -26,13 +25,26 @@ import (
apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util"
"code.superseriousbusiness.org/gotosocial/internal/gtserror"
"code.superseriousbusiness.org/gotosocial/internal/log"
+ "code.superseriousbusiness.org/gotosocial/internal/paging"
"github.com/gin-gonic/gin"
+ "github.com/gorilla/feeds"
)
-const appRSSUTF8 = string(apiutil.AppRSSXML) + "; charset=utf-8"
+const (
+ charsetUTF8 = "; charset=utf-8"
+ appRSSUTF8 = string(apiutil.AppRSSXML) + charsetUTF8
+ appAtomUTF8 = string(apiutil.AppAtomXML) + charsetUTF8
+ appJSONUTF8 = string(apiutil.AppFeedJSON) + charsetUTF8
+)
func (m *Module) rssFeedGETHandler(c *gin.Context) {
- if _, err := apiutil.NegotiateAccept(c, apiutil.AppRSSXML); err != nil {
+ contentType, err := apiutil.NegotiateAccept(c,
+ apiutil.AppRSSXML,
+ apiutil.AppAtomXML,
+ apiutil.AppFeedJSON,
+ apiutil.AppJSON,
+ )
+ if err != nil {
apiutil.WebErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1)
return
}
@@ -49,21 +61,34 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) {
// todo: https://codeberg.org/superseriousbusiness/gotosocial/issues/1813
username = strings.ToLower(username)
- // Retrieve the getRSSFeed function from the processor.
- // We'll only call the function if we need to, to save db calls.
- // lastPostAt may be a zero time if account has never posted.
- getRSSFeed, lastPostAt, errWithCode := m.processor.Account().GetRSSFeedForUsername(c.Request.Context(), username)
+ // Parse paging parameters from request.
+ page, errWithCode := paging.ParseIDPage(c,
+ 1, // min limit
+ 40, // max limit
+ 20, // default limit
+ )
+ if errWithCode != nil {
+ apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
+ return
+ }
+
+ getFunc, lastPostAt, errWithCode := m.processor.Account().GetRSSFeedForUsername(
+ c.Request.Context(),
+ username,
+ page,
+ )
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
}
- var (
- rssFeed string // Stringified rss feed.
+ var feed *feeds.Feed
- cacheKey = c.Request.URL.Path
- cacheEntry, wasCached = m.eTagCache.Get(cacheKey)
- )
+ // Key to use in etag cache (note content-type suffix).
+ cacheKey := c.Request.URL.Path + "#" + contentType
+
+ // Check etag cache for an existing entry under key.
+ cacheEntry, wasCached := m.eTagCache.Get(cacheKey)
if !wasCached || unixAfter(lastPostAt, cacheEntry.lastModified) {
// We either have no ETag cache entry for this account's feed,
@@ -72,15 +97,16 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) {
//
// As such, we need to generate a new ETag, and for that we need
// the string representation of the RSS feed.
- rssFeed, errWithCode = getRSSFeed()
+ feed, errWithCode = getFunc()
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
}
- eTag, err := generateEtag(bytes.NewBufferString(rssFeed))
+ etag, err := generateFeedETag(feed, contentType)
if err != nil {
- apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1)
+ errWithCode := gtserror.NewErrorInternalError(err)
+ apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
}
@@ -96,7 +122,7 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) {
// Store the new cache entry.
cacheEntry = eTagCacheEntry{
- eTag: eTag,
+ eTag: etag,
lastModified: lastModified,
}
m.eTagCache.Set(cacheKey, cacheEntry)
@@ -149,15 +175,37 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) {
// If we had a cache hit earlier, we may not have called the
// getRSSFeed function yet; if that's the case then do call it
// now because we definitely need it.
- if rssFeed == "" {
- rssFeed, errWithCode = getRSSFeed()
+ if feed == nil {
+ feed, errWithCode = getFunc()
if errWithCode != nil {
apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
}
}
- c.Data(http.StatusOK, appRSSUTF8, []byte(rssFeed))
+ // Encode response.
+ switch contentType {
+ case apiutil.AppRSSXML:
+ apiutil.XMLType(c, http.StatusOK, appRSSUTF8, &feeds.Rss{feed})
+ case apiutil.AppAtomXML:
+ apiutil.XMLType(c, http.StatusOK, appAtomUTF8, &feeds.Atom{feed})
+ case apiutil.AppFeedJSON, apiutil.AppJSON:
+ apiutil.JSONType(c, http.StatusOK, appJSONUTF8, (&feeds.JSON{feed}).JSONFeed())
+ }
+}
+
+// generateFeedETag generates feed etag for appropriate content-type encoding.
+func generateFeedETag(feed *feeds.Feed, contentType string) (string, error) {
+ switch contentType {
+ case apiutil.AppRSSXML:
+ return generateETagFrom(feed.WriteRss)
+ case apiutil.AppAtomXML:
+ return generateETagFrom(feed.WriteAtom)
+ case apiutil.AppFeedJSON, apiutil.AppJSON:
+ return generateETagFrom(feed.WriteJSON)
+ default:
+ panic("unreachable")
+ }
}
// unixAfter returns true if the unix value of t1
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-02 06:45:27 +0000