8000 [pull] main from miniflux:main by pull[bot] · Pull Request #328 · suhaoGe/miniflux · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions internal/api/enclosure_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (h *handler) getEnclosureByIDHandler(w http.ResponseWriter, r *http.Request
return
}

enclosure, err := h.store.GetEnclosure(enclosureID)
enclosure, err := h.store.EnclosureByID(request.UserID(r), enclosureID)
if err != nil {
response.JSONServerError(w, r, err)
return
Expand All @@ -33,12 +33,6 @@ func (h *handler) getEnclosureByIDHandler(w http.ResponseWriter, r *http.Request
return
}

userID := request.UserID(r)
if enclosure.UserID != userID {
response.JSONNotFound(w, r)
return
}

enclosure.ProxifyEnclosureURL(config.Opts.MediaProxyMode(), config.Opts.MediaProxyResourceTypes())

response.JSON(w, r, enclosure)
Expand All @@ -62,7 +56,7 @@ func (h *handler) updateEnclosureByIDHandler(w http.ResponseWriter, r *http.Requ
return
}

enclosure, err := h.store.GetEnclosure(enclosureID)
enclosure, err := h.store.EnclosureByID(request.UserID(r), enclosureID)
if err != nil {
response.JSONServerError(w, r, err)
return
Expand All @@ -73,12 +67,6 @@ func (h *handler) updateEnclosureByIDHandler(w http.ResponseWriter, r *http.Requ
return
}

userID := request.UserID(r)
if enclosure.UserID != userID {
response.JSONNotFound(w, r)
return
}

enclosure.MediaProgression = enclosureUpdateRequest.MediaProgression
if err := h.store.UpdateEnclosure(enclosure); err != nil {
response.JSONServerError(w, r, err)
Expand Down
15 changes: 9 additions & 6 deletions internal/storage/enclosure.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/lib/pq"
)

// GetEnclosures returns all attachments for the given entry.
func (s *Storage) GetEnclosures(entryID int64) (model.EnclosureList, error) {
// EnclosuresByEntryID returns all enclosures for the given entry.
func (s *Storage) EnclosuresByEntryID(entryID int64) (model.EnclosureList, error) {
query := `
SELECT
id,
Expand Down Expand Up @@ -61,7 +61,8 @@ func (s *Storage) GetEnclosures(entryID int64) (model.EnclosureList, error) {
return enclosures, nil
}

func (s *Storage) GetEnclosuresForEntries(entryIDs []int64) (map[int64]model. 8000 EnclosureList, error) {
// EnclosuresByEntryIDs returns enclosures for the given entries, grouped by entry ID.
func (s *Storage) EnclosuresByEntryIDs(entryIDs []int64) (map[int64]model.EnclosureList, error) {
query := `
SELECT
id,
Expand Down Expand Up @@ -106,7 +107,8 @@ func (s *Storage) GetEnclosuresForEntries(entryIDs []int64) (map[int64]model.Enc
return enclosuresMap, nil
}

func (s *Storage) GetEnclosure(enclosureID int64) (*model.Enclosure, error) {
// EnclosureByID returns the enclosure for the given user and enclosure ID.
func (s *Storage) EnclosureByID(userID, enclosureID int64) (*model.Enclosure, error) {
query := `
SELECT
id,
Expand All @@ -119,10 +121,10 @@ func (s *Storage) GetEnclosure(enclosureID int64) (*model.Enclosure, error) {
FROM
enclosures
WHERE
id = $1
id = $1 AND user_id = $2
`

row := s.db.QueryRow(query, enclosureID)
row := s.db.QueryRow(query, enclosureID, userID)

var enclosure model.Enclosure
err := row.Scan(
Expand Down Expand Up @@ -215,6 +217,7 @@ func (s *Storage) updateEnclosures(tx *sql.Tx, entry *model.Entry) error {
return nil
}

// UpdateEnclosure persists changes to the given enclosure.
func (s *Storage) UpdateEnclosure(enclosure *model.Enclosure) error {
query := `
UPDATE
Expand Down
4 changes: 2 additions & 2 deletions internal/storage/entry_query_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func (e *EntryQueryBuilder) GetEntry() (*model.Entry, error) {
return nil, nil
}

entries[0].Enclosures, err = e.store.GetEnclosures(entries[0].ID)
entries[0].Enclosures, err = e.store.EnclosuresByEntryID(entries[0].ID)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -433,7 +433,7 @@ func (e *EntryQueryBuilder) fetchEntries(withCount bool) (model.Entries, int, er
}

if e.fetchEnclosures && len(entryIDs) > 0 {
enclosures, err := e.store.GetEnclosuresForEntries(entryIDs)
enclosures, err := e.store.EnclosuresByEntryIDs(entryIDs)
if err != nil {
return nil, 0, fmt.Errorf("store: unable to fetch enclosures: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/entry_enclosure_save_position.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

func (h *handler) saveEnclosureProgression(w http.ResponseWriter, r *http.Request) {
enclosureID := request.RouteInt64Param(r, "enclosureID")
enclosure, err := h.store.GetEnclosure(enclosureID)
enclosure, err := h.store.EnclosureByID(request.UserID(r), enclosureID)
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down
0