From 095b982603c26e250e61cf006157019e2b55be74 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 20 Mar 2018 19:14:39 +0200
Subject: Show messages in message view while sending

---
 ui/types/message.go | 62 ++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

(limited to 'ui/types')

diff --git a/ui/types/message.go b/ui/types/message.go
index 8899a7d..7b96193 100644
--- a/ui/types/message.go
+++ b/ui/types/message.go
@@ -25,24 +25,26 @@ import (
 )
 
 type Message struct {
-	ID        string
-	Sender    string
-	Text      string
-	Timestamp string
-	Date      string
-
-	Buffer      []string
-	SenderColor tcell.Color
+	BasicMeta
+	ID              string
+	Text            string
+	Buffer          []string
+	prevBufferWidth int
 }
 
 func NewMessage(id, sender, text, timestamp, date string, senderColor tcell.Color) *Message {
 	return &Message{
-		ID:          id,
-		Sender:      sender,
-		Text:        text,
-		Timestamp:   timestamp,
-		Date:        date,
-		SenderColor: senderColor,
+		BasicMeta: BasicMeta{
+			Sender:         sender,
+			Timestamp:      timestamp,
+			Date:           date,
+			SenderColor:    senderColor,
+			TextColor:      tcell.ColorDefault,
+			TimestampColor: tcell.ColorDefault,
+		},
+		Text:            text,
+		ID:              id,
+		prevBufferWidth: 0,
 	}
 }
 
@@ -51,6 +53,13 @@ var (
 	spacePattern    = regexp.MustCompile(`\s+`)
 )
 
+func (message *Message) CopyTo(to *Message) {
+	to.BasicMeta = message.BasicMeta
+	to.ID = message.ID
+	to.Text = message.Text
+	to.RecalculateBuffer()
+}
+
 func (message *Message) CalculateBuffer(width int) {
 	if width < 1 {
 		return
@@ -82,28 +91,9 @@ func (message *Message) CalculateBuffer(width int) {
 			str = str[len(extract):]
 		}
 	}
+	message.prevBufferWidth = width
 }
 
-func (message *Message) GetSender() string {
-	return message.Sender
-}
-
-func (message *Message) GetSenderColor() tcell.Color {
-	return message.SenderColor
-}
-
-func (message *Message) GetTimestamp() string {
-	return message.Timestamp
-}
-
-func (message *Message) GetDate() string {
-	return message.Date
-}
-
-func (message *Message) GetTextColor() tcell.Color {
-	return tcell.ColorDefault
-}
-
-func (message *Message) GetTimestampColor() tcell.Color {
-	return tcell.ColorDefault
+func (message *Message) RecalculateBuffer() {
+	message.CalculateBuffer(message.prevBufferWidth)
 }
-- 
cgit v1.2.3