From 15f95fb617ed3b468cb10ec9b7bc6fe831ee636c Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Sun, 24 May 2026 19:25:27 -0400
Subject: [PATCH] refactor(chat): add isMe helper to dedupe self-author checks

---
 internal/ui/chat/messages_list.go | 14 +++++---------
 internal/ui/chat/model.go         |  5 +++++
 internal/ui/chat/state.go         |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/internal/ui/chat/messages_list.go b/internal/ui/chat/messages_list.go
index 97ee1af..e95b766 100644
--- a/internal/ui/chat/messages_list.go
+++ b/internal/ui/chat/messages_list.go
@@ -1273,8 +1273,7 @@ func (ml *messagesList) editSelectedMessage() tview.Cmd {
 		return nil
 	}
 
-	me, _ := ml.chat.state.Cabinet.Me()
-	if selectedMessage.Author.ID != me.ID {
+	if !ml.chat.isMe(selectedMessage.Author.ID) {
 		slog.Error("failed to edit message; not the author", "channel_id", selectedMessage.ChannelID, "message_id", selectedMessage.ID)
 		return nil
 	}
@@ -1309,8 +1308,7 @@ func (ml *messagesList) deleteSelectedMessage() tview.Cmd {
 
 	return func() tview.Msg {
 		if selectedMessage.GuildID.IsValid() {
-			me, _ := ml.chat.state.Cabinet.Me()
-			if selectedMessage.Author.ID != me.ID && !ml.chat.state.HasPermissions(selectedMessage.ChannelID, discord.PermissionManageMessages) {
+			if !ml.chat.isMe(selectedMessage.Author.ID) && !ml.chat.state.HasPermissions(selectedMessage.ChannelID, discord.PermissionManageMessages) {
 				slog.Error("failed to delete message; missing relevant permissions", "channel_id", selectedMessage.ChannelID, "message_id", selectedMessage.ID)
 				return nil
 			}
@@ -1402,8 +1400,7 @@ func (ml *messagesList) ShortHelp() []keybind.Keybind {
 	}
 
 	if selectedMessage, ok := ml.selectedMessage(); ok {
-		me, _ := ml.chat.state.Cabinet.Me()
-		if selectedMessage.Author.ID != me.ID {
+		if !ml.chat.isMe(selectedMessage.Author.ID) {
 			help = append(help, cfg.Reply.Keybind)
 		}
 	}
@@ -1423,9 +1420,8 @@ func (ml *messagesList) FullHelp() [][]keybind.Keybind {
 		canSelectReply = selectedMessage.ReferencedMessage != nil
 		canOpen = len(messageURLs(*selectedMessage)) != 0 || len(selectedMessage.Attachments) != 0
 
-		me, _ := ml.chat.state.Cabinet.Me()
-		canReply = selectedMessage.Author.ID != me.ID
-		canEdit = selectedMessage.Author.ID == me.ID
+		canEdit = ml.chat.isMe(selectedMessage.Author.ID)
+		canReply = !canEdit
 		canDelete = canEdit
 		if !canDelete {
 			selectedChannel, ok := ml.chat.SelectedChannel()
diff --git a/internal/ui/chat/model.go b/internal/ui/chat/model.go
index bdd3c74..1ae593d 100644
--- a/internal/ui/chat/model.go
+++ b/internal/ui/chat/model.go
@@ -122,6 +122,11 @@ func (m *Model) SetSelectedChannel(channel *discord.Channel) {
 	m.selectedChannelMu.Unlock()
 }
 
+func (m *Model) isMe(id discord.UserID) bool {
+	me, _ := m.state.Cabinet.Me()
+	return me != nil && id == me.ID
+}
+
 func (m *Model) buildLayout() {
 	m.Clear()
 	m.rightFlex.Clear()
diff --git a/internal/ui/chat/state.go b/internal/ui/chat/state.go
index a9dce9c..dd6b6c2 100644
--- a/internal/ui/chat/state.go
+++ b/internal/ui/chat/state.go
@@ -180,8 +180,7 @@ func (m *Model) onTypingStart(event *gateway.TypingStartEvent) {
 		return
 	}
 
-	me, _ := m.state.Cabinet.Me()
-	if event.UserID == me.ID {
+	if m.isMe(event.UserID) {
 		return
 	}