diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-09-12 13:03:23 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-12 13:03:23 +0200 |
| commit | 268f252e0d517f2693b30d03fb8a68a0764a43bc (patch) | |
| tree | 95920c06bcdfc0ca11486aa08a547d85ca35f8ce /internal/media/processingemoji.go | |
| parent | [docs] unbreak standard css (#818) (diff) | |
| download | gotosocial-268f252e0d517f2693b30d03fb8a68a0764a43bc.tar.xz | |
[feature] Fetch + display custom emoji in statuses from remote instances (#807)
* start implementing remote emoji fetcher
* update status where pk
* aaa
* tidy up a little
* check size limits for emojis
* thank you linter, i love you <3
* update swagger docs
* add emoji dereference test
* make emoji max sizes configurable
* normalize db.ErrAlreadyExists
Diffstat (limited to 'internal/media/processingemoji.go')
| -rw-r--r-- | internal/media/processingemoji.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 3b3023f2a..121f54ddc 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -28,6 +28,7 @@ import ( "sync/atomic" "time" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/log" @@ -170,6 +171,11 @@ func (p *ProcessingEmoji) store(ctx context.Context) error { return fmt.Errorf("store: error executing data function: %s", err) } + maxSize := config.GetMediaEmojiRemoteMaxSize() + if fileSize > maxSize { + return fmt.Errorf("store: emoji size (%db) is larger than allowed emojiRemoteMaxSize (%db)", fileSize, maxSize) + } + // defer closing the reader when we're done with it defer func() { if rc, ok := reader.(io.ReadCloser); ok { |