Fix scrolling, fix help page

components/chat.go

@@ -270,9 +270,9 @@ func (c *Chat) AddMessage(message Message) {
 	c.Messages = append(c.Messages, message)
 }
 
-// ClearMessages clear the List.Items
+// ClearMessages clear the c.Messages
 func (c *Chat) ClearMessages() {
-	c.List.Items = []string{}
+	c.Messages = make([]Message, 0)
 }
 
 // ScrollUp will render the chat messages based on the Offset of the Chat
@@ -281,13 +281,13 @@ func (c *Chat) ClearMessages() {
 // Offset is 0 when scrolled down. (we loop backwards over the array, so we
 // start with rendering last item in the list at the maximum y of the Chat
 // pane). Increasing the Offset will thus result in substracting the offset
-// from the len(Chat.List.Items).
+// from the len(Chat.Messages).
 func (c *Chat) ScrollUp() {
 	c.Offset = c.Offset + 10
 
 	// Protect overscrolling
-	if c.Offset > len(c.List.Items) {
-		c.Offset = len(c.List.Items)
+	if c.Offset > len(c.Messages) {
+		c.Offset = len(c.Messages)
 	}
 }
 
@@ -297,7 +297,7 @@ func (c *Chat) ScrollUp() {
 // Offset is 0 when scrolled down. (we loop backwards over the array, so we
 // start with rendering last item in the list at the maximum y of the Chat
 // pane). Increasing the Offset will thus result in substracting the offset
-// from the len(Chat.List.Items).
+// from the len(Chat.Messages).
 func (c *Chat) ScrollDown() {
 	c.Offset = c.Offset - 10
 
@@ -313,20 +313,22 @@ func (c *Chat) SetBorderLabel(channelName string) {
 }
 
 // Help shows the usage and key bindings in the chat pane
-func (c *Chat) Help(cfg *config.Config) {
-	help := []string{
-		"slack-term - slack client for your terminal",
-		"",
-		"USAGE:",
-		"    slack-term -config [path-to-config]",
-		"",
-		"KEY BINDINGS:",
-		"",
+func (c *Chat) Help(usage string, cfg *config.Config) {
+	help := []Message{
+		Message{
+			Content: usage,
+		},
 	}
 
 	for mode, mapping := range cfg.KeyMap {
-		help = append(help, fmt.Sprintf("    %s", strings.ToUpper(mode)))
-		help = append(help, "")
+		help = append(
+			help,
+			Message{
+				Content: fmt.Sprintf("%s", strings.ToUpper(mode)),
+			},
+		)
+
+		help = append(help, Message{Content: ""})
 
 		var keys []string
 		for k := range mapping {
@@ -335,10 +337,16 @@ func (c *Chat) Help(cfg *config.Config) {
 		sort.Strings(keys)
 
 		for _, k := range keys {
-			help = append(help, fmt.Sprintf("    %-12s%-15s", k, mapping[k]))
+			help = append(
+				help,
+				Message{
+					Content: fmt.Sprintf("    %-12s%-15s", k, mapping[k]),
+				},
+			)
 		}
-		help = append(help, "")
+
+		help = append(help, Message{Content: ""})
 	}
 
-	c.List.Items = help
+	c.Messages = help
 }

context/context.go

@@ -22,6 +22,8 @@ const (
 )
 
 type AppContext struct {
+	Version    string
+	Usage      string
 	EventQueue chan termbox.Event
 	Service    *service.SlackService
 	Body       *termui.Grid
@@ -34,7 +36,7 @@ type AppContext struct {
 
 // CreateAppContext creates an application context which can be passed
 // and referenced througout the application
-func CreateAppContext(flgConfig string, flgToken string, flgDebug bool) (*AppContext, error) {
+func CreateAppContext(flgConfig string, flgToken string, flgDebug bool, version string, usage string) (*AppContext, error) {
 	if flgDebug {
 		go func() {
 			http.ListenAndServe(":6060", nil)
@@ -110,6 +112,8 @@ func CreateAppContext(flgConfig string, flgToken string, flgDebug bool) (*AppCon
 	termui.Render(termui.Body)
 
 	return &AppContext{
+		Version:    version,
+		Usage:      usage,
 		EventQueue: make(chan termbox.Event, 20),
 		Service:    svc,
 		Body:       termui.Body,

handlers/event.go

@@ -444,7 +444,7 @@ func actionScrollDownChat(ctx *context.AppContext) {
 }
 
 func actionHelp(ctx *context.AppContext) {
-	ctx.View.Chat.Help(ctx.Config)
+	ctx.View.Chat.Help(ctx.Usage, ctx.Config)
 	termui.Render(ctx.View.Chat)
 }
 

main.go

@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	VERSION = "v0.4.0"
+	VERSION = "v0.4.1"
 	USAGE   = `NAME:
     slack-term - slack client for your terminal
 
@@ -30,7 +30,10 @@ WEBSITE:
     https://github.com/erroneousboat/slack-term
 
 GLOBAL OPTIONS:
-   --help, -h
+   -config [path-to-config-file]
+   -token [slack-token]
+   -debug
+   -help, -h
 `
 )
 
@@ -95,7 +98,10 @@ func main() {
 	termui.DefaultEvtStream = customEvtStream
 
 	// Create context
-	ctx, err := context.CreateAppContext(flgConfig, flgToken, flgDebug)
+	usage := fmt.Sprintf(USAGE, VERSION)
+	ctx, err := context.CreateAppContext(
+		flgConfig, flgToken, flgDebug, VERSION, usage,
+	)
 	if err != nil {
 		termbox.Close()
 		log.Println(err)