diff --git a/api/routes/downloads.go b/api/routes/downloads.go index b65e3cde..cbb50844 100644 --- a/api/routes/downloads.go +++ b/api/routes/downloads.go @@ -36,8 +36,15 @@ func RegisterDownloadRoutes(db *gorm.DB, router *mux.Router) { return } + var mediaWhereQuery string + if db.Dialector.Name() == "postgres" { + mediaWhereQuery = "\"Media\".album_id = ?" + } else { + mediaWhereQuery = "Media.album_id = ?" + } + var mediaURLs []*models.MediaURL - if err := db.Joins("Media").Where("media.album_id = ?", album.ID).Where("media_urls.purpose IN (?)", mediaPurposeList).Find(&mediaURLs).Error; err != nil { + if err := db.Joins("Media").Where(mediaWhereQuery, album.ID).Where("media_urls.purpose IN (?)", mediaPurposeList).Find(&mediaURLs).Error; err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte("internal server error")) return diff --git a/ui/src/service-worker.ts b/ui/src/service-worker.ts index 8403488d..34bae7db 100644 --- a/ui/src/service-worker.ts +++ b/ui/src/service-worker.ts @@ -22,7 +22,9 @@ clientsClaim() // Their URLs are injected into the manifest variable below. // This variable must be present somewhere in your service worker file, // even if you decide not to use precaching. See https://cra.link/PWA -precacheAndRoute(self.__WB_MANIFEST) +precacheAndRoute(self.__WB_MANIFEST, { + ignoreURLParametersMatching: [/^\/api\/.*/], +}) // Set up App Shell-style routing, so that all navigation requests // are fulfilled with your index.html shell. Learn more at