From f6f63b528209e0f17854f160609931d555e03af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <f@miniflux.net>
Date: Fri, 15 Mar 2024 19:28:38 -0700
Subject: [PATCH] Avoid warnings in ui package

Remove unused variables and improve JSON decoding in
saveEnclosureProgression()
---
 internal/ui/entry_enclosure_save_position.go | 15 +++------------
 internal/ui/webauthn.go                      | 10 +++++-----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/internal/ui/entry_enclosure_save_position.go b/internal/ui/entry_enclosure_save_position.go
index c125ac15..f0663e62 100644
--- a/internal/ui/entry_enclosure_save_position.go
+++ b/internal/ui/entry_enclosure_save_position.go
@@ -4,8 +4,7 @@
 package ui // import "miniflux.app/v2/internal/ui"
 
 import (
-	json2 "encoding/json"
-	"io"
+	json_parser "encoding/json"
 	"net/http"
 
 	"miniflux.app/v2/internal/http/request"
@@ -30,21 +29,13 @@ func (h *handler) saveEnclosureProgression(w http.ResponseWriter, r *http.Reques
 	}
 
 	var postData enclosurePositionSaveRequest
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		json.ServerError(w, r, err)
-		return
-	}
-
-	json2.Unmarshal(body, &postData)
-	if err != nil {
+	if err := json_parser.NewDecoder(r.Body).Decode(&postData); err != nil {
 		json.ServerError(w, r, err)
 		return
 	}
 	enclosure.MediaProgression = postData.Progression
 
-	err = h.store.UpdateEnclosure(enclosure)
-	if err != nil {
+	if err := h.store.UpdateEnclosure(enclosure); err != nil {
 		json.ServerError(w, r, err)
 		return
 	}
diff --git a/internal/ui/webauthn.go b/internal/ui/webauthn.go
index 8a671ca2..8f1462da 100644
--- a/internal/ui/webauthn.go
+++ b/internal/ui/webauthn.go
@@ -57,7 +57,7 @@ func (u WebAuthnUser) WebAuthnCredentials() []webauthn.Credential {
 	return creds
 }
 
-func newWebAuthn(h *handler) (*webauthn.WebAuthn, error) {
+func newWebAuthn() (*webauthn.WebAuthn, error) {
 	url, err := url.Parse(config.Opts.BaseURL())
 	if err != nil {
 		return nil, err
@@ -70,7 +70,7 @@ func newWebAuthn(h *handler) (*webauthn.WebAuthn, error) {
 }
 
 func (h *handler) beginRegistration(w http.ResponseWriter, r *http.Request) {
-	web, err := newWebAuthn(h)
+	web, err := newWebAuthn()
 	if err != nil {
 		json.ServerError(w, r, err)
 		return
@@ -117,7 +117,7 @@ func (h *handler) beginRegistration(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *handler) finishRegistration(w http.ResponseWriter, r *http.Request) {
-	web, err := newWebAuthn(h)
+	web, err := newWebAuthn()
 	if err != nil {
 		json.ServerError(w, r, err)
 		return
@@ -152,7 +152,7 @@ func (h *handler) finishRegistration(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *handler) beginLogin(w http.ResponseWriter, r *http.Request) {
-	web, err := newWebAuthn(h)
+	web, err := newWebAuthn()
 	if err != nil {
 		json.ServerError(w, r, err)
 		return
@@ -195,7 +195,7 @@ func (h *handler) beginLogin(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *handler) finishLogin(w http.ResponseWriter, r *http.Request) {
-	web, err := newWebAuthn(h)
+	web, err := newWebAuthn()
 	if err != nil {
 		json.ServerError(w, r, err)
 		return