Fix lint

contrib/render-plugins/example-wasm/wasm/main.go

@@ -1,3 +1,6 @@
+//go:build js && wasm
+// +build js,wasm
+
 package main
 
 import (

modules/renderplugin/manifest.go

@@ -4,7 +4,7 @@
 package renderplugin
 
 import (
-	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -12,6 +12,7 @@ import (
 	"sort"
 	"strings"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/util"
 )
 
@@ -33,7 +34,7 @@ type Manifest struct {
 // Normalize validates mandatory fields and normalizes values.
 func (m *Manifest) Normalize() error {
 	if m.SchemaVersion == 0 {
-		return fmt.Errorf("manifest schemaVersion is required")
+		return errors.New("manifest schemaVersion is required")
 	}
 	if m.SchemaVersion != SupportedManifestVersion {
 		return fmt.Errorf("manifest schemaVersion %d is not supported", m.SchemaVersion)
@@ -44,11 +45,11 @@ func (m *Manifest) Normalize() error {
 	}
 	m.Name = strings.TrimSpace(m.Name)
 	if m.Name == "" {
-		return fmt.Errorf("manifest name is required")
+		return errors.New("manifest name is required")
 	}
 	m.Version = strings.TrimSpace(m.Version)
 	if m.Version == "" {
-		return fmt.Errorf("manifest version is required")
+		return errors.New("manifest version is required")
 	}
 	if m.Entry == "" {
 		m.Entry = "render.js"
@@ -66,7 +67,7 @@ func (m *Manifest) Normalize() error {
 		cleanPatterns = append(cleanPatterns, pattern)
 	}
 	if len(cleanPatterns) == 0 {
-		return fmt.Errorf("manifest must declare at least one file pattern")
+		return errors.New("manifest must declare at least one file pattern")
 	}
 	sort.Strings(cleanPatterns)
 	m.FilePatterns = cleanPatterns

routers/web/renderplugin/assets.go

@@ -4,12 +4,12 @@
 package renderplugin
 
 import (
-	"encoding/json"
 	"net/http"
 	"os"
 	"path"
 	"strings"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/renderplugin"
 	"code.gitea.io/gitea/modules/setting"

services/renderplugin/service.go

@@ -216,7 +216,7 @@ func findManifest(root string) (string, error) {
 		}
 		if strings.EqualFold(d.Name(), "manifest.json") {
 			if manifestPath != "" {
-				return fmt.Errorf("multiple manifest.json files found")
+				return errors.New("multiple manifest.json files found")
 			}
 			manifestPath = path
 		}
@@ -257,7 +257,7 @@ func uploadPluginDir(identifier, src string) error {
 			return nil
 		}
 		if d.Type()&os.ModeSymlink != 0 {
-			return fmt.Errorf("symlinks are not supported inside plugin archives")
+			return errors.New("symlinks are not supported inside plugin archives")
 		}
 		rel, err := filepath.Rel(src, path)
 		if err != nil {

templates/admin/navbar.tmpl

@@ -38,28 +38,18 @@
 						{{ctx.Locale.Tr "packages.title"}}
 					</a>
 				{{end}}
-				<a class="{{if .PageIsAdminRenderPlugins}}active {{end}}item" href="{{AppSubUrl}}/-/admin/render-plugins">
-					{{ctx.Locale.Tr "admin.render_plugins"}}
-				</a>
 				<a class="{{if .PageIsAdminRepositories}}active {{end}}item" href="{{AppSubUrl}}/-/admin/repos">
 					{{ctx.Locale.Tr "admin.repositories"}}
 				</a>
 			</div>
 		</details>
 		<!-- Webhooks and OAuth can be both disabled here, so add this if statement to display different ui -->
-		{{if and (not DisableWebhooks) .EnableOAuth2}}
+		<details class="item toggleable-item" {{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks .PageIsAdminApplications .PageIsAdminRenderPlugins}}open{{end}}>
-			<details class="item toggleable-item" {{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks .PageIsAdminApplications}}open{{end}}>
 			<summary>{{ctx.Locale.Tr "admin.integrations"}}</summary>
 			<div class="menu">
-					<a class="{{if .PageIsAdminApplications}}active {{end}}item" href="{{AppSubUrl}}/-/admin/applications">
+				<a class="{{if .PageIsAdminRenderPlugins}}active {{end}}item" href="{{AppSubUrl}}/-/admin/render-plugins">
-						{{ctx.Locale.Tr "settings.applications"}}
+					{{ctx.Locale.Tr "admin.render_plugins"}}
 				</a>
-					<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active {{end}}item" href="{{AppSubUrl}}/-/admin/hooks">
-						{{ctx.Locale.Tr "admin.hooks"}}
-					</a>
-				</div>
-			</details>
-		{{else}}
 				{{if not DisableWebhooks}}
 					<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active {{end}}item" href="{{AppSubUrl}}/-/admin/hooks">
 						{{ctx.Locale.Tr "admin.hooks"}}
@@ -70,7 +60,8 @@
 						{{ctx.Locale.Tr "settings.applications"}}
 					</a>
 				{{end}}
-		{{end}}
+			</div>
+		</details>
 		{{if .EnableActions}}
 		<details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsVariables}}open{{end}}>
 			<summary>{{ctx.Locale.Tr "actions.actions"}}</summary>