Merge branch 'master' into old-engine

server/web/api/rutor.go

@@ -1,15 +1,21 @@
 package api
 
 import (
+	"net/http"
 	"net/url"
 
 	"github.com/gin-gonic/gin"
 
 	"server/rutor"
 	"server/rutor/models"
+	sets "server/settings"
 )
 
 func rutorSearch(c *gin.Context) {
+	if !sets.BTsets.EnableRutorSearch {
+		c.JSON(http.StatusBadRequest, []string{})
+		return
+	}
 	query := c.Query("query")
 	query, _ = url.QueryUnescape(query)
 	list := rutor.Search(query)

server/web/msx/msx.go

@@ -12,13 +12,13 @@ import (
 )
 
 var (
-	//go:embed russian.min.gz
+	//go:embed russian.json.gz
 	rus []byte
-	//go:embed torrents.min.gz
+	//go:embed torrents.js.gz
 	trs []byte
-	//go:embed torrent.min.gz
+	//go:embed torrent.js.gz
 	trn []byte
-	//go:embed ts.min.gz
+	//go:embed ts.js.gz
 	its []byte
 
 	idb = new(sync.Mutex)

server/web/pages/template/html.go

@@ -118,20 +118,20 @@ var Mstile150x150png []byte
 //go:embed pages/site.webmanifest
 var Sitewebmanifest []byte
 
-//go:embed pages/static/js/2.37254ee1.chunk.js
+//go:embed pages/static/js/2.9dd71e52.chunk.js
-var Staticjs237254ee1chunkjs []byte
+var Staticjs29dd71e52chunkjs []byte
 
-//go:embed pages/static/js/2.37254ee1.chunk.js.LICENSE.txt
+//go:embed pages/static/js/2.9dd71e52.chunk.js.LICENSE.txt
-var Staticjs237254ee1chunkjsLICENSEtxt []byte
+var Staticjs29dd71e52chunkjsLICENSEtxt []byte
 
-//go:embed pages/static/js/2.37254ee1.chunk.js.map
+//go:embed pages/static/js/2.9dd71e52.chunk.js.map
-var Staticjs237254ee1chunkjsmap []byte
+var Staticjs29dd71e52chunkjsmap []byte
 
-//go:embed pages/static/js/main.5200a107.chunk.js
+//go:embed pages/static/js/main.0dd1792c.chunk.js
-var Staticjsmain5200a107chunkjs []byte
+var Staticjsmain0dd1792cchunkjs []byte
 
-//go:embed pages/static/js/main.5200a107.chunk.js.map
+//go:embed pages/static/js/main.0dd1792c.chunk.js.map
-var Staticjsmain5200a107chunkjsmap []byte
+var Staticjsmain0dd1792cchunkjsmap []byte
 
 //go:embed pages/static/js/runtime-main.64d07802.js
 var Staticjsruntimemain64d07802js []byte

server/web/pages/template/pages/asset-manifest.json

@@ -1,17 +1,17 @@
 {
   "files": {
-    "main.js": "/static/js/main.5200a107.chunk.js",
+    "main.js": "/static/js/main.0dd1792c.chunk.js",
-    "main.js.map": "/static/js/main.5200a107.chunk.js.map",
+    "main.js.map": "/static/js/main.0dd1792c.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.64d07802.js",
     "runtime-main.js.map": "/static/js/runtime-main.64d07802.js.map",
-    "static/js/2.37254ee1.chunk.js": "/static/js/2.37254ee1.chunk.js",
+    "static/js/2.9dd71e52.chunk.js": "/static/js/2.9dd71e52.chunk.js",
-    "static/js/2.37254ee1.chunk.js.map": "/static/js/2.37254ee1.chunk.js.map",
+    "static/js/2.9dd71e52.chunk.js.map": "/static/js/2.9dd71e52.chunk.js.map",
     "index.html": "/index.html",
-    "static/js/2.37254ee1.chunk.js.LICENSE.txt": "/static/js/2.37254ee1.chunk.js.LICENSE.txt"
+    "static/js/2.9dd71e52.chunk.js.LICENSE.txt": "/static/js/2.9dd71e52.chunk.js.LICENSE.txt"
   },
   "entrypoints": [
     "static/js/runtime-main.64d07802.js",
-    "static/js/2.37254ee1.chunk.js",
+    "static/js/2.9dd71e52.chunk.js",
-    "static/js/main.5200a107.chunk.js"
+    "static/js/main.0dd1792c.chunk.js"
   ]
 }

server/web/pages/template/route.go

@@ -161,24 +161,24 @@ func RouteWebPages(route *gin.RouterGroup) {
 		c.Data(200, "application/manifest+json", Sitewebmanifest)
 	})
 
-	route.GET("/static/js/2.37254ee1.chunk.js", func(c *gin.Context) {
+	route.GET("/static/js/2.9dd71e52.chunk.js", func(c *gin.Context) {
-		c.Data(200, "application/javascript; charset=utf-8", Staticjs237254ee1chunkjs)
+		c.Data(200, "application/javascript; charset=utf-8", Staticjs29dd71e52chunkjs)
 	})
 
-	route.GET("/static/js/2.37254ee1.chunk.js.LICENSE.txt", func(c *gin.Context) {
+	route.GET("/static/js/2.9dd71e52.chunk.js.LICENSE.txt", func(c *gin.Context) {
-		c.Data(200, "text/plain; charset=utf-8", Staticjs237254ee1chunkjsLICENSEtxt)
+		c.Data(200, "text/plain; charset=utf-8", Staticjs29dd71e52chunkjsLICENSEtxt)
 	})
 
-	route.GET("/static/js/2.37254ee1.chunk.js.map", func(c *gin.Context) {
+	route.GET("/static/js/2.9dd71e52.chunk.js.map", func(c *gin.Context) {
-		c.Data(200, "application/json", Staticjs237254ee1chunkjsmap)
+		c.Data(200, "application/json", Staticjs29dd71e52chunkjsmap)
 	})
 
-	route.GET("/static/js/main.5200a107.chunk.js", func(c *gin.Context) {
+	route.GET("/static/js/main.0dd1792c.chunk.js", func(c *gin.Context) {
-		c.Data(200, "application/javascript; charset=utf-8", Staticjsmain5200a107chunkjs)
+		c.Data(200, "application/javascript; charset=utf-8", Staticjsmain0dd1792cchunkjs)
 	})
 
-	route.GET("/static/js/main.5200a107.chunk.js.map", func(c *gin.Context) {
+	route.GET("/static/js/main.0dd1792c.chunk.js.map", func(c *gin.Context) {
-		c.Data(200, "application/json", Staticjsmain5200a107chunkjsmap)
+		c.Data(200, "application/json", Staticjsmain0dd1792cchunkjsmap)
 	})
 
 	route.GET("/static/js/runtime-main.64d07802.js", func(c *gin.Context) {