allow backlog to be read, improve code separation

- Fixes #20

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+open_collective: #normen
+ko_fi: normen
+patreon: #normen
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -2,31 +2,7 @@
 
 A command line interface for whatsapp, based on [go-whatsapp](https://github.com/Rhymen/go-whatsapp) and [tview](https://github.com/rivo/tview)
 
-```
-┌─────────────────────────────────────────────────────────────────────────┐
-│ WhatsCLI v0.4.2  Help: /name NewName | /addname 123456 NewName | /quit |│
-├──────────────────────────────┬──────────────────────────────────────────┤
-│Contacts                      │(03-14-12 22:59:00) Me: Hey, whatscli here│
-│├──Peter                      │(03-14-12 23:00:00) Peter: Cool 😀        │
-│├──Paul                       │                                          │
-│└──Mary                       │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              │                                          │
-│                              ├──────────────────────────────────────────┤
-│                              │Yeah, love the shell!                     │
-└──────────────────────────────┴──────────────────────────────────────────┘
-```
+![whatscli-screenshot](/doc/screenshot.png?raw=true "WhatsCLI 0.6.5")
 
 ## Features
 
@@ -40,22 +16,37 @@ Things that work.
 
 ### Caveats
 
-This is a WIP. Heres some things you might expect to work that don't. Plus some other things I should mention.
+This is a WIP and mainly meant for my personal use. Heres some things you might expect to work that don't. Plus some other things I should mention.
 
 - Only shows existing chats
 - Only fetches a few old messages
 - No incoming message notification / count
 - No proper connection drop handling
-- Not configurable at all
-- Leaves its config files in your home folder
+- No uploading of images/video/audio/data
 - FaceBook obviously doesn't endorse or like these kinds of apps and they're likely to break when FaceBook changes stuff in their web app
 
 ## Installation / Usage
 
 How to get it running and how to use it
 
+### Latest Release
+
+Always fresh, always up to date.
+
 - Download a release
 - Put the binary in your PATH (optional)
 - Run with `whatscli` (or double-click)
-- Scan the QR code with WhatsApp on your phone (maybe resize shell)
+- Scan the QR code with WhatsApp on your phone (resize shell or change font size to see whole code)
+
+### Package Managers
+
+Some ways to install via package managers are supported but the installed version might be out of date.
+
+#### MacOS (homebrew)
+
+- `brew install normen/tap/whatscli`
+
+#### Arch Linux (AUR)
+
+- `https://aur.archlinux.org/packages/whatscli/`
 

config/settings.go

@@ -0,0 +1,152 @@
+package config
+
+import (
+	"fmt"
+	"os"
+	"os/user"
+
+	"github.com/adrg/xdg"
+	"github.com/gdamore/tcell/v2"
+	"gitlab.com/tslocum/cbind"
+	"gopkg.in/ini.v1"
+)
+
+var configFilePath string
+var keyConfig *cbind.Configuration
+var cfg *ini.File
+
+func InitConfig() {
+	var err error
+	if configFilePath, err = xdg.ConfigFile("whatscli/whatscli.config"); err == nil {
+		if cfg, err = ini.Load(configFilePath); err == nil {
+			//TODO: check config for new parameters
+			if section, err := cfg.GetSection("keymap"); err == nil {
+				if _, err := section.GetKey("command_backlog"); err != nil {
+					section.NewKey("command_backlog", "Ctrl+b")
+					err = cfg.SaveTo(configFilePath)
+				}
+			}
+			if section, err := cfg.GetSection("colors"); err == nil {
+				if _, err := section.GetKey("borders"); err != nil {
+					section.NewKey("borders", "white")
+					err = cfg.SaveTo(configFilePath)
+				}
+				if _, err := section.GetKey("input_background"); err != nil {
+					section.NewKey("input_background", "blue")
+					err = cfg.SaveTo(configFilePath)
+				}
+				if _, err := section.GetKey("input_text"); err != nil {
+					section.NewKey("input_text", "white")
+					err = cfg.SaveTo(configFilePath)
+				}
+			}
+		} else {
+			cfg = ini.Empty()
+			cfg.NewSection("general")
+			cfg.Section("general").NewKey("download_path", GetHomeDir()+"Downloads")
+			cfg.Section("general").NewKey("preview_path", GetHomeDir()+"Downloads")
+			cfg.NewSection("keymap")
+			cfg.Section("keymap").NewKey("switch_panels", "Tab")
+			cfg.Section("keymap").NewKey("focus_messages", "Ctrl+w")
+			cfg.Section("keymap").NewKey("focus_input", "Ctrl+Space")
+			cfg.Section("keymap").NewKey("focus_contacts", "Ctrl+e")
+			cfg.Section("keymap").NewKey("command_backlog", "Ctrl+b")
+			cfg.Section("keymap").NewKey("command_connect", "Ctrl+r")
+			cfg.Section("keymap").NewKey("command_quit", "Ctrl+q")
+			cfg.Section("keymap").NewKey("command_help", "Ctrl+?")
+			cfg.Section("keymap").NewKey("message_download", "d")
+			cfg.Section("keymap").NewKey("message_open", "o")
+			cfg.Section("keymap").NewKey("message_show", "s")
+			cfg.Section("keymap").NewKey("message_info", "i")
+			cfg.NewSection("ui")
+			cfg.Section("ui").NewKey("contact_sidebar_width", "30")
+			cfg.NewSection("colors")
+			cfg.Section("colors").NewKey("background", "black")
+			cfg.Section("colors").NewKey("text", "white")
+			cfg.Section("colors").NewKey("list_header", "yellow")
+			cfg.Section("colors").NewKey("list_contact", "green")
+			cfg.Section("colors").NewKey("list_group", "blue")
+			cfg.Section("colors").NewKey("chat_contact", "green")
+			cfg.Section("colors").NewKey("chat_me", "blue")
+			cfg.Section("colors").NewKey("borders", "white")
+			cfg.Section("colors").NewKey("input_background", "blue")
+			cfg.Section("colors").NewKey("input_text", "white")
+			err = cfg.SaveTo(configFilePath)
+		}
+	}
+	if err != nil {
+		fmt.Printf(err.Error())
+	}
+}
+
+func GetConfigFilePath() string {
+	return configFilePath
+}
+
+func GetSessionFilePath() string {
+	if sessionFilePath, err := xdg.ConfigFile("whatscli/session"); err == nil {
+		return sessionFilePath
+	}
+	return GetHomeDir() + ".whatscli.session"
+}
+
+func GetContactsFilePath() string {
+	if sessionFilePath, err := xdg.ConfigFile("whatscli/contacts"); err == nil {
+		return sessionFilePath
+	}
+	return GetHomeDir() + ".whatscli.contacts"
+}
+
+func GetKey(name string) string {
+	if sec, err := cfg.GetSection("keymap"); err == nil {
+		if key, err := sec.GetKey(name); err == nil {
+			return key.String()
+		}
+	}
+	return ""
+}
+
+func GetColorName(key string) string {
+	if sec, err := cfg.GetSection("colors"); err == nil {
+		if key, err := sec.GetKey(key); err == nil {
+			return key.String()
+		}
+	}
+	return "white"
+}
+
+func GetColor(key string) tcell.Color {
+	name := GetColorName(key)
+	if color, ok := tcell.ColorNames[name]; ok {
+		return color
+	}
+	return tcell.ColorWhite
+}
+
+func GetSetting(name string) string {
+	if sec, err := cfg.GetSection("general"); err == nil {
+		if key, err := sec.GetKey(name); err == nil {
+			return key.String()
+		}
+	}
+	return ""
+}
+
+func GetIntSetting(section string, name string) int {
+	if sec, err := cfg.GetSection(section); err == nil {
+		if key, err := sec.GetKey(name); err == nil {
+			if val, err := key.Int(); err == nil {
+				return val
+			}
+		}
+	}
+	return 0
+}
+
+// gets the OS home dir with a path separator at the end
+func GetHomeDir() string {
+	usr, err := user.Current()
+	if err != nil {
+	}
+	return usr.HomeDir + string(os.PathSeparator)
+}

go.mod

@@ -4,6 +4,7 @@ go 1.15
 
 require (
 	github.com/Rhymen/go-whatsapp v0.1.1
+	github.com/adrg/xdg v0.2.3
 	github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591
 	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
@@ -13,8 +14,10 @@ require (
 	github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
+	gitlab.com/tslocum/cbind v0.1.3
 	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect
-	golang.org/x/sys v0.0.0-20201118182958-a01c418693c7 // indirect
+	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
 	golang.org/x/text v0.3.4 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/ini.v1 v1.62.0
 )

go.sum

@@ -1,44 +1,28 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Rhymen/go-whatsapp v0.0.0/go.mod h1:rdQr95g2C1xcOfM7QGOhza58HeI3I+tZ/bbluv7VazA=
-github.com/Rhymen/go-whatsapp v0.1.0 h1:XTXhFIQ/fx9jKObUnUX2Q+nh58EyeHNhX7DniE8xeuA=
-github.com/Rhymen/go-whatsapp v0.1.0/go.mod h1:xJSy+okeRjKkQEH/lEYrnekXB3PG33fqL0I6ncAkV50=
-github.com/Rhymen/go-whatsapp v0.1.1-0.20201007125822-005103751b7a h1:LW+rX0NY6LzMPa2hJcgmQlfiFJUihzOMAaIoCq+P3xc=
-github.com/Rhymen/go-whatsapp v0.1.1-0.20201007125822-005103751b7a/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
-github.com/Rhymen/go-whatsapp v0.1.1-0.20201117204225-79ad714fa46a h1:IhYU0cQ0cvMO9MOuOO08X8zUtMQ+AVIV0D+7eZVtHe8=
-github.com/Rhymen/go-whatsapp v0.1.1-0.20201117204225-79ad714fa46a/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
 github.com/Rhymen/go-whatsapp v0.1.1 h1:OK+bCugQcr2YjyYKeDzULqCtM50TPUFM6LvQtszKfcw=
 github.com/Rhymen/go-whatsapp v0.1.1/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
 github.com/Rhymen/go-whatsapp/examples/echo v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:zgCiQtBtZ4P4gFWvwl9aashsdwOcbb/EHOGRmSzM8ME=
 github.com/Rhymen/go-whatsapp/examples/restoreSession v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:5sCUSpG616ZoSJhlt9iBNI/KXBqrVLcNUJqg7J9+8pU=
 github.com/Rhymen/go-whatsapp/examples/sendImage v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:RdiyhanVEGXTam+mZ3k6Y3VDCCvXYCwReOoxGozqhHw=
 github.com/Rhymen/go-whatsapp/examples/sendTextMessages v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:suwzklatySS3Q0+NCxCDh5hYfgXdQUWU1DNcxwAxStM=
-github.com/SchulteMK/go-whatsapp v0.0.0-20201117193111-50e7347bfbb6 h1:Rsit49rPlurIGzQn9VGOPph0pNjUX+bo+9Lg51D8rn0=
-github.com/SchulteMK/go-whatsapp v0.0.0-20201117193111-50e7347bfbb6/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
+github.com/adrg/xdg v0.2.3 h1:GxXngdYxNDkoUvZXjNJGwqZxWXi43MKbOOlA/00qZi4=
+github.com/adrg/xdg v0.2.3/go.mod h1:7I2hH/IT30IsupOpKZ5ue7/qNi3CoKzD6tL3HwpaRMQ=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=
-github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0=
-github.com/gdamore/tcell/v2 v2.0.0 h1:GRWG8aLfWAlekj9Q6W29bVvkHENc6hp79XOqG4AWDOs=
-github.com/gdamore/tcell/v2 v2.0.0/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
+github.com/gdamore/tcell/v2 v2.0.0-dev/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
 github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7NxVyGo8M3KI5jbkiwNAdZFFzAdC68up4=
 github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
-github.com/gen2brain/beeep v0.0.0-20200526185328-e9c15c258e28 h1:M2Zt3G2w6Q57GZndOYk42p7RvMeO8izO8yKTfIxGqxA=
-github.com/gen2brain/beeep v0.0.0-20200526185328-e9c15c258e28/go.mod h1:ElSskYZe3oM8kThaHGJ+kiN2yyUMVXMZ7WxF9QqLDS8=
-github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=
-github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=
-github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
-github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk=
 github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
@@ -54,61 +38,42 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c h1:16eHWuMGvCjSfgRJKqIzapE78onvvTbdi1rMkU00lZw=
-github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherwasm v1.1.0 h1:fA2uLoctU5+T3OhOn2vYP0DVT6pxc7xhTlBB1paATqQ=
-github.com/gopherjs/gopherwasm v1.1.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.5 h1:tHXDdz1cpzGaovsTB+TVB8q90WEokoVmfMqoVcrLUgw=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
-github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rivo/tview v0.0.0-20201018122409-d551c850a743 h1:9BBjVJTRxuYBeCAv9DFH2hSzY0ujLx5sxMg5D3K/Xeg=
-github.com/rivo/tview v0.0.0-20201018122409-d551c850a743/go.mod h1:t7mcA3nlK9dxD1DMoz/DQRMWFMkGBUj6rJBM5VNfLFA=
-github.com/rivo/tview v0.0.0-20201117185959-f9f2182520da h1:XUh+g7tjO81Ph5+7GSco4VLrBbQPnakm8M6sQU+fT5Y=
-github.com/rivo/tview v0.0.0-20201117185959-f9f2182520da/go.mod h1:0ha5CGekam8ZV1kxkBxSlh7gfQ7YolUj2P/VruwH0QY=
 github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893 h1:24As98PZlIdjZn6V4wUulAbYlG7RPg/du9A1FZdT/vs=
 github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893/go.mod h1:0ha5CGekam8ZV1kxkBxSlh7gfQ7YolUj2P/VruwH0QY=
-github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af h1:6yITBqGTE2lEeTPG04SN9W+iWHCRyHqlVYILiSXziwk=
-github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af/go.mod h1:4F09kP5F+am0jAwlQLddpoMDM+iewkxxt6nxUQ5nq5o=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gitlab.com/tslocum/cbind v0.1.3 h1:FT/fTQ4Yj3eo5021lB3IbkIt8eVtYGhrw/xur+cjvUU=
+gitlab.com/tslocum/cbind v0.1.3/go.mod h1:RvwYE3auSjBNlCmWeGspzn+jdLUVQ8C2QGC+0nP9ChI=
 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582 h1:0WDrJ1E7UolDk1KhTXxxw3Fc8qtk5x7dHP431KHEJls=
-golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582/go.mod h1:tCqSYrHVcf3i63Co2FzBkTCo2gdF6Zak62921dSfraU=
 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -128,27 +93,17 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 h1:XtNJkfEjb4zR3q20BBBcYUykVOEMgZeIUOpBPfNYgxg=
+golang.org/x/sys v0.0.0-20201013132646-2da7054afaeb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48 h1:AYCWBZhgIw6XobZ5CibNJr0Rc4ZofGGKvWa1vcx2IGk=
-golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637 h1:O5hKNaGxIT4A8OTMnuh6UpmBdI3SAPxlZ3g0olDrJVM=
-golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7 h1:s330+6z/Ko3J0o6rvOcwXe5nzs7UT9tLKHoOXYn6uE0=
-golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201118182958-a01c418693c7 h1:Z991aAXPjz0tLnj74pVXW3eWJ5lHMIBvbRfMq4M2jHA=
-golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -173,10 +128,13 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

main.go

@@ -1,27 +1,23 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
+	"io"
+	"os/exec"
 	"strings"
 	"time"
 
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/gdamore/tcell/v2"
+	"github.com/normen/whatscli/config"
 	"github.com/normen/whatscli/messages"
 	"github.com/rivo/tview"
+	"github.com/skratchdot/open-golang/open"
+	"gitlab.com/tslocum/cbind"
 )
 
-type waMsg struct {
-	Wid  string
-	Text string
-}
-
-var VERSION string = "v0.6.1"
-
-var sendChannel chan waMsg
-var textChannel chan whatsapp.TextMessage
-var otherChannel chan interface{}
-var contactChannel chan whatsapp.Contact
+var VERSION string = "v0.8.0"
 
 var sndTxt string = ""
 var currentReceiver string = ""
@@ -32,27 +28,35 @@ var textInput *tview.InputField
 var topBar *tview.TextView
 
 //var infoBar *tview.TextView
-var msgStore messages.MessageDatabase
+var sessionManager *messages.SessionManager
+var keyBindings *cbind.Configuration
 
 var contactRoot *tview.TreeNode
-var handler textHandler
 var app *tview.Application
+var uiHandler messages.UiMessageHandler
 
 func main() {
-	msgStore = messages.MessageDatabase{}
-	msgStore.Init()
+	config.InitConfig()
+	uiHandler = UiHandler{}
+	sessionManager = &messages.SessionManager{}
+	sessionManager.Init(uiHandler)
 	messages.LoadContacts()
+
 	app = tview.NewApplication()
+
+	sideBarWidth := config.GetIntSetting("ui", "contact_sidebar_width")
 	gridLayout := tview.NewGrid()
 	gridLayout.SetRows(1, 0, 1)
-	gridLayout.SetColumns(30, 0, 30)
+	gridLayout.SetColumns(sideBarWidth, 0, sideBarWidth)
 	gridLayout.SetBorders(true)
-	gridLayout.SetBackgroundColor(tcell.ColorBlack)
+	gridLayout.SetBackgroundColor(config.GetColor("background"))
+	gridLayout.SetBordersColor(config.GetColor("borders"))
 
 	topBar = tview.NewTextView()
 	topBar.SetDynamicColors(true)
 	topBar.SetScrollable(false)
 	topBar.SetText("[::b] WhatsCLI " + VERSION + "  [-::d]Type /help for help")
+	topBar.SetBackgroundColor(config.GetColor("background"))
 
 	//infoBar = tview.NewTextView()
 	//infoBar.SetDynamicColors(true)
@@ -65,100 +69,22 @@ func main() {
 		SetChangedFunc(func() {
 			app.Draw()
 		})
-
-	textView.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		if event.Key() == tcell.KeyCtrlE {
-			app.SetFocus(treeView)
-			return nil
-		}
-		if event.Key() == tcell.KeyCtrlSpace {
-			app.SetFocus(textInput)
-			return nil
-		}
-		if event.Key() == tcell.KeyTab {
-			app.SetFocus(textInput)
-			return event
-		}
-		if curRegions == nil || len(curRegions) == 0 {
-			return event
-		}
-		if event.Key() == tcell.KeyDown || event.Rune() == 'j' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				newId := GetOffsetMsgId(hls[0], 1)
-				if newId != "" {
-					textView.Highlight(newId)
-				}
-			} else {
-				textView.Highlight(curRegions[0])
-			}
-			textView.ScrollToHighlight()
-			return nil
-		}
-		if event.Key() == tcell.KeyUp || event.Rune() == 'k' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				newId := GetOffsetMsgId(hls[0], -1)
-				if newId != "" {
-					textView.Highlight(newId)
-				}
-			} else {
-				textView.Highlight(curRegions[len(curRegions)-1])
-			}
-			textView.ScrollToHighlight()
-			return nil
-		}
-		if event.Rune() == 'G' {
-			textView.Highlight(curRegions[len(curRegions)-1])
-			textView.ScrollToHighlight()
-			return nil
-		}
-		if event.Rune() == 'g' {
-			textView.Highlight(curRegions[0])
-			textView.ScrollToHighlight()
-			return nil
-		}
-		if event.Rune() == 'd' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				DownloadMessageId(hls[0], false)
-			}
-			return nil
-		}
-		if event.Rune() == 'o' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				DownloadMessageId(hls[0], true)
-			}
-			return nil
-		}
-		return event
-	})
+	textView.SetBackgroundColor(config.GetColor("background"))
+	textView.SetTextColor(config.GetColor("text"))
 
 	// TODO: add better way
-	messages.SetTextView(textView)
+	sessionManager.SetTextView(textView)
 	PrintHelp()
 
-	//textView.SetBorder(true)
-
 	textInput = tview.NewInputField()
+	textInput.SetBackgroundColor(config.GetColor("background"))
+	textInput.SetFieldBackgroundColor(config.GetColor("input_background"))
+	textInput.SetFieldTextColor(config.GetColor("input_text"))
 	textInput.SetChangedFunc(func(change string) {
 		sndTxt = change
 	})
 	textInput.SetDoneFunc(EnterCommand)
 	textInput.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		if event.Key() == tcell.KeyCtrlE {
-			app.SetFocus(treeView)
-			return nil
-		}
-		if event.Key() == tcell.KeyCtrlW {
-			app.SetFocus(textView)
-			return nil
-		}
-		if event.Key() == tcell.KeyTab {
-			app.SetFocus(treeView)
-			return nil
-		}
 		if event.Key() == tcell.KeyDown {
 			offset, _ := textView.GetScrollOffset()
 			offset += 1
@@ -196,10 +122,11 @@ func main() {
 	app.EnableMouse(true)
 	app.SetFocus(textInput)
 	go func() {
-		if err := StartTextReceiver(); err != nil {
-			fmt.Fprintln(textView, "[red]", err, "[-]")
+		if err := sessionManager.StartTextReceiver(); err != nil {
+			PrintError(err)
 		}
 	}()
+	LoadShortcuts()
 	app.Run()
 }
 
@@ -207,10 +134,11 @@ func main() {
 func MakeTree() *tview.TreeView {
 	rootDir := "Contacts"
 	contactRoot = tview.NewTreeNode(rootDir).
-		SetColor(tcell.ColorYellow)
+		SetColor(config.GetColor("list_header"))
 	treeView = tview.NewTreeView().
 		SetRoot(contactRoot).
 		SetCurrentNode(contactRoot)
+	treeView.SetBackgroundColor(config.GetColor("background"))
 
 	// If a contact was selected, open it.
 	treeView.SetChangedFunc(func(node *tview.TreeNode) {
@@ -228,42 +156,242 @@ func MakeTree() *tview.TreeView {
 			node.SetExpanded(!node.IsExpanded())
 		}
 	})
-	treeView.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		if event.Key() == tcell.KeyTab {
-			app.SetFocus(textInput)
-			return nil
-		}
-		if event.Key() == tcell.KeyCtrlSpace {
-			app.SetFocus(textInput)
-			return nil
-		}
-		if event.Key() == tcell.KeyCtrlW {
-			app.SetFocus(textView)
-			return nil
-		}
-		return event
-	})
 	return treeView
 }
 
+func handleFocusMessage(ev *tcell.EventKey) *tcell.EventKey {
+	if !textView.HasFocus() {
+		app.SetFocus(textView)
+		if curRegions != nil && len(curRegions) > 0 {
+			textView.Highlight(curRegions[len(curRegions)-1])
+		}
+	}
+	return nil
+}
+
+func handleFocusInput(ev *tcell.EventKey) *tcell.EventKey {
+	ResetMsgSelection()
+	if !textInput.HasFocus() {
+		app.SetFocus(textInput)
+	}
+	return nil
+}
+
+func handleFocusContacts(ev *tcell.EventKey) *tcell.EventKey {
+	ResetMsgSelection()
+	if !treeView.HasFocus() {
+		app.SetFocus(treeView)
+	}
+	return nil
+}
+
+func handleSwitchPanels(ev *tcell.EventKey) *tcell.EventKey {
+	ResetMsgSelection()
+	if !textInput.HasFocus() {
+		app.SetFocus(textInput)
+	} else {
+		app.SetFocus(treeView)
+	}
+	return nil
+}
+
+func handleCommand(command string) func(ev *tcell.EventKey) *tcell.EventKey {
+	return func(ev *tcell.EventKey) *tcell.EventKey {
+		sessionManager.CommandChannel <- command
+		return nil
+	}
+}
+
+func handleQuit(ev *tcell.EventKey) *tcell.EventKey {
+	sessionManager.CommandChannel <- "disconnect"
+	app.Stop()
+	return nil
+}
+
+func handleHelp(ev *tcell.EventKey) *tcell.EventKey {
+	PrintHelp()
+	return nil
+}
+
+func handleDownload(ev *tcell.EventKey) *tcell.EventKey {
+	hls := textView.GetHighlights()
+	if len(hls) > 0 {
+		go DownloadMessageId(hls[0], false)
+		ResetMsgSelection()
+		app.SetFocus(textInput)
+	}
+	return nil
+}
+
+func handleOpen(ev *tcell.EventKey) *tcell.EventKey {
+	hls := textView.GetHighlights()
+	if len(hls) > 0 {
+		go DownloadMessageId(hls[0], true)
+		ResetMsgSelection()
+		app.SetFocus(textInput)
+	}
+	return nil
+}
+
+func handleShow(ev *tcell.EventKey) *tcell.EventKey {
+	hls := textView.GetHighlights()
+	if len(hls) > 0 {
+		go PrintImage(hls[0])
+		ResetMsgSelection()
+		app.SetFocus(textInput)
+	}
+	return nil
+}
+
+func handleInfo(ev *tcell.EventKey) *tcell.EventKey {
+	hls := textView.GetHighlights()
+	if len(hls) > 0 {
+		//TODO: command msg info
+		//PrintText(msgStore.GetMessageInfo(hls[0]))
+		ResetMsgSelection()
+		app.SetFocus(textInput)
+	}
+	return nil
+}
+
+func handleMessagesUp(ev *tcell.EventKey) *tcell.EventKey {
+	if curRegions == nil || len(curRegions) == 0 {
+		return nil
+	}
+	hls := textView.GetHighlights()
+	if len(hls) > 0 {
+		newId := GetOffsetMsgId(hls[0], -1)
+		if newId != "" {
+			textView.Highlight(newId)
+		}
+	} else {
+		textView.Highlight(curRegions[len(curRegions)-1])
+	}
+	textView.ScrollToHighlight()
+	return nil
+}
+
+func handleMessagesDown(ev *tcell.EventKey) *tcell.EventKey {
+	if curRegions == nil || len(curRegions) == 0 {
+		return nil
+	}
+	hls := textView.GetHighlights()
+	if len(hls) > 0 {
+		newId := GetOffsetMsgId(hls[0], 1)
+		if newId != "" {
+			textView.Highlight(newId)
+		}
+	} else {
+		textView.Highlight(curRegions[0])
+	}
+	textView.ScrollToHighlight()
+	return nil
+}
+
+func handleMessagesLast(ev *tcell.EventKey) *tcell.EventKey {
+	if curRegions == nil || len(curRegions) == 0 {
+		return nil
+	}
+	textView.Highlight(curRegions[len(curRegions)-1])
+	textView.ScrollToHighlight()
+	return nil
+}
+
+func handleMessagesFirst(ev *tcell.EventKey) *tcell.EventKey {
+	if curRegions == nil || len(curRegions) == 0 {
+		return nil
+	}
+	textView.Highlight(curRegions[0])
+	textView.ScrollToHighlight()
+	return nil
+}
+
+func handleExitMessages(ev *tcell.EventKey) *tcell.EventKey {
+	if curRegions == nil || len(curRegions) == 0 {
+		return nil
+	}
+	ResetMsgSelection()
+	app.SetFocus(textInput)
+	return nil
+}
+
+func LoadShortcuts() {
+	keyBindings = cbind.NewConfiguration()
+	if err := keyBindings.Set(config.GetKey("focus_messages"), handleFocusMessage); err != nil {
+		PrintErrorMsg("focus_messages:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("focus_input"), handleFocusInput); err != nil {
+		PrintErrorMsg("focus_input:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("focus_contacts"), handleFocusContacts); err != nil {
+		PrintErrorMsg("focus_contacts:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("switch_panels"), handleSwitchPanels); err != nil {
+		PrintErrorMsg("switch_panels:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("command_backlog"), handleCommand("backlog")); err != nil {
+		PrintErrorMsg("command_backlog:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("command_connect"), handleCommand("login")); err != nil {
+		PrintErrorMsg("command_connect:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("command_quit"), handleQuit); err != nil {
+		PrintErrorMsg("command_quit:", err)
+	}
+	if err := keyBindings.Set(config.GetKey("command_help"), handleHelp); err != nil {
+		PrintErrorMsg("command_help:", err)
+	}
+	app.SetInputCapture(keyBindings.Capture)
+	keysMessages := cbind.NewConfiguration()
+	if err := keysMessages.Set(config.GetKey("message_download"), handleDownload); err != nil {
+		PrintErrorMsg("message_download:", err)
+	}
+	if err := keysMessages.Set(config.GetKey("message_open"), handleOpen); err != nil {
+		PrintErrorMsg("message_open:", err)
+	}
+	if err := keysMessages.Set(config.GetKey("message_show"), handleShow); err != nil {
+		PrintErrorMsg("message_show:", err)
+	}
+	if err := keysMessages.Set(config.GetKey("message_info"), handleInfo); err != nil {
+		PrintErrorMsg("message_info:", err)
+	}
+	keysMessages.SetKey(tcell.ModNone, tcell.KeyEscape, handleExitMessages)
+	keysMessages.SetKey(tcell.ModNone, tcell.KeyUp, handleMessagesUp)
+	keysMessages.SetKey(tcell.ModNone, tcell.KeyDown, handleMessagesDown)
+	keysMessages.SetRune(tcell.ModNone, 'k', handleMessagesUp)
+	keysMessages.SetRune(tcell.ModNone, 'j', handleMessagesDown)
+	keysMessages.SetRune(tcell.ModNone, 'g', handleMessagesFirst)
+	keysMessages.SetRune(tcell.ModNone, 'G', handleMessagesLast)
+	textView.SetInputCapture(keysMessages.Capture)
+}
+
 // prints help to chat view
 func PrintHelp() {
-	fmt.Fprintln(textView, "[::b]WhatsCLI "+VERSION+"[-]\n")
+	fmt.Fprintln(textView, "[::b]WhatsCLI "+VERSION+"[-]")
+	fmt.Fprintln(textView, "")
 	fmt.Fprintln(textView, "[-::u]Keys:[-::-]")
-	fmt.Fprintln(textView, "<Tab> = switch input/contacts")
-	fmt.Fprintln(textView, "<Up/Dn> = scroll history")
-	fmt.Fprintln(textView, "<Ctrl-W> = focus chat window\n")
-	fmt.Fprintln(textView, "[-::-]Chat window focused:[-::-]")
-	fmt.Fprintln(textView, "<Up/Down> = select message")
-	fmt.Fprintln(textView, "<d> = download attachment")
-	fmt.Fprintln(textView, "<o> = open attachment\n")
+	fmt.Fprintln(textView, "[::b] Up/Down[::-] = scroll history/contacts")
+	fmt.Fprintln(textView, "[::b]", config.GetKey("switch_panels"), "[::-] = switch input/contacts")
+	fmt.Fprintln(textView, "[::b]", config.GetKey("focus_messages"), "[::-] = focus message panel")
+	fmt.Fprintln(textView, "[::b]", config.GetKey("focus_contacts"), "[::-] = focus contacts panel")
+	fmt.Fprintln(textView, "[::b]", config.GetKey("focus_input"), "[::-] = focus input")
+	fmt.Fprintln(textView, "")
+	fmt.Fprintln(textView, "[-::-]Message panel focused:[-::-]")
+	fmt.Fprintln(textView, "[::b] Up/Down[::-] = select message")
+	fmt.Fprintln(textView, "[::b]", config.GetKey("message_download"), "[::-] = download attachment -> ", config.GetSetting("download_path"))
+	fmt.Fprintln(textView, "[::b]", config.GetKey("message_open"), "[::-] = download & open attachment -> ", config.GetSetting("preview_path"))
+	fmt.Fprintln(textView, "[::b]", config.GetKey("message_show"), "[::-] = download & show image using jp2a -> ", config.GetSetting("preview_path"))
+	fmt.Fprintln(textView, "[::b]", config.GetKey("message_info"), "[::-] = info about message")
+	fmt.Fprintln(textView, "")
 	fmt.Fprintln(textView, "[-::u]Commands:[-::-]")
-	fmt.Fprintln(textView, "/name NewName = name selected contact")
-	fmt.Fprintln(textView, "/addname 1234567 NewName = add name for number")
-	fmt.Fprintln(textView, "/connect = (re)connect in case the connection dropped")
-	fmt.Fprintln(textView, "/load = reload contacts")
-	fmt.Fprintln(textView, "/quit = exit app")
-	fmt.Fprintln(textView, "/help = show this help\n")
+	fmt.Fprintln(textView, "[::b] /backlog[::-] = load more messages for this chat ->[::b]", config.GetKey("command_backlog"), "[::-]")
+	fmt.Fprintln(textView, "[::b] /connect[::-] = (re)connect in case the connection dropped ->[::b]", config.GetKey("command_connect"), "[::-]")
+	fmt.Fprintln(textView, "[::b] /help[::-] = show this help ->[::b]", config.GetKey("command_help"), "[::-]")
+	fmt.Fprintln(textView, "[::b] /quit[::-] = exit app ->[::b]", config.GetKey("command_quit"), "[::-]")
+	fmt.Fprintln(textView, "[::b] /disconnect[::-] = close the connection")
+	fmt.Fprintln(textView, "[::b] /logout[::-] = remove login data from computer (stays connected until app closes)")
+	fmt.Fprintln(textView, "")
+	fmt.Fprintln(textView, "Config file in \n-> ", config.GetConfigFilePath())
 }
 
 // called when text is entered by the user
@@ -275,15 +403,25 @@ func EnterCommand(key tcell.Key) {
 		textInput.SetText("")
 		return
 	}
-	if sndTxt == "/connect" {
-		//command
-		messages.GetConnection()
+	switch sndTxt {
+	}
+	if sndTxt == "/backlog" {
+		sessionManager.CommandChannel <- "backlog"
 		textInput.SetText("")
 		return
 	}
-	if sndTxt == "/load" {
-		//command
-		LoadContacts()
+	if sndTxt == "/connect" {
+		sessionManager.CommandChannel <- "login"
+		textInput.SetText("")
+		return
+	}
+	if sndTxt == "/disconnect" {
+		sessionManager.CommandChannel <- "disconnect"
+		textInput.SetText("")
+		return
+	}
+	if sndTxt == "/logout" {
+		sessionManager.CommandChannel <- "logout"
 		textInput.SetText("")
 		return
 	}
@@ -295,44 +433,16 @@ func EnterCommand(key tcell.Key) {
 	}
 	if sndTxt == "/quit" {
 		//command
+		sessionManager.Disconnect()
 		app.Stop()
 		return
 	}
-	if strings.Index(sndTxt, "/addname ") == 0 {
-		//command
-		parts := strings.Split(sndTxt, " ")
-		if len(parts) < 3 {
-			fmt.Fprintln(textView, "Use /addname 1234567 NewName")
-			return
-		}
-		contact := whatsapp.Contact{
-			Jid:  parts[1] + messages.CONTACTSUFFIX,
-			Name: strings.TrimPrefix(sndTxt, "/addname "+parts[1]+" "),
-		}
-		contactChannel <- contact
-		textInput.SetText("")
-		return
-	}
-	if currentReceiver == "" {
-		fmt.Fprintln(textView, "[red]no contact selected[-]")
-		return
-	}
-	if strings.Index(sndTxt, "/name ") == 0 {
-		//command
-		contact := whatsapp.Contact{
-			Jid:  currentReceiver,
-			Name: strings.TrimPrefix(sndTxt, "/name "),
-		}
-		contactChannel <- contact
-		textInput.SetText("")
-		return
-	}
 	// send message
-	msg := waMsg{
+	msg := messages.SendMsg{
 		Wid:  currentReceiver,
 		Text: sndTxt,
 	}
-	sendChannel <- msg
+	sessionManager.SendChannel <- msg
 	textInput.SetText("")
 }
 
@@ -356,101 +466,67 @@ func GetOffsetMsgId(curId string, offset int) string {
 	}
 }
 
-// loads the contact data from storage to the TreeView
-func LoadContacts() {
-	var ids = msgStore.GetContactIds()
-	contactRoot.ClearChildren()
-	for _, element := range ids {
-		node := tview.NewTreeNode(messages.GetIdName(element)).
-			SetReference(element).
-			SetSelectable(true)
-		if strings.Count(element, messages.CONTACTSUFFIX) > 0 {
-			node.SetColor(tcell.ColorGreen)
-		} else {
-			node.SetColor(tcell.ColorBlue)
-		}
-		contactRoot.AddChild(node)
-		if element == currentReceiver {
-			treeView.SetCurrentNode(node)
-		}
+// resets the selection in the textView and scrolls it down
+func ResetMsgSelection() {
+	if len(textView.GetHighlights()) > 0 {
+		textView.Highlight("")
 	}
+	textView.ScrollToEnd()
 }
 
-// sets the current contact, loads text from storage to TextView
-func SetDisplayedContact(wid string) {
-	currentReceiver = wid
-	textView.Clear()
-	textView.SetTitle(messages.GetIdName(wid))
-	msgTxt, regIds := msgStore.GetMessagesString(wid)
-	textView.SetText(msgTxt)
-	curRegions = regIds
+// prints text to the TextView
+func PrintText(txt string) {
+	fmt.Fprintln(textView, txt)
 }
 
-// starts the receiver and message handling thread
-func StartTextReceiver() error {
-	var wac = messages.GetConnection()
-	err := messages.LoginWithConnection(wac)
-	if err != nil {
-		return fmt.Errorf("%v\n", err)
+// prints an error to the TextView
+func PrintError(err error) {
+	if err == nil {
+		return
 	}
-	handler = textHandler{}
-	wac.AddHandler(handler)
-	sendChannel = make(chan waMsg)
-	textChannel = make(chan whatsapp.TextMessage)
-	otherChannel = make(chan interface{})
-	contactChannel = make(chan whatsapp.Contact)
-	for {
-		select {
-		case msg := <-sendChannel:
-			SendText(msg.Wid, msg.Text)
-		case rcvd := <-textChannel:
-			if msgStore.AddTextMessage(rcvd) {
-				app.QueueUpdateDraw(LoadContacts)
+	fmt.Fprintln(textView, "[red]", err.Error(), "[-]")
+}
+
+// prints an error to the TextView
+func PrintErrorMsg(text string, err error) {
+	if err == nil {
+		return
+	}
+	fmt.Fprintln(textView, "[red]", text, err.Error(), "[-]")
+}
+
+// prints an image attachment to the TextView (by message id)
+func PrintImage(id string) {
+	var err error
+	var path string
+	PrintText("[::d]loading..[::-]")
+	if path, err = sessionManager.DownloadMessage(id, true); err == nil {
+		cmd := exec.Command("jp2a", "--color", path)
+		var stdout io.ReadCloser
+		if stdout, err = cmd.StdoutPipe(); err == nil {
+			if err = cmd.Start(); err == nil {
+				reader := bufio.NewReader(stdout)
+				io.Copy(tview.ANSIWriter(textView), reader)
+				return
 			}
-		case other := <-otherChannel:
-			msgStore.AddOtherMessage(&other)
-		case contact := <-contactChannel:
-			messages.SetIdName(contact.Jid, contact.Name)
-			app.QueueUpdateDraw(LoadContacts)
 		}
 	}
-	fmt.Fprintln(textView, "closing the receiver")
-	wac.Disconnect()
-	return nil
+	PrintError(err)
 }
 
-// sends text to whatsapp id
-func SendText(wid string, text string) {
-	msg := whatsapp.TextMessage{
-		Info: whatsapp.MessageInfo{
-			RemoteJid: wid,
-			FromMe:    true,
-			Timestamp: uint64(time.Now().Unix()),
-		},
-		Text: text,
-	}
-
-	_, err := messages.GetConnection().Send(msg)
-	if err != nil {
-		fmt.Fprintln(textView, "[red]error sending message: ", err, "[-]")
+// downloads a specific message attachment
+func DownloadMessageId(id string, openIt bool) {
+	PrintText("[::d]loading..[::-]")
+	if result, err := sessionManager.DownloadMessage(id, openIt); err == nil {
+		PrintText("[::d]Downloaded as [yellow]" + result + "[-::-]")
+		if openIt {
+			open.Run(result)
+		}
 	} else {
-		msgStore.AddTextMessage(msg)
-		PrintTextMessage(msg)
+		PrintError(err)
 	}
 }
 
-// initiates a download of a specific message attachment in a new go routine
-func DownloadMessageId(id string, open bool) {
-	fmt.Fprintln(textView, "[::d]..attempt download of #", id, "[::-]")
-	go func() {
-		if result, err := msgStore.DownloadMessage(id, open); err == nil {
-			fmt.Fprintln(textView, "[::d]Downloaded as [yellow]", result, "[-::-]")
-		} else {
-			fmt.Fprintln(textView, "[red::d]", err.Error(), "[-::-]")
-		}
-	}()
-}
-
 // notifies about a new message if its recent
 func NotifyMsg(msg whatsapp.TextMessage) {
 	if int64(msg.Info.Timestamp) > time.Now().Unix()-30 {
@@ -462,101 +538,58 @@ func NotifyMsg(msg whatsapp.TextMessage) {
 	}
 }
 
-// prints a text message to the TextView
-func PrintTextMessage(msg whatsapp.TextMessage) {
-	fmt.Fprintln(textView, messages.GetTextMessageString(&msg))
+// sets the current contact, loads text from storage to TextView
+func SetDisplayedContact(wid string) {
+	currentReceiver = wid
+	textView.Clear()
+	textView.SetTitle(messages.GetIdName(wid))
+	sessionManager.DisplayedChannel <- currentReceiver
 }
 
-// handler struct for whatsapp callbacks
-type textHandler struct{}
+type UiHandler struct{}
 
-// HandleError implements the error handler interface for go-whatsapp
-func (t textHandler) HandleError(err error) {
-	// TODO : handle go routine here
-	fmt.Fprintln(textView, "[red]error in textHandler : ", err, "[-]")
-	return
+func (u UiHandler) NewMessage(msg string, id string) {
+	//TODO: its stupid to "go" this as its supposed to run
+	//on the ui thread anyway. But QueueUpdate blocks...?
+	go app.QueueUpdateDraw(func() {
+		curRegions = append(curRegions, id)
+		PrintText(msg)
+	})
 }
 
-// HandleTextMessage implements the text message handler interface for go-whatsapp
-func (t textHandler) HandleTextMessage(msg whatsapp.TextMessage) {
-	textChannel <- msg
-	if msg.Info.RemoteJid != currentReceiver {
-		NotifyMsg(msg)
-		return
-	}
-	PrintTextMessage(msg)
+func (u UiHandler) NewScreen(screen string, ids []string) {
+	go app.QueueUpdateDraw(func() {
+		textView.Clear()
+		textView.SetText(screen)
+		curRegions = ids
+	})
 }
 
-// methods to convert messages to TextMessage
-func (t textHandler) HandleImageMessage(message whatsapp.ImageMessage) {
-	msg := whatsapp.TextMessage{
-		Info: whatsapp.MessageInfo{
-			RemoteJid: message.Info.RemoteJid,
-			SenderJid: message.Info.SenderJid,
-			FromMe:    message.Info.FromMe,
-			Timestamp: message.Info.Timestamp,
-			Id:        message.Info.Id,
-		},
-		Text: "[IMAGE] " + message.Caption,
-	}
-	t.HandleTextMessage(msg)
-	otherChannel <- message
+// loads the contact data from storage to the TreeView
+func (u UiHandler) SetContacts(ids []string) {
+	go app.QueueUpdateDraw(func() {
+		contactRoot.ClearChildren()
+		for _, element := range ids {
+			node := tview.NewTreeNode(messages.GetIdName(element)).
+				SetReference(element).
+				SetSelectable(true)
+			if strings.Count(element, messages.CONTACTSUFFIX) > 0 {
+				node.SetColor(config.GetColor("list_contact"))
+			} else {
+				node.SetColor(config.GetColor("list_group"))
+			}
+			contactRoot.AddChild(node)
+			if element == currentReceiver {
+				treeView.SetCurrentNode(node)
+			}
+		}
+	})
 }
 
-func (t textHandler) HandleDocumentMessage(message whatsapp.DocumentMessage) {
-	msg := whatsapp.TextMessage{
-		Info: whatsapp.MessageInfo{
-			RemoteJid: message.Info.RemoteJid,
-			SenderJid: message.Info.SenderJid,
-			FromMe:    message.Info.FromMe,
-			Timestamp: message.Info.Timestamp,
-			Id:        message.Info.Id,
-		},
-		Text: "[DOCUMENT] " + message.Title,
-	}
-	t.HandleTextMessage(msg)
-	otherChannel <- message
+func (u UiHandler) PrintError(err error) {
+	PrintError(err)
 }
 
-func (t textHandler) HandleVideoMessage(message whatsapp.VideoMessage) {
-	msg := whatsapp.TextMessage{
-		Info: whatsapp.MessageInfo{
-			RemoteJid: message.Info.RemoteJid,
-			SenderJid: message.Info.SenderJid,
-			FromMe:    message.Info.FromMe,
-			Timestamp: message.Info.Timestamp,
-			Id:        message.Info.Id,
-		},
-		Text: "[VIDEO] " + message.Caption,
-	}
-	t.HandleTextMessage(msg)
-	otherChannel <- message
+func (u UiHandler) PrintText(msg string) {
+	PrintText(msg)
 }
-
-func (t textHandler) HandleAudioMessage(message whatsapp.AudioMessage) {
-	msg := whatsapp.TextMessage{
-		Info: whatsapp.MessageInfo{
-			RemoteJid: message.Info.RemoteJid,
-			SenderJid: message.Info.SenderJid,
-			FromMe:    message.Info.FromMe,
-			Timestamp: message.Info.Timestamp,
-			Id:        message.Info.Id,
-		},
-		Text: "[AUDIO]",
-	}
-	t.HandleTextMessage(msg)
-	otherChannel <- message
-}
-
-// add contact info to database (not needed, internal db of connection is used)
-func (t textHandler) HandleNewContact(contact whatsapp.Contact) {
-	// redundant, wac has contacts
-	//contactChannel <- contact
-}
-
-// handle battery messages
-//func (t textHandler) HandleBatteryMessage(msg whatsapp.BatteryMessage) {
-//  app.QueueUpdate(func() {
-//    infoBar.SetText("🔋: " + string(msg.Percentage) + "%")
-//  })
-//}

messages/contacts.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/Rhymen/go-whatsapp"
+	"github.com/normen/whatscli/config"
 )
 
 var contacts map[string]string
@@ -15,9 +16,16 @@ var connection *whatsapp.Conn
 // loads custom contacts from disk
 func LoadContacts() {
 	contacts = make(map[string]string)
-	file, err := os.Open(GetHomeDir() + ".whatscli.contacts")
+	file, err := os.Open(config.GetContactsFilePath())
 	if err != nil {
-		return
+		// load old contacts file, re-save in new location if found
+		file, err = os.Open(GetHomeDir() + ".whatscli.contacts")
+		if err != nil {
+			return
+		} else {
+			os.Remove(GetHomeDir() + ".whatscli.contacts")
+			SaveContacts()
+		}
 	}
 	defer file.Close()
 	decoder := gob.NewDecoder(file)
@@ -29,7 +37,7 @@ func LoadContacts() {
 
 // saves custom contacts to disk
 func SaveContacts() {
-	file, err := os.Create(GetHomeDir() + ".whatscli.contacts")
+	file, err := os.Open(config.GetContactsFilePath())
 	if err != nil {
 		return
 	}

messages/session_manager.go

@@ -2,24 +2,81 @@ package messages
 
 import (
 	"encoding/gob"
+	"errors"
 	"fmt"
-	"github.com/rivo/tview"
+	"io/ioutil"
 	"os"
+	"strings"
 	"time"
 
+	"github.com/rivo/tview"
+
 	"github.com/Rhymen/go-whatsapp"
+	"github.com/normen/whatscli/config"
 	"github.com/normen/whatscli/qrcode"
 )
 
-var textView *tview.TextView
+// TODO: move message styling and ordering into UI, don't use strings
+type UiMessageHandler interface {
+	NewMessage(string, string)
+	NewScreen(string, []string)
+	SetContacts([]string)
+	PrintError(error)
+	PrintText(string)
+}
+
+type Command struct {
+	Name   string
+	Params []string
+}
+
+type SendMsg struct {
+	Wid  string
+	Text string
+}
+
+const GROUPSUFFIX = "@g.us"
+const CONTACTSUFFIX = "@s.whatsapp.net"
+
+type SessionManager struct {
+	db               MessageDatabase
+	currentReceiver  string // currently selected contact for message handling
+	uiHandler        UiMessageHandler
+	SendChannel      chan SendMsg
+	DisplayedChannel chan string
+	CommandChannel   chan string
+	TextChannel      chan whatsapp.TextMessage
+	OtherChannel     chan interface{}
+	ContactChannel   chan whatsapp.Contact
+	textView         *tview.TextView
+}
+
+func (sm *SessionManager) Init(handler UiMessageHandler) {
+	sm.db = MessageDatabase{}
+	sm.db.Init()
+	sm.uiHandler = handler
+	//TODO: conflate to commandchannel
+	sm.SendChannel = make(chan SendMsg, 10)
+	sm.DisplayedChannel = make(chan string, 10)
+	sm.CommandChannel = make(chan string, 10)
+	sm.TextChannel = make(chan whatsapp.TextMessage, 10)
+	sm.OtherChannel = make(chan interface{}, 10)
+	sm.ContactChannel = make(chan whatsapp.Contact, 10)
+}
+
+func (sm *SessionManager) SetCurrentReceiver(id string) {
+	sm.currentReceiver = id
+	screen, ids := sm.db.GetMessagesString(id)
+	sm.uiHandler.NewScreen(screen, ids)
+}
 
 // TODO: remove this circular dependeny in favor of a better way
-func SetTextView(tv *tview.TextView) {
-	textView = tv
+func (sm *SessionManager) SetTextView(tv *tview.TextView) {
+	sm.textView = tv
 }
 
 // gets an existing connection or creates one
-func GetConnection() *whatsapp.Conn {
+func (sm *SessionManager) GetConnection() *whatsapp.Conn {
 	var wac *whatsapp.Conn
 	if connection == nil {
 		wacc, err := whatsapp.NewConn(5 * time.Second)
@@ -37,15 +94,15 @@ func GetConnection() *whatsapp.Conn {
 
 // Login logs in the user. It ries to see if a session already exists. If not, tries to create a
 // new one using qr scanned on the terminal.
-func Login() error {
-	return LoginWithConnection(GetConnection())
+func (sm *SessionManager) Login() error {
+	return sm.LoginWithConnection(sm.GetConnection())
 }
 
 // LoginWithConnection logs in the user using a provided connection. It ries to see if a session already exists. If not, tries to create a
 // new one using qr scanned on the terminal.
-func LoginWithConnection(wac *whatsapp.Conn) error {
-	if wac.Info != nil && wac.Info.Connected {
-		return nil
+func (sm *SessionManager) LoginWithConnection(wac *whatsapp.Conn) error {
+	if wac != nil && wac.GetConnected() {
+		wac.Disconnect()
 	}
 	//load saved session
 	session, err := readSession()
@@ -60,7 +117,7 @@ func LoginWithConnection(wac *whatsapp.Conn) error {
 		qr := make(chan string)
 		go func() {
 			terminal := qrcode.New()
-			terminal.SetOutput(tview.ANSIWriter(textView))
+			terminal.SetOutput(tview.ANSIWriter(sm.textView))
 			terminal.Get(<-qr).Print()
 		}()
 		session, err = wac.Login(qr)
@@ -78,17 +135,319 @@ func LoginWithConnection(wac *whatsapp.Conn) error {
 	return nil
 }
 
+func (sm *SessionManager) Disconnect() error {
+	wac := sm.GetConnection()
+	if wac != nil && wac.GetConnected() {
+		_, err := wac.Disconnect()
+		return err
+	}
+	return nil
+}
+
 // Logout logs out the user.
-func Logout() error {
+func (ub *SessionManager) Logout() error {
 	return removeSession()
 }
 
+func (sm *SessionManager) ExecCommand(command Command) {
+	sndTxt := command.Name
+	switch sndTxt {
+	default:
+	case "backlog":
+		//command
+		if sm.currentReceiver == "" {
+			return
+		}
+		count := 10
+		if currentMsgs, ok := sm.db.textMessages[sm.currentReceiver]; ok {
+			if len(currentMsgs) > 0 {
+				firstMsg := currentMsgs[0]
+				go sm.GetConnection().LoadChatMessages(sm.currentReceiver, count, firstMsg.Info.Id, firstMsg.Info.FromMe, false, sm)
+			}
+		}
+	//FullChatHistory(currentReceiver, 20, 100000, handler)
+	//messages.GetConnection().LoadFullChatHistory(currentReceiver, 20, 100000, handler)
+	case "login":
+		//command
+		sm.Login()
+	case "disconnect":
+		//TODO: output error
+		sm.uiHandler.PrintError(sm.Disconnect())
+	case "logout":
+		//command
+		//TODO: output error
+		sm.uiHandler.PrintError(sm.Logout())
+	}
+}
+
+// load data for message specified by message id TODO: support types
+func (sm *SessionManager) LoadMessageData(wid string) ([]byte, error) {
+	if msg, ok := sm.db.otherMessages[wid]; ok {
+		switch v := (*msg).(type) {
+		default:
+		case whatsapp.ImageMessage:
+			return v.Download()
+		case whatsapp.DocumentMessage:
+			//return v.Download()
+		case whatsapp.AudioMessage:
+			//return v.Download()
+		case whatsapp.VideoMessage:
+			//return v.Download()
+		}
+	}
+	return []byte{}, errors.New("This is not an image message")
+}
+
+// attempts to download a messages attachments, returns path or error message
+func (sm *SessionManager) DownloadMessage(wid string, preview bool) (string, error) {
+	if msg, ok := sm.db.otherMessages[wid]; ok {
+		var fileName string = ""
+		if preview {
+			fileName += config.GetSetting("download_path")
+		} else {
+			fileName += config.GetSetting("preview_path")
+		}
+		fileName += string(os.PathSeparator)
+		switch v := (*msg).(type) {
+		default:
+		case whatsapp.ImageMessage:
+			fileName += v.Info.Id + "." + strings.TrimPrefix(v.Type, "image/")
+			if _, err := os.Stat(fileName); err == nil {
+				return fileName, err
+			} else if os.IsNotExist(err) {
+				if data, err := v.Download(); err == nil {
+					return saveAttachment(data, fileName)
+				} else {
+					return fileName, err
+				}
+			}
+		case whatsapp.DocumentMessage:
+			fileName += v.Info.Id + "." + strings.TrimPrefix(strings.TrimPrefix(v.Type, "application/"), "document/")
+			if _, err := os.Stat(fileName); err == nil {
+				return fileName, err
+			} else if os.IsNotExist(err) {
+				if data, err := v.Download(); err == nil {
+					return saveAttachment(data, fileName)
+				} else {
+					return fileName, err
+				}
+			}
+		case whatsapp.AudioMessage:
+			fileName += v.Info.Id + "." + strings.TrimPrefix(v.Type, "audio/")
+			if _, err := os.Stat(fileName); err == nil {
+				return fileName, err
+			} else if os.IsNotExist(err) {
+				if data, err := v.Download(); err == nil {
+					return saveAttachment(data, fileName)
+				} else {
+					return fileName, err
+				}
+			}
+		case whatsapp.VideoMessage:
+			fileName += v.Info.Id + "." + strings.TrimPrefix(v.Type, "video/")
+			if _, err := os.Stat(fileName); err == nil {
+				return fileName, err
+			} else if os.IsNotExist(err) {
+				if data, err := v.Download(); err == nil {
+					return saveAttachment(data, fileName)
+				} else {
+					return fileName, err
+				}
+			}
+		}
+	}
+	return "", errors.New("No attachments found")
+}
+
+// create a formatted string with regions based on message ID from a text message
+// TODO: move message styling into UI
+func GetTextMessageString(msg *whatsapp.TextMessage) string {
+	colorMe := config.GetColorName("chat_me")
+	colorContact := config.GetColorName("chat_contact")
+	out := ""
+	text := tview.Escape(msg.Text)
+	tim := time.Unix(int64(msg.Info.Timestamp), 0)
+	time := tim.Format("02-01-06 15:04:05")
+	out += "[\""
+	out += msg.Info.Id
+	out += "\"]"
+	if msg.Info.FromMe { //msg from me
+		out += "[-::d](" + time + ") [" + colorMe + "::b]Me: [-::-]" + text
+	} else if strings.Contains(msg.Info.RemoteJid, GROUPSUFFIX) { // group msg
+		userId := msg.Info.SenderJid
+		out += "[-::d](" + time + ") [" + colorContact + "::b]" + GetIdShort(userId) + ": [-::-]" + text
+	} else { // message from others
+		out += "[-::d](" + time + ") [" + colorContact + "::b]" + GetIdShort(msg.Info.RemoteJid) + ": [-::-]" + text
+	}
+	out += "[\"\"]"
+	return out
+}
+
+// starts the receiver and message handling thread
+// TODO: can't be stopped, can only be called once!
+func (sm *SessionManager) StartTextReceiver() error {
+	var wac = sm.GetConnection()
+	err := sm.LoginWithConnection(wac)
+	if err != nil {
+		return fmt.Errorf("%v\n", err)
+	}
+	wac.AddHandler(sm)
+	for {
+		select {
+		case msg := <-sm.SendChannel:
+			sm.SendText(msg.Wid, msg.Text)
+		case msg := <-sm.TextChannel:
+			didNew := sm.db.AddTextMessage(&msg)
+			if msg.Info.RemoteJid == sm.currentReceiver {
+				if didNew {
+					sm.uiHandler.NewMessage(GetTextMessageString(&msg), msg.Info.Id)
+				} else {
+					screen, ids := sm.db.GetMessagesString(sm.currentReceiver)
+					sm.uiHandler.NewScreen(screen, ids)
+				}
+			}
+			sm.uiHandler.SetContacts(sm.db.GetContactIds())
+		case other := <-sm.OtherChannel:
+			sm.db.AddOtherMessage(&other)
+		case contact := <-sm.ContactChannel:
+			SetIdName(contact.Jid, contact.Name)
+		case contactId := <-sm.DisplayedChannel:
+			sm.SetCurrentReceiver(contactId)
+		case command := <-sm.CommandChannel:
+			sm.ExecCommand(Command{command, nil})
+		}
+	}
+	fmt.Fprintln(sm.textView, "closing the receiver")
+	wac.Disconnect()
+	return nil
+}
+
+// sends text to whatsapp id
+func (sm SessionManager) SendText(wid string, text string) {
+	msg := whatsapp.TextMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: wid,
+			FromMe:    true,
+			Timestamp: uint64(time.Now().Unix()),
+		},
+		Text: text,
+	}
+
+	_, err := sm.GetConnection().Send(msg)
+	if err != nil {
+		sm.uiHandler.PrintError(err)
+	} else {
+		sm.db.AddTextMessage(&msg)
+		sm.uiHandler.NewMessage(GetTextMessageString(&msg), msg.Info.Id)
+	}
+}
+
+// handler struct for whatsapp callbacks
+
+// HandleError implements the error handler interface for go-whatsapp
+func (sm *SessionManager) HandleError(err error) {
+	sm.uiHandler.PrintText("[red]go-whatsapp reported an error:[-]")
+	sm.uiHandler.PrintError(err)
+	return
+}
+
+// HandleTextMessage implements the text message handler interface for go-whatsapp
+func (sm *SessionManager) HandleTextMessage(msg whatsapp.TextMessage) {
+	sm.TextChannel <- msg
+}
+
+// methods to convert messages to TextMessage
+func (sm *SessionManager) HandleImageMessage(message whatsapp.ImageMessage) {
+	msg := whatsapp.TextMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: message.Info.RemoteJid,
+			SenderJid: message.Info.SenderJid,
+			FromMe:    message.Info.FromMe,
+			Timestamp: message.Info.Timestamp,
+			Id:        message.Info.Id,
+		},
+		Text: "[IMAGE] " + message.Caption,
+	}
+	sm.HandleTextMessage(msg)
+	sm.OtherChannel <- message
+}
+
+func (sm *SessionManager) HandleDocumentMessage(message whatsapp.DocumentMessage) {
+	msg := whatsapp.TextMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: message.Info.RemoteJid,
+			SenderJid: message.Info.SenderJid,
+			FromMe:    message.Info.FromMe,
+			Timestamp: message.Info.Timestamp,
+			Id:        message.Info.Id,
+		},
+		Text: "[DOCUMENT] " + message.Title,
+	}
+	sm.HandleTextMessage(msg)
+	sm.OtherChannel <- message
+}
+
+func (sm *SessionManager) HandleVideoMessage(message whatsapp.VideoMessage) {
+	msg := whatsapp.TextMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: message.Info.RemoteJid,
+			SenderJid: message.Info.SenderJid,
+			FromMe:    message.Info.FromMe,
+			Timestamp: message.Info.Timestamp,
+			Id:        message.Info.Id,
+		},
+		Text: "[VIDEO] " + message.Caption,
+	}
+	sm.HandleTextMessage(msg)
+	sm.OtherChannel <- message
+}
+
+func (sm *SessionManager) HandleAudioMessage(message whatsapp.AudioMessage) {
+	msg := whatsapp.TextMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: message.Info.RemoteJid,
+			SenderJid: message.Info.SenderJid,
+			FromMe:    message.Info.FromMe,
+			Timestamp: message.Info.Timestamp,
+			Id:        message.Info.Id,
+		},
+		Text: "[AUDIO]",
+	}
+	sm.HandleTextMessage(msg)
+	sm.OtherChannel <- message
+}
+
+// add contact info to database (not needed, internal db of connection is used)
+func (sm *SessionManager) HandleNewContact(contact whatsapp.Contact) {
+	// redundant, wac has contacts
+	//contactChannel <- contact
+}
+
+// handle battery messages
+//func (t textHandler) HandleBatteryMessage(msg whatsapp.BatteryMessage) {
+//  app.QueueUpdate(func() {
+//    infoBar.SetText("🔋: " + string(msg.Percentage) + "%")
+//  })
+//}
+
+// helper to save an attachment and open it if specified
+func saveAttachment(data []byte, path string) (string, error) {
+	err := ioutil.WriteFile(path, data, 0644)
+	return path, err
+}
+
 // reads the session file from disk
 func readSession() (whatsapp.Session, error) {
 	session := whatsapp.Session{}
-	file, err := os.Open(GetHomeDir() + ".whatscli.session")
+	file, err := os.Open(config.GetSessionFilePath())
 	if err != nil {
-		return session, err
+		// load old session file, delete if found
+		file, err = os.Open(GetHomeDir() + ".whatscli.session")
+		if err != nil {
+			return session, err
+		} else {
+			os.Remove(GetHomeDir() + ".whatscli.session")
+		}
 	}
 	defer file.Close()
 	decoder := gob.NewDecoder(file)
@@ -101,7 +460,7 @@ func readSession() (whatsapp.Session, error) {
 
 // saves the session file to disk
 func writeSession(session whatsapp.Session) error {
-	file, err := os.Create(GetHomeDir() + ".whatscli.session")
+	file, err := os.Create(config.GetSessionFilePath())
 	if err != nil {
 		return err
 	}
@@ -116,5 +475,5 @@ func writeSession(session whatsapp.Session) error {
 
 // deletes the session file from disk
 func removeSession() error {
-	return os.Remove(GetHomeDir() + ".whatscli.session")
+	return os.Remove(config.GetSessionFilePath())
 }

messages/storage.go

@@ -1,53 +1,49 @@
 package messages
 
 import (
-	"errors"
-	"io/ioutil"
-	"os"
 	"sort"
-	"strings"
-	"time"
 
 	"github.com/Rhymen/go-whatsapp"
-	"github.com/rivo/tview"
-	"github.com/skratchdot/open-golang/open"
 )
 
-const GROUPSUFFIX = "@g.us"
-const CONTACTSUFFIX = "@s.whatsapp.net"
-
 type MessageDatabase struct {
-	textMessages  map[string][]whatsapp.TextMessage // text messages stored by RemoteJid
-	latestMessage map[string]uint64                 // last message from RemoteJid
-	otherMessages map[string]interface{}            // other non-text messages, stored by ID
+	textMessages  map[string][]*whatsapp.TextMessage // text messages stored by RemoteJid
+	messagesById  map[string]*whatsapp.TextMessage   // text messages stored by message ID
+	latestMessage map[string]uint64                  // last message from RemoteJid
+	otherMessages map[string]*interface{}            // other non-text messages, stored by ID
 }
 
 // initialize the database
 func (db *MessageDatabase) Init() {
 	//var this = *db
-	(*db).textMessages = make(map[string][]whatsapp.TextMessage)
-	(*db).otherMessages = make(map[string]interface{})
-	(*db).latestMessage = make(map[string]uint64)
+	db.textMessages = make(map[string][]*whatsapp.TextMessage)
+	db.messagesById = make(map[string]*whatsapp.TextMessage)
+	db.otherMessages = make(map[string]*interface{})
+	db.latestMessage = make(map[string]uint64)
 }
 
 // add a text message to the database, stored by RemoteJid
-func (db *MessageDatabase) AddTextMessage(msg whatsapp.TextMessage) bool {
+func (db *MessageDatabase) AddTextMessage(msg *whatsapp.TextMessage) bool {
 	//var this = *db
 	var didNew = false
 	var wid = msg.Info.RemoteJid
-	if (*db).textMessages[wid] == nil {
-		var newArr = []whatsapp.TextMessage{}
-		(*db).textMessages[wid] = newArr
-		(*db).latestMessage[wid] = msg.Info.Timestamp
+	if db.textMessages[wid] == nil {
+		var newArr = []*whatsapp.TextMessage{}
+		db.textMessages[wid] = newArr
+		db.latestMessage[wid] = msg.Info.Timestamp
 		didNew = true
-	} else if (*db).latestMessage[wid] < msg.Info.Timestamp {
-		(*db).latestMessage[wid] = msg.Info.Timestamp
+	} else if db.latestMessage[wid] < msg.Info.Timestamp {
+		db.latestMessage[wid] = msg.Info.Timestamp
 		didNew = true
 	}
-	(*db).textMessages[wid] = append((*db).textMessages[wid], msg)
-	sort.Slice((*db).textMessages[wid], func(i, j int) bool {
-		return (*db).textMessages[wid][i].Info.Timestamp < (*db).textMessages[wid][j].Info.Timestamp
-	})
+	//check if message exists, ignore otherwise
+	if _, ok := db.messagesById[msg.Info.Id]; !ok {
+		db.messagesById[msg.Info.Id] = msg
+		db.textMessages[wid] = append(db.textMessages[wid], msg)
+		sort.Slice(db.textMessages[wid], func(i, j int) bool {
+			return db.textMessages[wid][i].Info.Timestamp < db.textMessages[wid][j].Info.Timestamp
+		})
+	}
 	return didNew
 }
 
@@ -66,111 +62,50 @@ func (db *MessageDatabase) AddOtherMessage(msg *interface{}) {
 		id = v.Info.Id
 	}
 	if id != "" {
-		(*db).otherMessages[id] = (*msg)
+		db.otherMessages[id] = msg
 	}
 }
 
 // get an array of all chat ids
 func (db *MessageDatabase) GetContactIds() []string {
 	//var this = *db
-	keys := make([]string, len((*db).textMessages))
+	keys := make([]string, len(db.textMessages))
 	i := 0
-	for k := range (*db).textMessages {
+	for k := range db.textMessages {
 		keys[i] = k
 		i++
 	}
 	sort.Slice(keys, func(i, j int) bool {
-		return (*db).latestMessage[keys[i]] > (*db).latestMessage[keys[j]]
+		return db.latestMessage[keys[i]] > db.latestMessage[keys[j]]
 	})
 	return keys
 }
 
+func (db *MessageDatabase) GetMessageInfo(id string) string {
+	if _, ok := db.otherMessages[id]; ok {
+		return "[yellow]OtherMessage[-]"
+	}
+	out := ""
+	if msg, ok := db.messagesById[id]; ok {
+		out += "[yellow]ID: " + msg.Info.Id + "[-]\n"
+		out += "[yellow]PushName: " + msg.Info.PushName + "[-]\n"
+		out += "[yellow]RemoteJid: " + msg.Info.RemoteJid + "[-]\n"
+		out += "[yellow]SenderJid: " + msg.Info.SenderJid + "[-]\n"
+		out += "[yellow]Participant: " + msg.ContextInfo.Participant + "[-]\n"
+		out += "[yellow]QuotedMessageID: " + msg.ContextInfo.QuotedMessageID + "[-]\n"
+	}
+	return out
+}
+
 // get a string containing all messages for a chat by chat id
 func (db *MessageDatabase) GetMessagesString(wid string) (string, []string) {
 	//var this = *db
 	var out = ""
 	var arr = []string{}
-	for _, element := range (*db).textMessages[wid] {
-		out += GetTextMessageString(&element)
+	for _, element := range db.textMessages[wid] {
+		out += GetTextMessageString(element)
 		out += "\n"
 		arr = append(arr, element.Info.Id)
 	}
 	return out, arr
 }
-
-// create a formatted string with regions based on message ID from a text message
-func GetTextMessageString(msg *whatsapp.TextMessage) string {
-	out := ""
-	text := tview.Escape((*msg).Text)
-	tim := time.Unix(int64((*msg).Info.Timestamp), 0)
-	out += "[\""
-	out += (*msg).Info.Id
-	out += "\"]"
-	if (*msg).Info.FromMe { //msg from me
-		out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [blue::b]Me: [-::-]" + text
-	} else if strings.Contains((*msg).Info.RemoteJid, GROUPSUFFIX) { // group msg
-		userId := (*msg).Info.SenderJid
-		out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort(userId) + ": [-::-]" + text
-	} else { // message from others
-		out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort((*msg).Info.RemoteJid) + ": [-::-]" + text
-	}
-	out += "[\"\"]"
-	return out
-}
-
-// attempts to download a messages attachments, returns path or error message
-func (db *MessageDatabase) DownloadMessage(wid string, open bool) (string, error) {
-	if msg, ok := (*db).otherMessages[wid]; ok {
-		var fileName string = ""
-		switch v := msg.(type) {
-		default:
-		case whatsapp.ImageMessage:
-			if data, err := v.Download(); err == nil {
-				fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "image/")
-				err := saveAttachment(data, fileName, open)
-				return fileName, err
-			} else {
-				return fileName, err
-			}
-		case whatsapp.DocumentMessage:
-			if data, err := v.Download(); err == nil {
-				fileName = v.Info.Id + "." + strings.TrimPrefix(strings.TrimPrefix(v.Type, "application/"), "document/")
-				err := saveAttachment(data, fileName, open)
-				return fileName, err
-			} else {
-				return fileName, err
-			}
-		case whatsapp.AudioMessage:
-			if data, err := v.Download(); err == nil {
-				fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "audio/")
-				err := saveAttachment(data, fileName, open)
-				return fileName, err
-			} else {
-				return fileName, err
-			}
-		case whatsapp.VideoMessage:
-			if data, err := v.Download(); err == nil {
-				fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "video/")
-				err := saveAttachment(data, fileName, open)
-				return fileName, err
-			} else {
-				return fileName, err
-			}
-		}
-	}
-	return "", errors.New("No attachments found")
-}
-
-// helper to save an attachment and open it if specified
-func saveAttachment(data []byte, fileName string, openIt bool) error {
-	path := GetHomeDir() + "Downloads" + string(os.PathSeparator) + fileName
-	err := ioutil.WriteFile(path, data, 0644)
-	if err == nil {
-		if openIt {
-			open.Run(path)
-		}
-	} else {
-		return err
-	}
-	return nil
-}

release.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+# get verison from main.go VERSION string
 if [ $# -eq 0 ]; then
 	VERSION=$(cat main.go|grep "VERSION string"| awk -v FS="(\")" '{print $2}')
 else
@@ -11,6 +12,7 @@ LINUXF=whatscli-$VERSION-linux.zip
 MACF=whatscli-$VERSION-macos.zip
 RASPIF=whatscli-$VERSION-raspberrypi.zip
 
+# build zip files with binaries
 GOOS=darwin go build -o whatscli
 zip $MACF whatscli
 rm whatscli
@@ -24,6 +26,7 @@ GOOS=linux GOARCH=arm GOARM=5 go build -o whatscli
 zip $RASPIF whatscli
 rm whatscli
 
+# publish to github
 git pull
 LASTTAG=$(git describe --tags --abbrev=0)
 git log $LASTTAG..HEAD --no-decorate --pretty=format:"- %s" --abbrev-commit > changes.txt
@@ -31,3 +34,16 @@ vim changes.txt
 gh release create $VERSION $LINUXF $MACF $WINF $RASPIF -F changes.txt -t $VERSION
 rm changes.txt
 rm *.zip
+
+# update homebrew tap
+URL="https://github.com/normen/whatscli/archive/$VERSION.tar.gz"
+wget $URL
+SHASUM=$(shasum -a 256 $VERSION.tar.gz|awk '{print$1}')
+rm $VERSION.tar.gz
+cd ../../BrewCode/homebrew-tap
+sed -i bak "s/sha256 \".*/sha256 \"$SHASUM\"/" Formula/whatscli.rb
+sed -i bak "s!url \".*!url \"$URL\"!" Formula/whatscli.rb
+rm Formula/whatscli.rbbak
+git add -A
+git commit -m "update whatscli to $VERSION"
+git push