da0c30a · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

Merge pull request #253 from charmbracelet/user-message-fixes

da0c30aKujtim Hoxha1 year ago

internal/tui/components/chat/messages/messages.go+15−12

compare with main

unifiedsplit

@@ -193,30 +193,33 @@ func (m *messageCmp) renderAssistantMessage() string {

193 return m.style().Render(joined)

194}

195

196−// renderUserMessage renders user messages with file attachments.

196+// renderUserMessage renders user messages with file attachments. It displays

197−// Displays message content and any attached files with appropriate icons.

197+// message content and any attached files with appropriate icons.

198func (m *messageCmp) renderUserMessage() string {

199 t := styles.CurrentTheme()

200 parts := []string{

201 m.toMarkdown(m.message.Content().String()),

202 }

203+

203 attachmentStyles := t.S().Text.

204 attachmentStyles := t.S().Text.

204 MarginLeft(1).

205 MarginLeft(1).

205 Background(t.BgSubtle)

206 Background(t.BgSubtle)

207+

206− attachments := []string{}

208+ attachments := make([]string, len(m.message.BinaryContent()))

207− for _, attachment := range m.message.BinaryContent() {

209+ for i, attachment := range m.message.BinaryContent() {

210+ const maxFilenameWidth = 10

208− file := filepath.Base(attachment.Path)

211+ filename := filepath.Base(attachment.Path)

209− var filename string

210− if len(file) > 10 {

211− filename = fmt.Sprintf(" %s %s... ", styles.DocumentIcon, file[0:7])

212− } else {

213− filename = fmt.Sprintf(" %s %s ", styles.DocumentIcon, file)

214− }

215− attachments = append(attachments, attachmentStyles.Render(filename))

212+ attachments[i] = attachmentStyles.Render(fmt.Sprintf(

213+ " %s %s ",

214+ styles.DocumentIcon,

215+ ansi.Truncate(filename, maxFilenameWidth, "..."),

216+ ))

216 }

217 }

218+

217 if len(attachments) > 0 {

219 if len(attachments) > 0 {

218 parts = append(parts, "", strings.Join(attachments, ""))

220 parts = append(parts, "", strings.Join(attachments, ""))

219 }

221 }

222+

220 joined := lipgloss.JoinVertical(lipgloss.Left, parts...)

223 joined := lipgloss.JoinVertical(lipgloss.Left, parts...)

221 return m.style().Render(joined)

224 return m.style().Render(joined)

222}

225}