Skip to content
Open
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
8 changes: 8 additions & 0 deletions internal/database/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -1135,4 +1135,12 @@ var migrations = []func(tx *sql.Tx) error{
_, err = tx.Exec(sql)
return err
},
func(tx *sql.Tx) (err error) {
sql := `
ALTER TABLE entries ADD COLUMN opened bool default 'f';
CREATE INDEX entries_opened_idx ON entries(opened);
`
_, err = tx.Exec(sql)
return err
},
}
6 changes: 6 additions & 0 deletions internal/model/entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Entry struct {
Author string `json:"author"`
ShareCode string `json:"share_code"`
Starred bool `json:"starred"`
Opened bool `json:"opened"`
ReadingTime int `json:"reading_time"`
Enclosures EnclosureList `json:"enclosures"`
Feed *Feed `json:"feed,omitempty"`
Expand Down Expand Up @@ -79,6 +80,7 @@ type EntriesStatusUpdateRequest struct {
type EntryUpdateRequest struct {
Title *string `json:"title"`
Content *string `json:"content"`
Opened *bool `json:"opened"`
}

func (e *EntryUpdateRequest) Patch(entry *Entry) {
Expand All @@ -89,4 +91,8 @@ func (e *EntryUpdateRequest) Patch(entry *Entry) {
if e.Content != nil && *e.Content != "" {
entry.Content = *e.Content
}

if e.Opened != nil {
entry.Opened = *e.Opened
}
}
23 changes: 23 additions & 0 deletions internal/storage/entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,29 @@ func (s *Storage) UpdateEntryTitleAndContent(entry *model.Entry) error {
return nil
}

// UpdateEntryOpened updates entry opened flag
func (s *Storage) UpdateEntryOpened(entry *model.Entry) error {
query := `
UPDATE
entries
SET
opened=$1
WHERE
id=$2 AND user_id=$3
`

if _, err := s.db.Exec(
query,
entry.Opened,
entry.ID,
entry.UserID); err != nil {
return fmt.Errorf(`store: unable to update entry #%d: %v`, entry.ID, err)
}

return nil
}


// createEntry add a new entry.
func (s *Storage) createEntry(tx *sql.Tx, entry *model.Entry) error {
query := `
Expand Down
2 changes: 2 additions & 0 deletions internal/storage/entry_query_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
e.content,
e.status,
e.starred,
e.opened,
e.reading_time,
e.created_at,
e.changed_at,
Expand Down Expand Up @@ -345,6 +346,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
&entry.Content,
&entry.Status,
&entry.Starred,
&entry.Opened,
&entry.ReadingTime,
&entry.CreatedAt,
&entry.ChangedAt,
Expand Down
8 changes: 8 additions & 0 deletions internal/ui/entry_unread.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ func (h *handler) showUnreadEntryPage(w http.ResponseWriter, r *http.Request) {
entry.Status = model.EntryStatusRead
}

if !entry.Opened {
entry.Opened = true
if err := h.store.UpdateEntryOpened(entry); err != nil {
html.ServerError(w, r, err)
return
}
}

// Restore entry read status if needed after fetching the pagination.
if entry.Status == model.EntryStatusRead {
err = h.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead)
Expand Down