Merge pull request #33 from tulir/initial-sync

Use initial sync data instead of fetching room list, state, history, etc manually

1 files changed, 12 insertions, 2 deletions

diff --git a/ui/messages/textbase.go b/ui/messages/textbase.go
index 0960a57..f44d5d5 100644
--- a/ui/messages/textbase.go
+++ b/ui/messages/textbase.go
@@ -72,8 +72,18 @@ func (msg *BaseTextMessage) calculateBufferWithText(text tstring.TString, width
 				}
 
 				matches := boundaryPattern.FindAllStringIndex(extract.String(), -1)
-				if len(matches) > 0 {
-					extract = extract[:matches[len(matches)-1][1]]
+				if len(matches) == 0 {
+					continue
+				}
+
+				match := matches[len(matches)-1]
+				if len(match) < 2 {
+					continue
+				}
+
+				until := match[1]
+				if until < len(extract) {
+					extract = extract[:until]
 				}
 			}
 			msg.buffer = append(msg.buffer, extract)