From 668df16fd2c43afe50e2845d274d18cbb98b07fe Mon Sep 17 00:00:00 2001 From: video-prize-ranch Date: Fri, 28 Jan 2022 17:55:44 -0500 Subject: [PATCH] Use CloudFront for media to avoid payload limits --- api/album.go | 4 ++++ api/user.go | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/api/album.go b/api/album.go index 9d808a9..dadeef1 100644 --- a/api/album.go +++ b/api/album.go @@ -59,6 +59,10 @@ func ParseAlbum(data gjson.Result) (types.Album, error) { url := value.Get("url").String() url = strings.ReplaceAll(url, "https://i.imgur.com", "") + if strings.HasSuffix(url, "mp4") || viper.GetBool("CF_ALL_MEDIA") { + url = viper.GetString("CF_MEDIA_DISTRIBUTION") + url + } + media = append(media, types.Media{ Id: value.Get("id").String(), Name: value.Get("name").String(), diff --git a/api/user.go b/api/user.go index 278d4f7..0dbe81c 100644 --- a/api/user.go +++ b/api/user.go @@ -33,6 +33,10 @@ func FetchUser(username string) (types.User, error) { user.Cover = strings.ReplaceAll(user.Cover, "https://imgur.com", "") user.Avatar = strings.ReplaceAll(user.Avatar, "https://i.imgur.com", "") + if viper.GetBool("CF_ALL_MEDIA") { + user.Avatar = viper.GetString("CF_MEDIA_DISTRIBUTION") + user.Avatar + } + createdTime, _ := time.Parse("2006-01-02T15:04:05Z", user.CreatedAt) user.CreatedAt = createdTime.Format("January 2, 2006") @@ -64,6 +68,11 @@ func FetchSubmissions(username string, sort string, page string) ([]types.Submis cover := value.Get("images.#(id==\"" + value.Get("cover").String() + "\")") + url := strings.ReplaceAll(cover.Get("link").String(), "https://i.imgur.com", "") + if strings.HasSuffix(url, "mp4") || viper.GetBool("CF_ALL_MEDIA") { + url = viper.GetString("CF_MEDIA_DISTRIBUTION") + url + } + submissions = append(submissions, types.Submission{ Id: value.Get("id").String(), Link: strings.ReplaceAll(value.Get("link").String(), "https://imgur.com", ""), @@ -72,7 +81,7 @@ func FetchSubmissions(username string, sort string, page string) ([]types.Submis Id: cover.Get("id").String(), Description: cover.Get("description").String(), Type: strings.Split(cover.Get("type").String(), "/")[0], - Url: strings.ReplaceAll(cover.Get("link").String(), "https://i.imgur.com", ""), + Url: url, }, Points: cover.Get("points").Int(), Upvotes: cover.Get("ups").Int(),