melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: watchlist updated_at and unified auth middleware

Browse Source
This commit is contained in:
mkelvers
2026-05-02 17:53:08 +02:00
committed by Mikkel Elvers
parent 5940d7828a
commit e5c32fd154
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/anime/handler.go
View File

@@ -11,6 +11,7 @@ import (
"mal/integrations/jikan"
ctxpkg "mal/internal/context"
"mal/internal/db"
"mal/internal/middleware"
"mal/templates"
)
@@ -85,8 +86,9 @@ func (h *Handler) HandleCatalog(w http.ResponseWriter, r *http.Request) {
var cw []database.GetContinueWatchingEntriesRow
watchlistMap := make(map[int64]bool)
var watchlistIDs []int64
user, userOk := r.Context().Value(ctxpkg.UserKey).(*database.User)
if userOk && user != nil {
user := middleware.GetUser(r.Context())
userOk := user != nil
if userOk {
cw, _ = h.db.GetContinueWatchingEntries(r.Context(), user.ID)
watchlist, _ := h.db.GetUserWatchList(r.Context(), user.ID)
watchlistIDs = make([]int64, len(watchlist))
@@ -111,7 +113,7 @@ func (h *Handler) HandleCatalog(w http.ResponseWriter, r *http.Request) {
}
func (h *Handler) HandleBrowse(w http.ResponseWriter, r *http.Request) {
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
q := r.URL.Query().Get("q")
animeType := r.URL.Query().Get("type")
@@ -230,7 +232,7 @@ func (h *Handler) HandleAnimeDetails(w http.ResponseWriter, r *http.Request) {
return
}
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
var status string
var watchlistIDs []int64
@@ -276,7 +278,7 @@ func (h *Handler) HandleHTMLWatchOrder(w http.ResponseWriter, r *http.Request) {
return
}
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
watchlistMap := make(map[int64]bool)
if user != nil {
watchlist, _ := h.db.GetUserWatchList(r.Context(), user.ID)

7
api/playback/handler.go
View File

@@ -12,8 +12,7 @@ import (
"sync"
"mal/integrations/jikan"
ctxpkg "mal/internal/context"
database "mal/internal/db"
"mal/internal/middleware"
"mal/templates"
)
@@ -82,7 +81,7 @@ func (h *Handler) HandleWatchPage(w http.ResponseWriter, r *http.Request) {
return episodes.Data[i].MalID < episodes.Data[j].MalID
})
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
currentEpID := r.URL.Query().Get("ep")
if currentEpID == "" {
@@ -238,7 +237,7 @@ func (h *Handler) HandleEpisodeData(w http.ResponseWriter, r *http.Request) {
episodeID := parts[5]
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
userID := ""
if user != nil {
userID = user.ID

8
api/watchlist/handler.go
View File

@@ -6,8 +6,8 @@ import (
"net/http"
"strconv"
ctxpkg "mal/internal/context"
database "mal/internal/db"
"mal/internal/middleware"
"mal/templates"
)
@@ -29,7 +29,7 @@ func (h *Handler) HandleUpdateWatchlist(w http.ResponseWriter, r *http.Request)
return
}
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
if user == nil {
http.Error(w, "unauthorized", http.StatusUnauthorized)
return
@@ -58,7 +58,7 @@ func (h *Handler) HandleUpdateWatchlist(w http.ResponseWriter, r *http.Request)
}
func (h *Handler) HandleDeleteWatchlist(w http.ResponseWriter, r *http.Request) {
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
if user == nil {
http.Error(w, "unauthorized", http.StatusUnauthorized)
return
@@ -86,7 +86,7 @@ func (h *Handler) HandleDeleteContinueWatching(w http.ResponseWriter, r *http.Re
}
func (h *Handler) HandleGetWatchlist(w http.ResponseWriter, r *http.Request) {
user, _ := r.Context().Value(ctxpkg.UserKey).(*database.User)
user := middleware.GetUser(r.Context())
if user == nil {
http.Redirect(w, r, "/login", http.StatusSeeOther)
return