updated

cmd/cmd.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/charmbracelet/bubbles/list"
@@ -29,9 +28,9 @@ const (
 )
 
 type MsgChangeView ViewType
-type MsgSelectedItem feedEntry
-type MsgTickInternal time.Time
-type MsgTick uint8
+type MsgPlayEntry feedEntry
+type MsgWatchedEntry int64
+type MsgTick time.Time
 
 type MinifluxPlayer struct {
 	MinifluxClient  *miniflux.Client
@@ -59,28 +58,28 @@ func (mp *MinifluxPlayer) Init() tea.Cmd {
 }
 
 func (mp *MinifluxPlayer) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c", "q":
 			return mp, tea.Quit
 		}
-	case MsgTickInternal:
-		fnSendTick := func() tea.Msg { return MsgTick(0) }
-		return mp, tea.Batch(tickEvery(), fnSendTick)
+	case MsgTick:
+		cmds = append(cmds, tickEvery())
 	case MsgChangeView:
 		mp.CurrentView = ViewType(msg)
 	}
 
-	if mp.CurrentView == ViewListFeedEntries {
-		_, c := mp.feedEntries.Update(msg)
-		return mp, c
-	} else if mp.CurrentView == ViewPlayer {
-		_, c := mp.player.Update(msg)
-		return mp, c
-	}
+	// always update all models
+	_, cmdFeeds := mp.feedEntries.Update(msg)
+	_, cmdPlayer := mp.player.Update(msg)
 
-	return mp, nil
+	cmds = append(cmds, cmdFeeds)
+	cmds = append(cmds, cmdPlayer)
+
+	return mp, tea.Batch(cmds...)
 }
 
 func (mp *MinifluxPlayer) View() string {
@@ -88,15 +87,7 @@ func (mp *MinifluxPlayer) View() string {
 		return mp.player.View()
 	}
 
-	if mp.player.currentlyPlaying == true {
-		return lipgloss.JoinVertical(0.2, mp.feedEntries.View(), "", fmt.Sprintf("Currently Playing: %s (%v/%v)",
-			mp.player.selectedEntry.Name,
-			mp.player.videoPosition,
-			mp.player.videoDuration,
-		))
-	}
-
-	return mp.feedEntries.View()
+	return lipgloss.JoinVertical(0.2, mp.feedEntries.View(), "", mp.player.View())
 }
 
 func (mp *MinifluxPlayer) FetchCategories(ctx context.Context) ([]*miniflux.Category, error) {
@@ -105,6 +96,6 @@ func (mp *MinifluxPlayer) FetchCategories(ctx context.Context) ([]*miniflux.Cate
 
 func tickEvery() tea.Cmd {
 	return tea.Every(time.Second, func(t time.Time) tea.Msg {
-		return MsgTickInternal(t)
+		return MsgTick(t)
 	})
 }

cmd/feed_entries.go

@@ -12,6 +12,7 @@ import (
 )
 
 type feedEntry struct {
+	ID          int64
 	Name        string
 	Feed        string
 	Link        string
@@ -35,7 +36,7 @@ type MsgFetchedEntries []feedEntry
 type MsgFetchedEntriesError error
 
 func (m *feedEntriesModel) fetchEntries() tea.Msg {
-	entriesResult, err := m.minifluxClient.CategoryEntries(4, nil)
+	entriesResult, err := m.minifluxClient.CategoryEntries(4, &miniflux.Filter{Statuses: []string{miniflux.EntryStatusUnread}})
 	if err != nil {
 		return MsgFetchedEntriesError(err)
 	}
@@ -43,6 +44,7 @@ func (m *feedEntriesModel) fetchEntries() tea.Msg {
 	var feedEntries []feedEntry
 	for _, e := range entriesResult.Entries {
 		feedEntries = append(feedEntries, feedEntry{
+			ID:          e.ID,
 			Name:        e.Title,
 			Feed:        e.Feed.Title,
 			Link:        e.URL,
@@ -65,21 +67,22 @@ func (m *feedEntriesModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "enter":
-			fnChangeView := func() tea.Msg { return MsgChangeView(ViewPlayer) }
-
 			fnGetSelected := func() tea.Msg {
 				i, ok := m.entries.SelectedItem().(feedEntry)
 				if ok {
 					m.selectedEntry = &i
 				}
 
-				return MsgSelectedItem(i)
+				return MsgPlayEntry(i)
 			}
 
-			return m, tea.Sequence(fnChangeView, fnGetSelected)
+			return m, fnGetSelected
 		}
 		break
 
+	case MsgWatchedEntry:
+		m.markEntryRead(int64(msg))
+
 	case MsgFetchedEntries:
 		var items []list.Item
 		for _, e := range msg {
@@ -98,3 +101,7 @@ func (m *feedEntriesModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (m *feedEntriesModel) View() string {
 	return m.entries.View()
 }
+
+func (m *feedEntriesModel) markEntryRead(entryID int64) {
+	m.minifluxClient.UpdateEntries([]int64{entryID}, miniflux.EntryStatusRead)
+}