oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-16 18:01:37 +00:00
Code Wiki Activity

refactor(ui): standardize user variable naming and avoid a SQL query when only userID is used

Browse source 
- Use `user` everywhere, instead of sometimes `loggedUser`
- Delay the instantiation of some variables: no need to perform SQL queries for
  nothing.
- Remove a SQL query getting the whole user struct when only user.ID is used.
This commit is contained in:
Julien Voisin 2025-08-12 04:48:36 +02:00 • committed by GitHub
parent 50c5996280
commit 5d9d0b2652
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 50 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/ui/opml_upload.go
View file

@ -21,8 +21,7 @@ import (
)
func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) {
loggedUserID := request.UserID(r)
user, err := h.store.UserByID(loggedUserID)
user, err := h.store.UserByID(request.UserID(r))
if err != nil {
html.ServerError(w, r, err)
return
@ -31,7 +30,7 @@ func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) {
file, fileHeader, err := r.FormFile("file")
if err != nil {
slog.Error("OPML file upload error",
slog.Int64("user_id", loggedUserID),
slog.Int64("user_id", user.ID),
slog.Any("error", err),
)
@ -41,7 +40,7 @@ func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) {
defer file.Close()
slog.Info("OPML file uploaded",
slog.Int64("user_id", loggedUserID),
slog.Int64("user_id", user.ID),
slog.String("file_name", fileHeader.Filename),
slog.Int64("file_size", fileHeader.Size),
)
@ -69,8 +68,7 @@ func (h *handler) uploadOPML(w http.ResponseWriter, r *http.Request) {
}
func (h *handler) fetchOPML(w http.ResponseWriter, r *http.Request) {
loggedUserID := request.UserID(r)
user, err := h.store.UserByID(loggedUserID)
user, err := h.store.UserByID(request.UserID(r))
if err != nil {
html.ServerError(w, r, err)
return
@ -83,7 +81,7 @@ func (h *handler) fetchOPML(w http.ResponseWriter, r *http.Request) {
}
slog.Info("Fetching OPML file remotely",
slog.Int64("user_id", loggedUserID),
slog.Int64("user_id", user.ID),
slog.String("opml_file_url", opmlFileURL),
)