add: 修复详情页加载问题

Author: seth-shi

consts/keymap.go

@@ -23,22 +23,24 @@ type KeyMap struct {
 	F1             key.Binding
 }
 
-// ShortHelp returns keybindings to be shown in the mini help view. It's part
-// of the key.Map interface.
 func (k KeyMap) ShortHelp() []key.Binding {
-	return []key.Binding{
-		k.Up, k.Down, k.Left, k.Right, k.Tab, k.ShiftTab, k.KeyE, // first column
-		k.HelpPage, k.SettingPage, k.CtrlQuit, // second column
-		k.SwitchShowMode,
-	}
+	return []key.Binding{}
 }
 
 // FullHelp returns keybindings for the expanded help view. It's part of the
 // key.Map interface.
 func (k KeyMap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
-		{k.Up, k.Down, k.Left, k.Right, k.Tab, k.ShiftTab, k.KeyE, k.KeyQ, k.KeyR, k.UpgradeApp}, // first column
-		{k.CtrlQuit, k.HelpPage, k.SettingPage, k.SwitchShowMode, k.Space, k.F1},                 // second column
+		{
+			k.Up, k.Down, k.Left, k.Right,
+			k.Tab, k.ShiftTab,
+			k.KeyE, k.KeyQ, k.KeyR,
+		}, // first column
+		{
+			k.CtrlQuit, k.HelpPage, k.SettingPage,
+			k.UpgradeApp,
+			k.SwitchShowMode, k.Space, k.F1,
+		}, // second column
 	}
 }
 
@@ -52,11 +54,11 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 var AppKeyMap = KeyMap{
 	Up: key.NewBinding(
 		key.WithKeys("w", "up", "k"),
-		key.WithHelp("w/↑", "[主题页]移动到上一个"),
+		key.WithHelp("w/↑", "[主题页]列表上一个"),
 	),
 	Down: key.NewBinding(
 		key.WithKeys("s", "down", "j"),
-		key.WithHelp("s/↓", "[主题页]列表移动到下一个"),
+		key.WithHelp("s/↓", "[主题页]列表下一个"),
 	),
 	Left: key.NewBinding(
 		key.WithKeys("a", "left", "h"),
@@ -80,38 +82,38 @@ var AppKeyMap = KeyMap{
 	),
 	Tab: key.NewBinding(
 		key.WithKeys("tab"),
-		key.WithHelp("tab", "[主题页]切换下一个节点"),
+		key.WithHelp("tab", "[主题页]下一个节点"),
 	),
 	Space: key.NewBinding(
 		key.WithKeys(" "),
-		key.WithHelp("空格键", "老板键"),
+		key.WithHelp("空格", "老板键"),
 	),
 	ShiftTab: key.NewBinding(
 		key.WithKeys("shift+tab"),
-		key.WithHelp("shift+tab", "[主题页]切换上一个切点"),
+		key.WithHelp("shift+tab", "[主题页]上一个切点"),
 	),
 	CtrlQuit: key.NewBinding(
 		key.WithKeys("esc", "ctrl+c"),
 		key.WithHelp("esc", "退出程序"),
 	),
 	KeyE: key.NewBinding(
 		key.WithKeys("e", "enter", "o"),
-		key.WithHelp("e/enter", "[主题页]查看主题详情"),
+		key.WithHelp("e/enter", "[主题页]查看主题详情 / [详情页]加载评论"),
 	),
 	SwitchShowMode: key.NewBinding(
 		key.WithKeys("="),
-		key.WithHelp("=", "[减号]切换底部显示隐藏"),
+		key.WithHelp("=", "[等于号]切换底部显示隐藏"),
 	),
 	KeyR: key.NewBinding(
 		key.WithKeys("r"),
-		key.WithHelp("r", "加载图片"),
+		key.WithHelp("r", "[主题页]切换接口版本 / [详情页]加载图片"),
 	),
 	UpgradeApp: key.NewBinding(
 		key.WithKeys("ctrl+u"),
 		key.WithHelp("ctrl+u", "更新应用(需要网络可以访问 github)"),
 	),
 	F1: key.NewBinding(
 		key.WithKeys("f1"),
-		key.WithHelp("f1", "打开详情或者打开配置文件"),
+		key.WithHelp("f1", "[详情页]打开链接 / [配置页]打开配置文件"),
 	),
 }

consts/showmode.go

@@ -2,7 +2,6 @@ package consts
 
 const (
 	ShowModeAll = iota
-	ShowModeHideHelp
 	ShowModeHideLimit
 	ShowModeHideAll
 )

model/file.go

@@ -61,7 +61,6 @@ func (c *FileConfig) GetShowModeText() string {
 	var (
 		m = map[int]string{
 			consts.ShowModeAll:       "显示所有",
-			consts.ShowModeHideHelp:  "隐藏帮助",
 			consts.ShowModeHideLimit: "隐藏请求限制",
 			consts.ShowModeHideAll:   "隐藏所有",
 		}

pages/detail.go

@@ -28,10 +28,6 @@ import (
 	"github.com/seth-shi/go-v2ex/v2/messages"
 )
 
-const (
-	detailKeyHelp = "[q:返回 e:加载评论 r:加载图片 w/s/鼠标:滑动 a/d:翻页 =:显示页脚]"
-)
-
 var (
 	titleStyle = func() lipgloss.Style {
 		b := lipgloss.RoundedBorder()
@@ -358,5 +354,5 @@ func (m *detailPage) onDetailResult(detail response.V2DetailResult) tea.Cmd {
 }
 
 func (m detailPage) showStatusBarText(firstText string) tea.Cmd {
-	return commands.Post(messages.ShowStatusBarTextRequest{FirstText: firstText, HelpText: detailKeyHelp})
+	return commands.Post(messages.ShowStatusBarTextRequest{FirstText: firstText})
 }

pages/topics.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"strconv"
 	"strings"
 
@@ -27,8 +26,6 @@ import (
 	"github.com/dromara/carbon/v2"
 )
 
-const keyHelp = "[a/d:翻页 w/s:移动 e:详情 tab/shift+tab:节点 空格:老板键 ?:帮助页 `:设置页  =:显示页脚]"
-
 var (
 	cellStyle         = styles.Primary.Padding(0, 1).Width(5)
 	headerStyle       = styles.Primary.Bold(true).Align(lipgloss.Center)
@@ -146,8 +143,7 @@ func (m topicPage) onSwitchApiMode() tea.Cmd {
 				conf.ChooseAPIV2 = !conf.ChooseAPIV2
 			},
 		)
-
-		return messages.ErrorOrToast(err, g.Config.Get().GetShowModeText())
+		return messages.ErrorOrToast(err, "切换成功: V1 接口信息更多 / V2 接口有分页")
 	}
 }
 
@@ -171,7 +167,6 @@ func (m topicPage) moveTabs(add int) (tea.Model, tea.Cmd) {
 	saveTabFn := func() tea.Msg {
 		return g.Config.Save(
 			func(conf *model.FileConfig) {
-				slog.Info("save index")
 				conf.ActiveTab = g.TabNodeIndex(conf.ActiveTab, add)
 			},
 		)
@@ -206,7 +201,6 @@ func (m topicPage) onTopicResult(msgType messages.GetTopicResponse) (tea.Model,
 	return m, commands.Post(
 		messages.ShowStatusBarTextRequest{
 			FirstText: fmt.Sprintf("%s %s", apiText, pageInfo.ToString()),
-			HelpText:  keyHelp,
 		},
 	)
 }

pages/ui_footer.go

@@ -54,14 +54,14 @@ func NewFooter(appVersion string) FooterComponents {
 		statusbar.ColorConfig{
 			// 强调区
 			Foreground: lipgloss.AdaptiveColor{Dark: "#FFFFFF", Light: "#FFFFFF"},
-			Background: lipgloss.AdaptiveColor{Light: "#636e72", Dark: "#636e72"},
+			Background: lipgloss.AdaptiveColor{Light: "#005FB8", Dark: "#005FB8"},
 		},
 	)
 
 	sb.SetContent(
 		"",
 		"",
-		"",
+		"?查看帮助",
 		fmt.Sprintf("%s[%s]@%s", consts.AppName, appVersion, consts.AppOwner),
 	)
 
@@ -147,7 +147,7 @@ func (m FooterComponents) View() string {
 		conf       = g.Config.Get()
 		content    strings.Builder
 		w, _       = g.Window.GetSize()
-		secondText = m.GetSecondColumnContent(conf.ShowHelp())
+		secondText = m.GetSecondColumnContent()
 	)
 
 	if !conf.ShowFooter() {
@@ -171,13 +171,12 @@ func (m FooterComponents) View() string {
 
 }
 
-func (m FooterComponents) GetSecondColumnContent(showHelp bool) string {
+func (m FooterComponents) GetSecondColumnContent() string {
 	// loadings 是一个 map
 	var (
 		loadingKeys = lo.Keys(m.loadings)
 		loadingIcon = m.spinner.View()
 		loadingText strings.Builder
-		secondText  string
 	)
 	slices.Sort(loadingKeys)
 
@@ -190,9 +189,5 @@ func (m FooterComponents) GetSecondColumnContent(showHelp bool) string {
 		},
 	)
 
-	if showHelp {
-		secondText = m.secondText
-	}
-
-	return styles.Hint.Render(loadingText.String(), secondText)
+	return styles.Hint.Render(loadingText.String(), m.secondText)
 }

pkg/html.go

@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/glamour"
 	"github.com/charmbracelet/glamour/ansi"
 	"github.com/charmbracelet/glamour/styles"
-	"github.com/muesli/termenv"
+	"github.com/charmbracelet/lipgloss"
 	"golang.org/x/term"
 )
 
@@ -38,7 +38,7 @@ func getDefaultStyle() ansi.StyleConfig {
 	if !term.IsTerminal(int(os.Stdout.Fd())) {
 		conf = styles.NoTTYStyleConfig
 	} else {
-		if termenv.HasDarkBackground() {
+		if lipgloss.HasDarkBackground() {
 			conf = styles.DarkStyleConfig
 		} else {
 			conf = styles.LightStyleConfig