From 0b896e161111433d6e37ff3fd2cecacf6a948ac6 Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:25:05 +0100
Subject: [PATCH] Create v0.2.2 release, *actually* fix viewport wrap

---
 changelog.md   | 9 ++++++++-
 client/main.go | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index 454e5b4..163f78e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [0.2.2] - 2024-06-01
+
+### Fixed
+
+- Messages *actually* wrap properly with terminal viewport width this time
+
 ## [0.2.1] - 2024-05-31
 
 ### Fixed
@@ -65,7 +71,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Go programs for [client](./tui/main.go) and [server](./server/main.go)
 - GitHub Actions release flow, including binaries
 
-[unreleased]: https://github.com/supleed2/go-chat/compare/v0.2.1...HEAD
+[unreleased]: https://github.com/supleed2/go-chat/compare/v0.2.2...HEAD
+[0.2.2]: https://github.com/supleed2/go-chat/releases/tag/v0.2.2
 [0.2.1]: https://github.com/supleed2/go-chat/releases/tag/v0.2.1
 [0.2.0]: https://github.com/supleed2/go-chat/releases/tag/v0.2.0
 [0.1.2]: https://github.com/supleed2/go-chat/releases/tag/v0.1.2
diff --git a/client/main.go b/client/main.go
index 961a3fd..cb717ab 100644
--- a/client/main.go
+++ b/client/main.go
@@ -181,7 +181,7 @@ func initModel(ctx context.Context, conn *ws.Conn, a args, tz time.Location) mod
 		showTim: a.Timestamps,
 		tz:      tz,
 		history: vp,
-		idStyle: lipgloss.NewStyle(),
+		idStyle: lipgloss.NewStyle().Width(60),
 		pStyle:  lipgloss.NewStyle().Bold(true),
 		help:    help.New(),
 		recvCh:  recvCh,
@@ -250,7 +250,8 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.history.Width = msg.Width
 		m.history.GotoBottom()
 		m.input.Width = msg.Width - 3
-		m.help.Width = msg.Width - 1
+		m.idStyle = m.idStyle.Width(msg.Width)
+		m.help.Width = msg.Width
 		m.history.SetContent(m.viewMessages())
 	}