Merge pull request #10 from seth-shi/feature/optimal

seth-shi · web-flow · commit a3820f1a78bd · 2025-07-11T10:56:14.000+08:00
Feature/optimal
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -28,7 +28,6 @@ jobs:
           goversion: 1.24
           md5sum: false
           overwrite: true
-          executable_compression: upx
           asset_name: go-v2ex-${{ matrix.goos }}-${{ matrix.goarch }}
           pre_command: export CGO_ENABLED=0
           ldflags: -s -w -extldflags -static -X "main.appVersion=${{ env.APP_VERSION }}"
diff --git a/api/api_self.go b/api/api_self.go
@@ -0,0 +1,27 @@
+package api
+
+import (
+	"context"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/seth-shi/go-v2ex/g"
+	"github.com/seth-shi/go-v2ex/response"
+)
+
+func (cli *v2exClient) Me(ctx context.Context) tea.Cmd {
+	return func() tea.Msg {
+
+		var res response.MeResponse
+		_, err := cli.client.R().
+			SetContext(ctx).
+			SetResult(&res).
+			Get("/api/v2/member")
+		if err != nil {
+			return err
+		}
+
+		g.Me.Set(res.Result)
+
+		return nil
+	}
+}
diff --git a/api/api_v2_token.go b/api/api_v2_token.go
@@ -3,43 +3,30 @@ package api
 import (
 	"context"
 	"fmt"
-	"sync"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/dromara/carbon/v2"
 	"github.com/seth-shi/go-v2ex/response"
 )
 
-var (
-	tokenOnce sync.Once
-	tokenMsg  error
-)
-
 func (cli *v2exClient) GetToken(ctx context.Context) tea.Cmd {
 	return func() tea.Msg {
-		tokenOnce.Do(
-			func() {
-				var res response.V2Token
-				_, err := cli.client.R().
-					SetContext(ctx).
-					SetResult(&res).
-					Get("/api/v2/token")
-
-				if err != nil {
-					tokenMsg = err
-					return
-				}
-
-				// 准备过期的话, 发送提醒
-				expireAt := carbon.CreateFromTimestamp(res.Result.Created + res.Result.Expiration)
-				if !carbon.Now().AddDays(14).Gte(expireAt) {
-					return
-				}
-
-				tokenMsg = errorWrapper("令牌", fmt.Errorf("将在%s过期,请注意更换", expireAt.String()))
-			},
-		)
-
-		return tokenMsg
+		var res response.V2Token
+		_, err := cli.client.R().
+			SetContext(ctx).
+			SetResult(&res).
+			Get("/api/v2/token")
+
+		if err != nil {
+			return err
+		}
+
+		// 准备过期的话, 发送提醒
+		expireAt := carbon.CreateFromTimestamp(res.Result.Created + res.Result.Expiration)
+		if !carbon.Now().AddDays(14).Gte(expireAt) {
+			return nil
+		}
+
+		return errorWrapper("令牌", fmt.Errorf("将在%s过期,请注意更换", expireAt.String()))
 	}
 }
diff --git a/g/me.go b/g/me.go
@@ -0,0 +1,11 @@
+package g
+
+import (
+	"github.com/seth-shi/go-v2ex/model"
+	"github.com/seth-shi/go-v2ex/response"
+)
+
+var (
+	Me = model.
+		NewSafe(response.MeResult{}, nil)
+)
diff --git a/messages/loading.go b/messages/loading.go
@@ -9,6 +9,7 @@ import (
 var (
 	lastLoadingId        int64
 	LoadingGetToken      = newLoadingKey("获取 token 信息中")
+	LoadingMe            = newLoadingKey("获取个人信息中")
 	LoadingRequestTopics = newLoadingKey("获取主题中")
 	LoadingRequestDetail = newLoadingKey("获取内容中")
 	LoadingRequestReply  = newLoadingKey("获取评论中")
diff --git a/pages/detail.go b/pages/detail.go
@@ -55,6 +55,7 @@ type detailPage struct {
 	id         int64
 	replyPage  int
 	replyIndex int
+	opMember   response.MemberResult
 }
 
 func newDetailPage() detailPage {
@@ -71,6 +72,8 @@ func (m detailPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		cmds []tea.Cmd
 	)
 
+	// 显示是否是 pro && 是否有人
+
 	switch msgType := msg.(type) {
 	case messages.GetDetailRequest:
 		// 获取内容 + 第一页的评论
@@ -187,21 +190,33 @@ func (m *detailPage) onReplyResult(msgType messages.GetReplyResponse) tea.Cmd {
 				Width(w - 2).
 				BorderRight(false).
 				BorderBottom(false)
+		me = g.Me.Get()
 	)
 
 	replies.WriteString("\n")
+
 	for _, r := range data.Result {
 		m.replyIndex++
+
+		var (
+			opText string
+		)
+
+		if r.Member.Id == m.opMember.Id {
+			opText = styles.MemberOp
+		}
+
 		floor := fmt.Sprintf(
-			"#%d · %s @%s",
+			"#%d · %s @%s%s",
 			m.replyIndex,
 			carbon.CreateFromTimestamp(r.Created),
-			r.Member.Username,
+			r.Member.GetUserNameLabel(me.Id),
+			opText,
 		)
 
 		replies.WriteString(replyTitleStyle.Render(floor))
 		replies.WriteString("\n")
-		replies.WriteString(r.GetContent())
+		replies.WriteString(r.GetContent(w))
 		replies.WriteString("\n")
 	}
 
@@ -295,9 +310,11 @@ func (m *detailPage) renderDetail(detail response.V2DetailResult) tea.Cmd {
 		w, _              = g.Window.GetSize()
 		contentWidth      = w - 2
 		content           strings.Builder
-		topicContent      = detail.GetContent()
+		topicContent      = detail.GetContent(w)
 		contentTitleStyle = styles.Border.BorderRight(false).BorderBottom(false)
+		me                = g.Me.Get()
 	)
+	m.opMember = detail.Member
 
 	content.WriteString(
 		contentTitleStyle.
@@ -307,7 +324,8 @@ func (m *detailPage) renderDetail(detail response.V2DetailResult) tea.Cmd {
 					"V2EX > %s %s\n%s · %s · %d 回复\n\n%s\n\n%s",
 					styles.Bold.Render(detail.Node.Title),
 					detail.Url,
-					detail.Member.Username, carbon.CreateFromTimestamp(detail.Created),
+					detail.Member.GetUserNameLabel(me.Id),
+					carbon.CreateFromTimestamp(detail.Created),
 					detail.Replies,
 					lipgloss.NewStyle().
 						Bold(true).
@@ -324,7 +342,7 @@ func (m *detailPage) renderDetail(detail response.V2DetailResult) tea.Cmd {
 
 		desc := fmt.Sprintf(
 			"第 %d 条附言 · %s\n%s", i+1, carbon.CreateFromTimestamp(c.Created),
-			c.GetContent(),
+			c.GetContent(w),
 		)
 		content.WriteString(contentTitleStyle.Width(w).Render(desc))
 	}
diff --git a/pages/splash.go b/pages/splash.go
@@ -61,14 +61,20 @@ func (m splashPage) onConfigResult(msg messages.LoadConfigResult) (tea.Model, te
 	// 去触发对应的地方获取数据
 	cmds = append(
 		cmds,
-		// 先跳转到主题页
-		commands.Redirect(RouteTopic),
-		// 获取个人信息
+		// 获取 token 过期信息
 		tea.Sequence(
 			messages.LoadingGetToken.PostStart(),
 			api.V2ex.GetToken(context.Background()),
 			messages.LoadingGetToken.PostEnd(),
 		),
+		// 获取个人信息
+		tea.Sequence(
+			messages.LoadingMe.PostStart(),
+			api.V2ex.Me(context.Background()),
+			messages.LoadingMe.PostEnd(),
+		),
+		// 先跳转到主题页
+		commands.Redirect(RouteTopic),
 	)
 	return m, tea.Sequence(cmds...)
 }
diff --git a/pkg/html.go b/pkg/html.go
@@ -9,7 +9,6 @@ import (
 	"github.com/charmbracelet/glamour/styles"
 	"github.com/muesli/termenv"
 	"github.com/samber/lo"
-	"github.com/seth-shi/go-v2ex/g"
 	"golang.org/x/term"
 )
 
@@ -47,11 +46,7 @@ func getRenderer(w int) *glamour.TermRenderer {
 	return renderer
 }
 
-func SafeRenderHtml(input string) string {
-
-	var (
-		w, _ = g.Window.GetSize()
-	)
+func SafeRenderHtml(input string, w int) string {
 
 	out, err := getRenderer(w).Render(input)
 	if err != nil {
diff --git a/pkg/image.go b/pkg/image.go
@@ -90,14 +90,16 @@ func ProcessURLs(urls []string, width int) map[string]string {
 	var (
 		wg          sync.WaitGroup
 		chSemaphore = make(chan struct{}, 5)
-		chImgRes    = make(chan imgRes, len(urls))
+		chImgRes    = make(chan imgRes)
 	)
-	for _, l := range urls {
-		chSemaphore <- struct{}{}
-		wg.Add(1)
-		go downloadImageRes(l, chSemaphore, chImgRes, &wg)
-	}
+
 	go func() {
+		for _, l := range urls {
+			chSemaphore <- struct{}{}
+			wg.Add(1)
+			go downloadImageRes(l, chSemaphore, chImgRes, &wg)
+		}
+
 		wg.Wait()
 		close(chImgRes)
 	}()
diff --git a/response/api_me.go b/response/api_me.go
@@ -0,0 +1,23 @@
+package response
+
+type MeResponse struct {
+	Success bool     `json:"success"`
+	Result  MeResult `json:"result"`
+}
+
+type MeResult struct {
+	Id           int    `json:"id"`
+	Username     string `json:"username"`
+	Url          string `json:"url"`
+	Website      string `json:"website"`
+	Twitter      string `json:"twitter"`
+	Psn          string `json:"psn"`
+	Github       string `json:"github"`
+	Btc          string `json:"btc"`
+	Location     string `json:"location"`
+	Tagline      string `json:"tagline"`
+	Bio          string `json:"bio"`
+	Created      int    `json:"created"`
+	LastModified int    `json:"last_modified"`
+	Pro          int    `json:"pro"`
+}
diff --git a/response/api_member.go b/response/api_member.go
@@ -1,12 +1,33 @@
 package response
 
+import (
+	"fmt"
+	"strings"
+
+	"github.com/seth-shi/go-v2ex/styles"
+)
+
 type MemberResult struct {
 	Id       int    `json:"id"`
 	Username string `json:"username"`
+	Pro      int    `json:"pro"`
 }
 
 type NodeInfoResult struct {
 	Id    int    `json:"id"`
 	Name  string `json:"name"`
 	Title string `json:"title"`
 }
+
+func (m MemberResult) GetUserNameLabel(meId int) string {
+	var labels []string
+	if m.Pro > 0 {
+		labels = append(labels, styles.MemberPro)
+	}
+
+	if m.Id == meId {
+		labels = append(labels, styles.MemberMe)
+	}
+
+	return fmt.Sprintf("%s%s", m.Username, strings.Join(labels, ""))
+}
diff --git a/response/api_v2_detail.go b/response/api_v2_detail.go
@@ -35,7 +35,7 @@ type SupplementResult struct {
 	renderContent string
 }
 
-func (r V2DetailResult) GetContent() string {
+func (r V2DetailResult) GetContent(w int) string {
 
 	if r.renderContent == "" {
 		var content = r.Content
@@ -47,13 +47,13 @@ func (r V2DetailResult) GetContent() string {
 			}
 		}
 
-		r.renderContent = pkg.SafeRenderHtml(content)
+		r.renderContent = pkg.SafeRenderHtml(content, w)
 	}
 
 	return r.renderContent
 }
 
-func (r SupplementResult) GetContent() string {
+func (r SupplementResult) GetContent(w int) string {
 	if r.renderContent == "" {
 		var content = r.Content
 		// 如果是链接出现多次, 那么只保留一次
@@ -64,7 +64,7 @@ func (r SupplementResult) GetContent() string {
 			}
 		}
 
-		r.renderContent = pkg.SafeRenderHtml(content)
+		r.renderContent = pkg.SafeRenderHtml(content, w)
 	}
 
 	return r.renderContent
diff --git a/response/api_v2_replies.go b/response/api_v2_replies.go
@@ -21,7 +21,7 @@ type V2ReplyResult struct {
 	renderContent string
 }
 
-func (r *V2ReplyResult) GetContent() string {
+func (r *V2ReplyResult) GetContent(w int) string {
 
 	if r.renderContent == "" {
 		var content = r.Content
@@ -33,7 +33,7 @@ func (r *V2ReplyResult) GetContent() string {
 			}
 		}
 
-		r.renderContent = pkg.SafeRenderHtml(content)
+		r.renderContent = pkg.SafeRenderHtml(content, w)
 	}
 
 	return r.renderContent
diff --git a/response/api_v2_token.go b/response/api_v2_token.go
@@ -13,3 +13,6 @@ type v2TokenResult struct {
 	LastUsed    int    `json:"last_used"`
 	Created     int64  `json:"created"`
 }
+
+// TODO 获取个人信息, 显示是自己
+// https://www.v2ex.com/api/v2/member
diff --git a/styles/member.go b/styles/member.go
diff --git a/version.go b/version.go
