From 72ba5666a6ffd06ccdfd2db8dacc47de7f777a4c Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:26:33 +0000
Subject: [chore] media pipeline improvements (#3110)

* don't set emoji / media image paths on failed download, migrate FileType from string to integer

* fix incorrect uses of util.PtrOr, fix returned frontend media

* fix migration not setting arguments correctly in where clause

* fix not providing default with not null column

* whoops

* ensure a default gets set for media attachment file type

* remove the exclusive flag from writing files in disk storage

* rename PtrOr -> PtrOrZero, and rename PtrValueOr -> PtrOrValue to match

* slight wording changes

* use singular / plural word forms (no parentheses), is better for screen readers

* update testmodels with unknown media type to have unset file details, update attachment focus handling converting to frontend, update tests

* store first instance in ffmpeg wasm pool, fill remaining with closed instances
---
 testrig/testmodels.go | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'testrig/testmodels.go')

diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index efd4785a5..c0cf47b81 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -1188,20 +1188,11 @@ func NewTestAttachments() map[string]*gtsmodel.MediaAttachment {
 			Description: "SVG line art of a sloth, public domain",
 			Blurhash:    "L26*j+~qE1RP?wxut7ofRlM{R*of",
 			Processing:  2,
-			File: gtsmodel.File{
-				Path:        "01FHMQX3GAABWSM0S2VZEC2SWC/attachment/original/01HE7ZFX9GKA5ZZVD4FACABSS9.svg",
-				ContentType: "image/svg",
-				FileSize:    147819,
-			},
-			Thumbnail: gtsmodel.Thumbnail{
-				Path:        "01FHMQX3GAABWSM0S2VZEC2SWC/attachment/small/01HE7ZFX9GKA5ZZVD4FACABSS9.jpg",
-				ContentType: "image/jpeg",
-				FileSize:    0,
-				URL:         "http://localhost:8080/fileserver/01FHMQX3GAABWSM0S2VZEC2SWC/attachment/small/01HE7ZFX9GKA5ZZVD4FACABSS9.jpg",
-			},
-			Avatar: util.Ptr(false),
-			Header: util.Ptr(false),
-			Cached: util.Ptr(false),
+			File:        gtsmodel.File{},
+			Thumbnail:   gtsmodel.Thumbnail{RemoteURL: ""},
+			Avatar:      util.Ptr(false),
+			Header:      util.Ptr(false),
+			Cached:      util.Ptr(false),
 		},
 		"remote_account_2_status_1_attachment_3": {
 			ID:          "01HE88YG74PVAB81PX2XA9F3FG",
@@ -1216,20 +1207,11 @@ func NewTestAttachments() map[string]*gtsmodel.MediaAttachment {
 			Description: "Jolly salsa song, public domain.",
 			Blurhash:    "",
 			Processing:  2,
-			File: gtsmodel.File{
-				Path:        "01FHMQX3GAABWSM0S2VZEC2SWC/attachment/original/01HE88YG74PVAB81PX2XA9F3FG.mp3",
-				ContentType: "audio/mpeg",
-				FileSize:    147819,
-			},
-			Thumbnail: gtsmodel.Thumbnail{
-				Path:        "01FHMQX3GAABWSM0S2VZEC2SWC/attachment/small/01HE88YG74PVAB81PX2XA9F3FG.jpg",
-				ContentType: "image/jpeg",
-				FileSize:    0,
-				URL:         "http://localhost:8080/fileserver/01FHMQX3GAABWSM0S2VZEC2SWC/attachment/small/01HE88YG74PVAB81PX2XA9F3FG.jpg",
-			},
-			Avatar: util.Ptr(false),
-			Header: util.Ptr(false),
-			Cached: util.Ptr(false),
+			File:        gtsmodel.File{},
+			Thumbnail:   gtsmodel.Thumbnail{RemoteURL: ""},
+			Avatar:      util.Ptr(false),
+			Header:      util.Ptr(false),
+			Cached:      util.Ptr(false),
 		},
 	}
 }
-- 
cgit v1.2.3