zoriya/vex
1
0
Fork 0
mirror of https://github.com/zoriya/vex.git synced 2025-12-06 07:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mark as read

Browse Source
This commit is contained in:
Zoe Roux
2024-05-05 19:53:30 +02:00
parent 88a859a88b
commit 7a81243209
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/cmd/entries.go
View File

@@ -43,7 +43,7 @@ func (h *Handler) ChangeUserStatus(c echo.Context) error {
return err return err
} }
h.entries.ChangeStatus(vex.ChangeStatusDao{ err = h.entries.ChangeStatus(vex.ChangeStatusDao{
Id: req.Id, Id: req.Id,
User: user, User: user,
IsRead: req.IsRead, IsRead: req.IsRead,
@@ -51,6 +51,9 @@ func (h *Handler) ChangeUserStatus(c echo.Context) error {
IsReadLater: req.IsReadLater, IsReadLater: req.IsReadLater,
IsIgnored: req.IsIgnored, IsIgnored: req.IsIgnored,
}) })
if err != nil {
return err
}
ret, err := h.entries.GetEntry(req.Id, user) ret, err := h.entries.GetEntry(req.Id, user)
if err != nil { if err != nil {
return err return err

6
api/entries.go
View File

@@ -85,7 +85,7 @@ func (s EntryService) Add(entries []EntryDao) error {
func (s EntryService) GetEntry(id uuid.UUID, userId uuid.UUID) (Entry, error) { func (s EntryService) GetEntry(id uuid.UUID, userId uuid.UUID) (Entry, error) {
var ret EntryDao var ret EntryDao
err := s.database.Select( err := s.database.Get(
&ret, &ret,
`select e.*, s.*, `select e.*, s.*,
f.id as "feed.id", f.name as "feed.name", f.link as "feed.link", f.favicon_url as "feed.favicon_url", f.id as "feed.id", f.name as "feed.name", f.link as "feed.link", f.favicon_url as "feed.favicon_url",
@@ -133,8 +133,8 @@ type ChangeStatusDao struct {
func (s EntryService) ChangeStatus(status ChangeStatusDao) error { func (s EntryService) ChangeStatus(status ChangeStatusDao) error {
_, err := s.database.NamedExec( _, err := s.database.NamedExec(
`insert into entries_users (entry_id, user_id, is_read, is_bookmared, is_read_later, is_ignored) `insert into entries_users (entry_id, user_id, is_read, is_bookmarked, is_read_later, is_ignored)
values (:id, :user, :is_read, :is_bookmared, :is_read_later, :is_ignored) values (:id, :user, :is_read, :is_bookmarked, :is_read_later, :is_ignored)
on conflict(entry_id, user_id) do update set is_read = :is_read, is_bookmarked = :is_bookmarked, is_read_later = :is_read_later, is_ignored = :is_ignored`, on conflict(entry_id, user_id) do update set is_read = :is_read, is_bookmarked = :is_bookmarked, is_read_later = :is_read_later, is_ignored = :is_ignored`,
status, status,
) )