diff --git a/pkg/modules/background/unsplash/proxy.go b/pkg/modules/background/unsplash/proxy.go index 9c60c38b22..8561d9deac 100644 --- a/pkg/modules/background/unsplash/proxy.go +++ b/pkg/modules/background/unsplash/proxy.go @@ -72,5 +72,5 @@ func ProxyUnsplashThumb(c echo.Context) error { return handler.HandleHTTPError(err, c) } pingbackByPhotoID(photo.ID) - return unsplashImage("https://images.unsplash.com/photo-"+getImageID(photo.Urls.Raw)+"?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjcyODAwfQ", c) + return unsplashImage("https://images.unsplash.com/"+getImageID(photo.Urls.Raw)+"?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjcyODAwfQ", c) } diff --git a/pkg/modules/background/unsplash/unsplash.go b/pkg/modules/background/unsplash/unsplash.go index 221c849c35..6310a1e950 100644 --- a/pkg/modules/background/unsplash/unsplash.go +++ b/pkg/modules/background/unsplash/unsplash.go @@ -114,12 +114,7 @@ func getImageID(fullURL string) string { // Unsplash image urls have the form // https://images.unsplash.com/photo-1590622878565-c662a7fd1394?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjcyODAwfQ // We only need the "photo-*" part of it. - parts := strings.Split(strings.Split(fullURL, "?")[0], "photo-") - if len(parts) < 2 { - log.Errorf("Unsplash thumb url does not contain enough parts [parts: %v]", parts) - return "" - } - return parts[1] + return strings.Replace(strings.Split(fullURL, "?")[0], "https://images.unsplash.com/", "", 1) } // Gets an unsplash photo either from cache or directly from the unsplash api