southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use variables for the status in the entries table

Browse source
This commit is contained in:
Shizun Ge 2023-11-24 20:37:48 -08:00 committed by Frédéric Guillot
parent 2d167ae9f9
commit 65e2fddfb5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/storage/category.go
View file

@ -126,10 +126,10 @@ func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error
(SELECT count(*)
FROM feeds
JOIN entries ON (feeds.id = entries.feed_id)
WHERE feeds.category_id = c.id AND entries.status = 'unread') AS count_unread
WHERE feeds.category_id = c.id AND entries.status = $1) AS count_unread
FROM categories c
WHERE
user_id=$1
user_id=$2
`
if user.CategoriesSortingOrder == "alphabetical" {
@ -145,7 +145,7 @@ func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error
`
}
rows, err := s.db.Query(query, userID)
rows, err := s.db.Query(query, model.EntryStatusUnread, userID)
if err != nil {
return nil, fmt.Errorf(`store: unable to fetch categories: %v`, err)
}

6
internal/storage/entry.go
View file

@ -323,12 +323,12 @@ func (s *Storage) ArchiveEntries(status string, days, limit int) (int64, error)
UPDATE
entries
SET
status='removed'
status=$1
WHERE
id=ANY(SELECT id FROM entries WHERE status=$1 AND starred is false AND share_code='' AND created_at < now () - '%d days'::interval ORDER BY created_at ASC LIMIT %d)
id=ANY(SELECT id FROM entries WHERE status=$2 AND starred is false AND share_code='' AND created_at < now () - '%d days'::interval ORDER BY created_at ASC LIMIT %d)
`
result, err := s.db.Exec(fmt.Sprintf(query, days, limit), status)
result, err := s.db.Exec(fmt.Sprintf(query, days, limit), model.EntryStatusRemoved, status)
if err != nil {
return 0, fmt.Errorf(`store: unable to archive %s entries: %v`, status, err)
}