From 3daf2abf019c1a6a4fe3928de084894feb0d8a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=9E=E3=83=AA=E3=82=A6=E3=82=B9?=
 <marius@xn--gckvb8fzb.com>
Date: Sun, 1 Jan 2023 20:13:02 -0500
Subject: [PATCH] Fixed runaway spinner, adjusted shortcuts

---
 ui/header/header.go     | 10 +++++----
 ui/ui.go                |  4 ++--
 ui/views/posts/posts.go | 48 +++++++++++++++++++++++++----------------
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/ui/header/header.go b/ui/header/header.go
index a4c0c27..cfcffe0 100644
--- a/ui/header/header.go
+++ b/ui/header/header.go
@@ -10,10 +10,10 @@ import (
 
 var (
 	highlight = lipgloss.AdaptiveColor{Light: "#874BFD", Dark: "#7D56F4"}
-	banner = "▄▗▖▎▄▗▅▖▗▅▅▖▗▅▅▖▅▅▅▖▏▉▅▅┓▅▖▎▗▅▌\n" +
-"▗▎▍▄▗▗▎▏▍▝▝▘▍▝▂▉┈▂▎▍▅▋▊▂╴▏▊▗╴▋▎\n" +
-"▊▉▌╴▘▁▏▏▅▆┈▏▉▇▆▌▗▖▍▎▃▎▎▅▋▋▎▗▎▍▘\n" +
-"▝▄▄▄▘▇▄▆▄▄▄▝▄▄▘▝▘▝▘▏╴▄▘▄▝▘▇╴▄▘▄"
+	banner    = "▄▗▖▎▄▗▅▖▗▅▅▖▗▅▅▖▅▅▅▖▏▉▅▅┓▅▖▎▗▅▌\n" +
+		"▗▎▍▄▗▗▎▏▍▝▝▘▍▝▂▉┈▂▎▍▅▋▊▂╴▏▊▗╴▋▎\n" +
+		"▊▉▌╴▘▁▏▏▅▆┈▏▉▇▆▌▗▖▍▎▃▎▎▅▋▋▎▗▎▍▘\n" +
+		"▝▄▄▄▘▇▄▆▄▄▄▝▄▄▘▝▘▝▘▏╴▄▘▄▝▘▇╴▄▘▄"
 )
 
 type Model struct {
@@ -42,6 +42,8 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 
 	if m.ctx.Loading == true {
 		cmds = append(cmds, m.spinner.Tick)
+	} else {
+		return m, nil
 	}
 
 	switch msg := msg.(type) {
diff --git a/ui/ui.go b/ui/ui.go
index 7fa021b..98a0c1d 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -31,8 +31,8 @@ var DefaultKeyMap = KeyMap{
 		key.WithHelp("↓/j", "move down"),
 	),
 	Quit: key.NewBinding(
-		key.WithKeys("q", "ctrl+q"),
-		key.WithHelp("q/Q", "quit"),
+		key.WithKeys("q", "ctrl+q", "escape"),
+		key.WithHelp("q/esc", "quit"),
 	),
 }
 
diff --git a/ui/views/posts/posts.go b/ui/views/posts/posts.go
index 2682f15..69c8f8e 100644
--- a/ui/views/posts/posts.go
+++ b/ui/views/posts/posts.go
@@ -36,15 +36,15 @@ type KeyMap struct {
 
 var DefaultKeyMap = KeyMap{
 	Refresh: key.NewBinding(
-		key.WithKeys("r", "R"),
-		key.WithHelp("r/R", "refresh"),
+		key.WithKeys("ctrl+r"),
+		key.WithHelp("ctrl+r", "refresh"),
 	),
 	Select: key.NewBinding(
-		key.WithKeys("enter"),
-		key.WithHelp("enter", "select"),
+		key.WithKeys("r", "enter"),
+		key.WithHelp("r/enter", "read"),
 	),
 	Close: key.NewBinding(
-		key.WithKeys("esc"),
+		key.WithKeys("esc", "q"),
 		key.WithHelp("esc", "close"),
 	),
 }
@@ -60,9 +60,10 @@ type Model struct {
 
 	glam *glamour.TermRenderer
 
-	focused  string
-	buffer   string
-	replyIDs []string
+	focused   string
+	buffer    string
+	replyIDs  []string
+	viewcache string
 }
 
 func (m Model) Init() tea.Cmd {
@@ -110,22 +111,24 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if m.focused == "list" {
 				m.ctx.Loading = true
 				cmds = append(cmds, m.refresh())
+			}
+
+		case key.Matches(msg, m.keymap.Select):
+			if m.focused == "list" {
+				i, ok := m.list.SelectedItem().(post.Post)
+				if ok {
+					m.ctx.Loading = true
+					cmds = append(cmds, m.loadItem(&i))
+				}
 			} else if m.focused == "post" {
 				m.focused = "reply"
 				return m, m.textarea.Focus()
 			}
 
-		case key.Matches(msg, m.keymap.Select):
-			if m.focused == "list" {
-				m.ctx.Loading = true
-				i, ok := m.list.SelectedItem().(post.Post)
-				if ok {
-					cmds = append(cmds, m.loadItem(&i))
-				}
-			}
-
 		case key.Matches(msg, m.keymap.Close):
-			if m.focused == "post" {
+			if m.focused == "list" {
+				return m, tea.Quit
+			} else if m.focused == "post" {
 				// Let's make sure we reset the texarea
 				m.textarea.Reset()
 				m.focused = "list"
@@ -176,6 +179,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.items = msg
 		m.list.SetItems(m.items)
 		m.ctx.Loading = false
+		return m, nil
 
 	case *post.Post:
 		m.viewport.SetContent(m.renderViewport(msg))
@@ -204,6 +208,11 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (m Model) View() string {
 	var view strings.Builder = strings.Builder{}
 
+	if m.focused == "reply" && m.viewcache != "" {
+		return helpers.PlaceOverlay(3, 2, m.textarea.View(), m.viewcache, false)
+	}
+
+	m.ctx.Logger.Debugln("View()")
 	var l string = ""
 	if m.focused == "list" {
 		l = m.ctx.Theme.PostsList.List.Focused.Render(m.list.View())
@@ -284,7 +293,8 @@ func (m Model) View() string {
 		view.WriteString(tmp)
 	}
 
-	return view.String()
+	m.viewcache = view.String()
+	return m.viewcache
 }
 
 func (m *Model) refresh() tea.Cmd {