Merge pull request #361 from superseriousbusiness/media_refactorv0.2.0

Refactor media handler to allow async media resolution

1 files changed, 9 insertions, 9 deletions

diff --git a/internal/ap/extract.go b/internal/ap/extract.go
index ed61faf1e..49dac7186 100644
--- a/internal/ap/extract.go
+++ b/internal/ap/extract.go
@@ -395,20 +395,20 @@ func ExtractAttachment(i Attachmentable) (*gtsmodel.MediaAttachment, error) {
 		attachment.Description = name
 	}
 
+	attachment.Blurhash = ExtractBlurhash(i)
+
 	attachment.Processing = gtsmodel.ProcessingStatusReceived
 
 	return attachment, nil
 }
 
-// func extractBlurhash(i withBlurhash) (string, error) {
-// 	if i.GetTootBlurhashProperty() == nil {
-// 		return "", errors.New("blurhash property was nil")
-// 	}
-// 	if i.GetTootBlurhashProperty().Get() == "" {
-// 		return "", errors.New("empty blurhash string")
-// 	}
-// 	return i.GetTootBlurhashProperty().Get(), nil
-// }
+// ExtractBlurhash extracts the blurhash value (if present) from a WithBlurhash interface.
+func ExtractBlurhash(i WithBlurhash) string {
+	if i.GetTootBlurhash() == nil {
+		return ""
+	}
+	return i.GetTootBlurhash().Get()
+}
 
 // ExtractHashtags returns a slice of tags on the interface.
 func ExtractHashtags(i WithTag) ([]*gtsmodel.Tag, error) {