Merge branch 'master' into impatient

.gitpod.yml

@@ -2,7 +2,7 @@ image:
   file: .gitpod.dockerfile
 tasks:
   - name: Continuous Build
-    command: cd /workspace/xbvr && yarn dev
+    command: yarn global add concurrently && go install github.com/cosmtrek/air@latest && cd /workspace/xbvr && go generate && go get && yarn && yarn dev
 ports:
   - port: 9999
     onOpen: open-preview

pkg/api/heresphere.go

@@ -221,7 +221,7 @@ func (i HeresphereResource) getHeresphereFile(req *restful.Request, resp *restfu
 				Height:     height,
 				Width:      width,
 				Size:       file.Size,
-				URL:        fmt.Sprintf("%v://%v/api/dms/file/%v/%v/%v", getProto(req), req.Request.Host, file.ID, file.Filename, dnt),
+				URL:        fmt.Sprintf("%v://%v/api/dms/file/%v/%v", getProto(req), req.Request.Host, file.ID, dnt),
 			},
 		},
 	})
@@ -335,7 +335,7 @@ func (i HeresphereResource) getHeresphereScene(req *restful.Request, resp *restf
 					Height:     height,
 					Width:      width,
 					Size:       file.Size,
-					URL:        fmt.Sprintf("%v://%v/api/dms/file/%v/%v/%v", getProto(req), req.Request.Host, file.ID, scene.GetFunscriptTitle(), dnt),
+					URL:        fmt.Sprintf("%v://%v/api/dms/file/%v/%v", getProto(req), req.Request.Host, file.ID, dnt),
 				},
 			},
 		}

pkg/scrape/javdatabase.go

@@ -25,7 +25,7 @@ func ScrapeJavDB(out *[]models.ScrapedScene, queryString string) {
 
 		// Cast
 		html.ForEach("h2.subhead", func(id int, h2 *colly.HTMLElement) {
-			if h2.Text == "Featured Idols" {
+			if strings.HasSuffix(h2.Text, "Actress/Idols") {
 				dom := h2.DOM
 				parent := dom.Parent()
 				if parent != nil {