summaryrefslogtreecommitdiff
path: root/internal/api
diff options
context:
space:
mode:
Diffstat (limited to 'internal/api')
-rw-r--r--internal/api/client/accounts/accountupdate_test.go4
-rw-r--r--internal/api/client/accounts/accountverify_test.go8
-rw-r--r--internal/api/fileserver/servefile.go13
-rw-r--r--internal/api/fileserver/servefile_test.go18
4 files changed, 24 insertions, 19 deletions
diff --git a/internal/api/client/accounts/accountupdate_test.go b/internal/api/client/accounts/accountupdate_test.go
index ad28d2e90..9ccb29302 100644
--- a/internal/api/client/accounts/accountupdate_test.go
+++ b/internal/api/client/accounts/accountupdate_test.go
@@ -300,8 +300,8 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerWit
suite.NotEmpty(apimodelAccount.HeaderStatic)
// should be different from the values set before
- suite.NotEqual("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.Header)
- suite.NotEqual("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.HeaderStatic)
+ suite.NotEqual("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpg", apimodelAccount.Header)
+ suite.NotEqual("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpg", apimodelAccount.HeaderStatic)
}
func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerEmptyForm() {
diff --git a/internal/api/client/accounts/accountverify_test.go b/internal/api/client/accounts/accountverify_test.go
index 3ee18a7ef..f9cd8e30a 100644
--- a/internal/api/client/accounts/accountverify_test.go
+++ b/internal/api/client/accounts/accountverify_test.go
@@ -74,10 +74,10 @@ func (suite *AccountVerifyTestSuite) TestAccountVerifyGet() {
suite.Equal(*testAccount.Bot, apimodelAccount.Bot)
suite.WithinDuration(testAccount.CreatedAt, createdAt, 30*time.Second) // we lose a bit of accuracy serializing so fuzz this a bit
suite.Equal(testAccount.URL, apimodelAccount.URL)
- suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/original/01F8MH58A357CV5K7R7TJMSH6S.jpeg", apimodelAccount.Avatar)
- suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/small/01F8MH58A357CV5K7R7TJMSH6S.jpeg", apimodelAccount.AvatarStatic)
- suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.Header)
- suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg", apimodelAccount.HeaderStatic)
+ suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/original/01F8MH58A357CV5K7R7TJMSH6S.jpg", apimodelAccount.Avatar)
+ suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/small/01F8MH58A357CV5K7R7TJMSH6S.jpg", apimodelAccount.AvatarStatic)
+ suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpg", apimodelAccount.Header)
+ suite.Equal("http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpg", apimodelAccount.HeaderStatic)
suite.Equal(2, apimodelAccount.FollowersCount)
suite.Equal(2, apimodelAccount.FollowingCount)
suite.Equal(5, apimodelAccount.StatusesCount)
diff --git a/internal/api/fileserver/servefile.go b/internal/api/fileserver/servefile.go
index 951d16527..2b47db6f2 100644
--- a/internal/api/fileserver/servefile.go
+++ b/internal/api/fileserver/servefile.go
@@ -117,14 +117,19 @@ func (m *Module) ServeFile(c *gin.Context) {
return
}
- // try to slurp the first few bytes to make sure we have something
- b := bytes.NewBuffer(make([]byte, 0, 64))
- if _, err := io.CopyN(b, content.Content, 64); err != nil {
+ // create a "slurp" buffer ;)
+ b := make([]byte, 64)
+
+ // Try read the first 64 bytes into memory, to try return a more useful "not found" error.
+ if _, err := io.ReadFull(content.Content, b); err != nil &&
+ (err != io.ErrUnexpectedEOF && err != io.EOF) {
err = fmt.Errorf("ServeFile: error reading from content: %w", err)
apiutil.ErrorHandler(c, gtserror.NewErrorNotFound(err, err.Error()), m.processor.InstanceGet)
return
}
// we're good, return the slurped bytes + the rest of the content
- c.DataFromReader(http.StatusOK, content.ContentLength, format, io.MultiReader(b, content.Content), nil)
+ c.DataFromReader(http.StatusOK, content.ContentLength, format, io.MultiReader(
+ bytes.NewReader(b), content.Content,
+ ), nil)
}
diff --git a/internal/api/fileserver/servefile_test.go b/internal/api/fileserver/servefile_test.go
index f16dd9850..74d02dccb 100644
--- a/internal/api/fileserver/servefile_test.go
+++ b/internal/api/fileserver/servefile_test.go
@@ -99,7 +99,7 @@ func (suite *ServeFileTestSuite) TestServeOriginalLocalFileOK() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeOriginal,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusOK, code)
@@ -119,7 +119,7 @@ func (suite *ServeFileTestSuite) TestServeSmallLocalFileOK() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeSmall,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusOK, code)
@@ -139,7 +139,7 @@ func (suite *ServeFileTestSuite) TestServeOriginalRemoteFileOK() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeOriginal,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusOK, code)
@@ -159,7 +159,7 @@ func (suite *ServeFileTestSuite) TestServeSmallRemoteFileOK() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeSmall,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusOK, code)
@@ -182,7 +182,7 @@ func (suite *ServeFileTestSuite) TestServeOriginalRemoteFileRecache() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeOriginal,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusOK, code)
@@ -205,7 +205,7 @@ func (suite *ServeFileTestSuite) TestServeSmallRemoteFileRecache() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeSmall,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusOK, code)
@@ -228,7 +228,7 @@ func (suite *ServeFileTestSuite) TestServeOriginalRemoteFileRecacheNotFound() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeOriginal,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusNotFound, code)
@@ -249,7 +249,7 @@ func (suite *ServeFileTestSuite) TestServeSmallRemoteFileRecacheNotFound() {
targetAttachment.AccountID,
media.TypeAttachment,
media.SizeSmall,
- targetAttachment.ID+".jpeg",
+ targetAttachment.ID+".jpg",
)
suite.Equal(http.StatusNotFound, code)
@@ -261,7 +261,7 @@ func (suite *ServeFileTestSuite) TestServeFileNotFound() {
"01GMMY4G9B0QEG0PQK5Q5JGJWZ",
media.TypeAttachment,
media.SizeOriginal,
- "01GMMY68Y7E5DJ3CA3Y9SS8524.jpeg",
+ "01GMMY68Y7E5DJ3CA3Y9SS8524.jpg",
)
suite.Equal(http.StatusNotFound, code)
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-13 15:10:33 +0000