From 268f252e0d517f2693b30d03fb8a68a0764a43bc Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:03:23 +0200
Subject: [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
---
 testrig/config.go        |   2 ++
 testrig/media/peglin.gif | Bin 0 -> 37796 bytes
 testrig/testmodels.go    |   9 +++++++++
 3 files changed, 11 insertions(+)
 create mode 100644 testrig/media/peglin.gif

(limited to 'testrig')

diff --git a/testrig/config.go b/testrig/config.go
index 9de23dfc3..a4df9c004 100644
--- a/testrig/config.go
+++ b/testrig/config.go
@@ -64,6 +64,8 @@ var testDefaults = config.Configuration{
 	MediaDescriptionMinChars: 0,
 	MediaDescriptionMaxChars: 500,
 	MediaRemoteCacheDays:     30,
+	MediaEmojiLocalMaxSize:   51200,  // 50kb
+	MediaEmojiRemoteMaxSize:  102400, // 100kb
 
 	// the testrig only uses in-memory storage, so we can
 	// safely set this value to 'test' to avoid running storage
diff --git a/testrig/media/peglin.gif b/testrig/media/peglin.gif
new file mode 100644
index 000000000..f14ea3ab5
Binary files /dev/null and b/testrig/media/peglin.gif differ
diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index 916b38612..b38494642 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -1954,6 +1954,11 @@ func NewTestFediAttachments(relativePath string) map[string]RemoteAttachmentFile
 		panic(err)
 	}
 
+	peglinBytes, err := os.ReadFile(fmt.Sprintf("%s/peglin.gif", relativePath))
+	if err != nil {
+		panic(err)
+	}
+
 	return map[string]RemoteAttachmentFile{
 		"https://s3-us-west-2.amazonaws.com/plushcity/media_attachments/files/106/867/380/219/163/828/original/88e8758c5f011439.jpg": {
 			Data:        beeBytes,
@@ -1967,6 +1972,10 @@ func NewTestFediAttachments(relativePath string) map[string]RemoteAttachmentFile
 			Data:        massiveFuckingTurnipBytes,
 			ContentType: "image/jpeg",
 		},
+		"http://example.org/media/emojis/1781772.gif": {
+			Data:        peglinBytes,
+			ContentType: "image/gif",
+		},
 	}
 }
 
-- 
cgit v1.2.3