Merge branch 'master' into old-engine

server/web/pages/route.go

@@ -28,8 +28,7 @@ func getTorrents(c *gin.Context) {
 		mi := metainfo.MetaInfo{
 			AnnounceList: ts.Trackers,
 		}
-		mag := mi.Magnet(ts.DisplayName, ts.InfoHash)
-		//	mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName})
+		mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName})
 		http += "<p><a href='" + mag.String() + "'>magnet:?xt=urn:btih:" + mag.InfoHash.HexString() + "</a></p>"
 	}
 	http += "</div>"

server/web/pages/template/html.go

@@ -82,9 +82,6 @@ var Applesplash7501334jpg []byte
 //go:embed pages/apple-splash-828-1792.jpg
 var Applesplash8281792jpg []byte
 
-//go:embed pages/apple-touch-icon.png
-var Appletouchiconpng []byte
-
 //go:embed pages/asset-manifest.json
 var Assetmanifestjson []byte
 
@@ -103,17 +100,20 @@ var Favicon16x16png []byte
 //go:embed pages/favicon-32x32.png
 var Favicon32x32png []byte
 
+//go:embed pages/favicon.ico
+var Faviconico []byte
+
+//go:embed pages/icon.png
+var Iconpng []byte
+
 //go:embed pages/index.html
 var Indexhtml []byte
 
 //go:embed pages/logo.png
 var Logopng []byte
 
-//go:embed pages/manifest-icon-192.maskable.png
-var Manifesticon192maskablepng []byte
-
-//go:embed pages/manifest-icon-512.maskable.png
-var Manifesticon512maskablepng []byte
+//go:embed pages/mstile-150x150.png
+var Mstile150x150png []byte
 
 //go:embed pages/site.webmanifest
 var Sitewebmanifest []byte
@@ -127,11 +127,11 @@ var Staticjs2d3f8d41dchunkjsLICENSEtxt []byte
 //go:embed pages/static/js/2.d3f8d41d.chunk.js.map
 var Staticjs2d3f8d41dchunkjsmap []byte
 
-//go:embed pages/static/js/main.4bd54915.chunk.js
-var Staticjsmain4bd54915chunkjs []byte
+//go:embed pages/static/js/main.e240e160.chunk.js
+var Staticjsmaine240e160chunkjs []byte
 
-//go:embed pages/static/js/main.4bd54915.chunk.js.map
-var Staticjsmain4bd54915chunkjsmap []byte
+//go:embed pages/static/js/main.e240e160.chunk.js.map
+var Staticjsmaine240e160chunkjsmap []byte
 
 //go:embed pages/static/js/runtime-main.64d07802.js
 var Staticjsruntimemain64d07802js []byte

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

@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.js": "/static/js/main.4bd54915.chunk.js",
-    "main.js.map": "/static/js/main.4bd54915.chunk.js.map",
+    "main.js": "/static/js/main.e240e160.chunk.js",
+    "main.js.map": "/static/js/main.e240e160.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.d3f8d41d.chunk.js": "/static/js/2.d3f8d41d.chunk.js",
@@ -12,6 +12,6 @@
   "entrypoints": [
     "static/js/runtime-main.64d07802.js",
     "static/js/2.d3f8d41d.chunk.js",
-    "static/js/main.4bd54915.chunk.js"
+    "static/js/main.e240e160.chunk.js"
   ]
 }

server/web/pages/template/pages/browserconfig.xml

@@ -3,7 +3,8 @@
     <msapplication>
         <tile>
             <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#00a300</TileColor>
+            <TileColor>#00a572</TileColor>
+            <TileImage src="/mstile-150x150.png" />
         </tile>
     </msapplication>
 </browserconfig>

server/web/pages/template/pages/site.webmanifest

@@ -3,28 +3,16 @@
   "short_name": "TorrServer",
   "icons": [
     {
-      "src": "manifest-icon-192.maskable.png",
+      "src": "icon.png",
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "any"
     },
     {
-      "src": "manifest-icon-192.maskable.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "manifest-icon-512.maskable.png",
+      "src": "logo.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "any"
-    },
-    {
-      "src": "manifest-icon-512.maskable.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "maskable"
     }
   ],
   "theme_color": "#ffffff",

server/web/pages/template/route.go

@@ -113,10 +113,6 @@ func RouteWebPages(route *gin.RouterGroup) {
 		c.Data(200, "image/jpeg", Applesplash8281792jpg)
 	})
 
-	route.GET("/apple-touch-icon.png", func(c *gin.Context) {
-		c.Data(200, "image/png", Appletouchiconpng)
-	})
-
 	route.GET("/asset-manifest.json", func(c *gin.Context) {
 		c.Data(200, "application/json", Assetmanifestjson)
 	})
@@ -141,6 +137,14 @@ func RouteWebPages(route *gin.RouterGroup) {
 		c.Data(200, "image/png", Favicon32x32png)
 	})
 
+	route.GET("/favicon.ico", func(c *gin.Context) {
+		c.Data(200, "image/vnd.microsoft.icon", Faviconico)
+	})
+
+	route.GET("/icon.png", func(c *gin.Context) {
+		c.Data(200, "image/png", Iconpng)
+	})
+
 	route.GET("/index.html", func(c *gin.Context) {
 		c.Data(200, "text/html; charset=utf-8", Indexhtml)
 	})
@@ -149,12 +153,8 @@ func RouteWebPages(route *gin.RouterGroup) {
 		c.Data(200, "image/png", Logopng)
 	})
 
-	route.GET("/manifest-icon-192.maskable.png", func(c *gin.Context) {
-		c.Data(200, "image/png", Manifesticon192maskablepng)
-	})
-
-	route.GET("/manifest-icon-512.maskable.png", func(c *gin.Context) {
-		c.Data(200, "image/png", Manifesticon512maskablepng)
+	route.GET("/mstile-150x150.png", func(c *gin.Context) {
+		c.Data(200, "image/png", Mstile150x150png)
 	})
 
 	route.GET("/site.webmanifest", func(c *gin.Context) {
@@ -173,12 +173,12 @@ func RouteWebPages(route *gin.RouterGroup) {
 		c.Data(200, "application/json", Staticjs2d3f8d41dchunkjsmap)
 	})
 
-	route.GET("/static/js/main.4bd54915.chunk.js", func(c *gin.Context) {
-		c.Data(200, "application/javascript; charset=utf-8", Staticjsmain4bd54915chunkjs)
+	route.GET("/static/js/main.e240e160.chunk.js", func(c *gin.Context) {
+		c.Data(200, "application/javascript; charset=utf-8", Staticjsmaine240e160chunkjs)
 	})
 
-	route.GET("/static/js/main.4bd54915.chunk.js.map", func(c *gin.Context) {
-		c.Data(200, "application/json", Staticjsmain4bd54915chunkjsmap)
+	route.GET("/static/js/main.e240e160.chunk.js.map", func(c *gin.Context) {
+		c.Data(200, "application/json", Staticjsmaine240e160chunkjsmap)
 	})
 
 	route.GET("/static/js/runtime-main.64d07802.js", func(c *gin.Context) {