Fix RSS Link (#1495)

Fix #1486

controllers/user/router.go

@@ -30,6 +30,7 @@ func init() {
 		userRoutes.GET("/:id/:username/edit", UserDetailsHandler)
 		userRoutes.POST("/:id/:username/edit", UserProfileFormHandler)
 		userRoutes.GET("/:id/:username/apireset", UserAPIKeyResetHandler)
-		userRoutes.GET("/:id/:username/feed/*page", feedController.RSSHandler)
+		userRoutes.GET("/:id/:username/feed", feedController.RSSHandler)
+		userRoutes.GET("/:id/:username/feed/:page", feedController.RSSHandler)
 	}
 }

templates/layouts/partials/base.jet.html

@@ -21,9 +21,9 @@
   <meta property="og:description" content="Nyaa Pantsu Homepage"/>
 
   <!-- RSS Feed with Context -->
-  <link rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{block rsstitle()}}Latest torrents{{end}} RSS Feed" href="/feed/?{{ block rss_link() }}{{ getRawQuery(URL) }}{{end}}"  />
-  <link rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{ yield rsstitle()}} Torznab RSS Feed" href="/feed/torznab?{{ yield rss_link() }}&t=search"  />
-  <link rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{ yield rsstitle()}} EZTV RSS Feed" href="/feed/eztv??{{ yield rss_link() }}"  />
+  <link rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{block rsstitle()}}Latest torrents{{end}} RSS Feed" href="{{ block rss_link() }}/feed/?{{ getRawQuery(URL)|raw }}{{end}}"  />
+  <link rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{ yield rsstitle()}} Torznab RSS Feed" href="/feed/torznab?{{ getRawQuery(URL)|raw }}&t=search"  />
+  <link rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{ yield rsstitle()}} EZTV RSS Feed" href="/feed/eztv?{{ getRawQuery(URL)|raw }}"  />
 
   <!-- do NOT move -->
   <link rel="stylesheet" href="/css/simplemde.min.css?v={{ Config.Version }}{{ Config.Build }}"/>

templates/layouts/partials/menu/site.jet.html

@@ -1,5 +1,4 @@
 {{ import "layouts/partials/helpers/search" }}
-{{ block rss_link()}}{{end}}
 <div class="container">
   <div class="h-left">
     <div class="h-logo">
@@ -13,7 +12,7 @@
         <div class="icon-upload visible-md"></div>
         <span class="hide-md">{{ T("upload") }}</span>
       </a>
-      <a href="/feed{{ yield rss_link() }}" class="nav-btn">
+      <a href="{{ yield rss_link() }}" class="nav-btn">
         <div class="icon-rss-squared visible-md"></div>
         <span class="hide-md">RSS</span>
       </a>

templates/template_test.go

@@ -223,6 +223,9 @@ func walkDirTest(dir string, t *testing.T) {
 	}
 	for _, f := range files {
 		variables := mockupCommonvariables(t)
+		if f.Name() == "menu" {
+			continue
+		}
 		if f.IsDir() {
 			walkDirTest(dir+f.Name()+"/", t)
 			continue