visual fixes

- 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

@@ -23,8 +23,6 @@ This is a WIP and mainly meant for my personal use. Heres some things you might
 - No incoming message notification / count
 - No proper connection drop handling
 - No uploading of images/video/audio/data
-- Not configurable at all (except through your terminal settings)
-- Leaves its config files in your home folder
 - 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
@@ -50,8 +48,5 @@ Some ways to install via package managers are supported but the installed versio
 
 #### Arch Linux (AUR)
 
-- `git clone https://aur.archlinux.org/whatscli.git`
-- `cd whatscli`
-- `makepkg -si`
-- `yay -S whatscli`
+- `https://aur.archlinux.org/packages/whatscli/`
 

config/settings.go

@@ -0,0 +1,168 @@
+package config
+
+import (
+	"fmt"
+	"os"
+	"os/user"
+
+	"github.com/adrg/xdg"
+	"gitlab.com/tslocum/cbind"
+	"gopkg.in/ini.v1"
+)
+
+var configFilePath string
+var keyConfig *cbind.Configuration
+var cfg *ini.File
+
+type IniFile struct {
+	*General
+	*Keymap
+	*Ui
+	*Colors
+}
+
+type General struct {
+	DownloadPath string
+	PreviewPath  string
+	CmdPrefix    string
+}
+
+type Keymap struct {
+	SwitchPanels    string
+	FocusMessages   string
+	FocusInput      string
+	FocusContacts   string
+	CommandBacklog  string
+	CommandConnect  string
+	CommandQuit     string
+	CommandHelp     string
+	MessageDownload string
+	MessageOpen     string
+	MessageShow     string
+	MessageInfo     string
+	MessageRevoke   string
+}
+
+type Ui struct {
+	ContactSidebarWidth int
+}
+
+type Colors struct {
+	Background      string
+	Text            string
+	ListHeader      string
+	ListContact     string
+	ListGroup       string
+	ChatContact     string
+	ChatMe          string
+	Borders         string
+	InputBackground string
+	InputText       string
+	Positive        string
+	Negative        string
+}
+
+var Config = IniFile{
+	&General{
+		DownloadPath: GetHomeDir() + "Downloads",
+		PreviewPath:  GetHomeDir() + "Downloads",
+		CmdPrefix:    "/",
+	},
+	&Keymap{
+		SwitchPanels:    "Tab",
+		FocusMessages:   "Ctrl+w",
+		FocusInput:      "Ctrl+Space",
+		FocusContacts:   "Ctrl+e",
+		CommandBacklog:  "Ctrl+b",
+		CommandConnect:  "Ctrl+r",
+		CommandQuit:     "Ctrl+q",
+		CommandHelp:     "Ctrl+?",
+		MessageDownload: "d",
+		MessageInfo:     "i",
+		MessageOpen:     "o",
+		MessageRevoke:   "r",
+		MessageShow:     "s",
+	},
+	&Ui{
+		ContactSidebarWidth: 30,
+	},
+	&Colors{
+		Background:      "black",
+		Text:            "white",
+		ListHeader:      "yellow",
+		ListContact:     "green",
+		ListGroup:       "blue",
+		ChatContact:     "green",
+		ChatMe:          "blue",
+		Borders:         "white",
+		InputBackground: "blue",
+		InputText:       "white",
+		Positive:        "green",
+		Negative:        "red",
+	},
+}
+
+func InitConfig() {
+	var err error
+	if configFilePath, err = xdg.ConfigFile("whatscli/whatscli.config"); err == nil {
+		// add any new values
+		var cfg *ini.File
+		if cfg, err = ini.Load(configFilePath); err == nil {
+			cfg.NameMapper = ini.TitleUnderscore
+			cfg.ValueMapper = os.ExpandEnv
+			if section, err := cfg.GetSection("general"); err == nil {
+				section.MapTo(&Config.General)
+			}
+			if section, err := cfg.GetSection("keymap"); err == nil {
+				section.MapTo(&Config.Keymap)
+			}
+			if section, err := cfg.GetSection("ui"); err == nil {
+				section.MapTo(&Config.Ui)
+			}
+			if section, err := cfg.GetSection("colors"); err == nil {
+				section.MapTo(&Config.Colors)
+			}
+			newCfg := ini.Empty()
+			if err = ini.ReflectFromWithMapper(newCfg, &Config, ini.TitleUnderscore); err == nil {
+				//TODO: only save if changes
+				err = newCfg.SaveTo(configFilePath)
+			}
+		} else {
+			cfg = ini.Empty()
+			cfg.NameMapper = ini.TitleUnderscore
+			cfg.ValueMapper = os.ExpandEnv
+			if err = ini.ReflectFromWithMapper(cfg, &Config, ini.TitleUnderscore); err == nil {
+				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"
+}
+
+// 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.4
 	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // 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

@@ -8,12 +8,17 @@ github.com/Rhymen/go-whatsapp/examples/echo v0.0.0-20190325075644-cc2581bbf24d/g
 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/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/v2 v2.0.0-dev/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
+github.com/gdamore/tcell/v2 v2.0.0/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/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -53,6 +58,7 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 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-20201118063654-f007e9ad3893 h1:24As98PZlIdjZn6V4wUulAbYlG7RPg/du9A1FZdT/vs=
 github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893/go.mod h1:0ha5CGekam8ZV1kxkBxSlh7gfQ7YolUj2P/VruwH0QY=
@@ -63,6 +69,10 @@ github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1
 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/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.4 h1:cbZXPPcieXspk8cShoT6efz7HAT8yMNQcofYWNizis4=
+gitlab.com/tslocum/cbind v0.1.4/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/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
@@ -89,9 +99,8 @@ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7w
 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-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-20201118182958-a01c418693c7 h1:Z991aAXPjz0tLnj74pVXW3eWJ5lHMIBvbRfMq4M2jHA=
-golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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=
@@ -124,5 +133,9 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 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

@@ -6,60 +6,63 @@ import (
 	"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.10"
-
-var sendChannel chan waMsg
-var textChannel chan whatsapp.TextMessage
-var otherChannel chan interface{}
-var contactChannel chan whatsapp.Contact
+var VERSION string = "v0.8.4"
 
 var sndTxt string = ""
 var currentReceiver string = ""
 var curRegions []string
+
 var textView *tview.TextView
 var treeView *tview.TreeView
 var textInput *tview.InputField
 var topBar *tview.TextView
-
-//var infoBar *tview.TextView
-var msgStore messages.MessageDatabase
+var infoBar *tview.TextView
 
 var contactRoot *tview.TreeNode
-var handler textHandler
 var app *tview.Application
 
+var sessionManager *messages.SessionManager
+
+var keyBindings *cbind.Configuration
+
+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.Config.Ui.ContactSidebarWidth
 	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(tcell.ColorNames[config.Config.Colors.Background])
+	gridLayout.SetBordersColor(tcell.ColorNames[config.Config.Colors.Borders])
 
+	cmdPrefix := config.Config.General.CmdPrefix
 	topBar = tview.NewTextView()
 	topBar.SetDynamicColors(true)
 	topBar.SetScrollable(false)
-	topBar.SetText("[::b] WhatsCLI " + VERSION + "  [-::d]Type /help for help")
+	topBar.SetText("[::b] WhatsCLI " + VERSION + "  [-::d]Type " + cmdPrefix + "help or press " + config.Config.Keymap.CommandHelp + " for help")
+	topBar.SetBackgroundColor(tcell.ColorNames[config.Config.Colors.Background])
+	UpdateStatusBar(messages.SessionStatus{})
 
-	//infoBar = tview.NewTextView()
-	//infoBar.SetDynamicColors(true)
-	//infoBar.SetText("🔋: ??%")
+	infoBar = tview.NewTextView()
+	infoBar.SetDynamicColors(true)
 
 	textView = tview.NewTextView().
 		SetDynamicColors(true).
@@ -68,142 +71,20 @@ func main() {
 		SetChangedFunc(func() {
 			app.Draw()
 		})
+	textView.SetBackgroundColor(tcell.ColorNames[config.Config.Colors.Background])
+	textView.SetTextColor(tcell.ColorNames[config.Config.Colors.Text])
 
-	textView.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		if event.Key() == tcell.KeyCtrlE {
-			//TODO: Boilerplate
-			textView.Highlight("")
-			textView.ScrollToEnd()
-			app.SetFocus(treeView)
-			return nil
-		}
-		if event.Key() == tcell.KeyCtrlSpace {
-			textView.Highlight("")
-			textView.ScrollToEnd()
-			app.SetFocus(textInput)
-			return nil
-		}
-		if event.Key() == tcell.KeyTab {
-			textView.Highlight("")
-			textView.ScrollToEnd()
-			app.SetFocus(textInput)
-			return nil
-		}
-		if event.Key() == tcell.KeyEsc {
-			textView.Highlight("")
-			textView.ScrollToEnd()
-			app.SetFocus(textInput)
-			return nil
-		}
-		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)
-				textView.Highlight("")
-				textView.ScrollToEnd()
-				app.SetFocus(textInput)
-			}
-			return nil
-		}
-		if event.Rune() == 'o' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				DownloadMessageId(hls[0], true)
-				textView.Highlight("")
-				textView.ScrollToEnd()
-				app.SetFocus(textInput)
-			}
-			return nil
-		}
-		if event.Rune() == 'i' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				fmt.Fprintln(textView, msgStore.GetMessageInfo(hls[0]))
-				textView.Highlight("")
-				textView.ScrollToEnd()
-				app.SetFocus(textInput)
-			}
-			return nil
-		}
-		if event.Rune() == 's' {
-			hls := textView.GetHighlights()
-			if len(hls) > 0 {
-				go PrintImage(hls[0])
-				textView.Highlight("")
-				textView.ScrollToEnd()
-				app.SetFocus(textInput)
-			}
-			return nil
-		}
-		return event
-	})
-
-	// TODO: add better way
-	messages.SetTextView(textView)
 	PrintHelp()
 
-	//textView.SetBorder(true)
-
 	textInput = tview.NewInputField()
+	textInput.SetBackgroundColor(tcell.ColorNames[config.Config.Colors.Background])
+	textInput.SetFieldBackgroundColor(tcell.ColorNames[config.Config.Colors.InputBackground])
+	textInput.SetFieldTextColor(tcell.ColorNames[config.Config.Colors.InputText])
 	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)
-			if curRegions != nil && len(curRegions) > 0 {
-				textView.Highlight(curRegions[len(curRegions)-1])
-			}
-			return nil
-		}
-		if event.Key() == tcell.KeyTab {
-			app.SetFocus(treeView)
-			return nil
-		}
 		if event.Key() == tcell.KeyDown {
 			offset, _ := textView.GetScrollOffset()
 			offset += 1
@@ -232,8 +113,8 @@ func main() {
 	})
 
 	gridLayout.AddItem(topBar, 0, 0, 1, 4, 0, 0, false)
-	//gridLayout.AddItem(infoBar, 0, 0, 1, 1, 0, 0, false)
-	gridLayout.AddItem(MakeTree(), 1, 0, 2, 1, 0, 0, false)
+	gridLayout.AddItem(infoBar, 2, 0, 1, 1, 0, 0, false)
+	gridLayout.AddItem(MakeTree(), 1, 0, 1, 1, 0, 0, false)
 	gridLayout.AddItem(textView, 1, 1, 1, 3, 0, 0, false)
 	gridLayout.AddItem(textInput, 2, 1, 1, 3, 0, 0, false)
 
@@ -241,10 +122,11 @@ func main() {
 	app.EnableMouse(true)
 	app.SetFocus(textInput)
 	go func() {
-		if err := StartTextReceiver(); err != nil {
+		if err := sessionManager.StartManager(); err != nil {
 			PrintError(err)
 		}
 	}()
+	LoadShortcuts()
 	app.Run()
 }
 
@@ -252,10 +134,11 @@ func main() {
 func MakeTree() *tview.TreeView {
 	rootDir := "Contacts"
 	contactRoot = tview.NewTreeNode(rootDir).
-		SetColor(tcell.ColorYellow)
+		SetColor(tcell.ColorNames[config.Config.Colors.ListHeader])
 	treeView = tview.NewTreeView().
 		SetRoot(contactRoot).
 		SetCurrentNode(contactRoot)
+	treeView.SetBackgroundColor(tcell.ColorNames[config.Config.Colors.Background])
 
 	// If a contact was selected, open it.
 	treeView.SetChangedFunc(func(node *tview.TreeNode) {
@@ -273,50 +156,223 @@ 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)
-			if curRegions != nil && len(curRegions) > 0 {
-				textView.Highlight(curRegions[len(curRegions)-1])
-			}
-			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 <- messages.Command{command, nil}
+		return nil
+	}
+}
+
+func handleQuit(ev *tcell.EventKey) *tcell.EventKey {
+	sessionManager.CommandChannel <- messages.Command{"disconnect", nil}
+	app.Stop()
+	return nil
+}
+
+func handleHelp(ev *tcell.EventKey) *tcell.EventKey {
+	PrintHelp()
+	return nil
+}
+
+func handleMessageCommand(command string) func(ev *tcell.EventKey) *tcell.EventKey {
+	return func(ev *tcell.EventKey) *tcell.EventKey {
+		hls := textView.GetHighlights()
+		if len(hls) > 0 {
+			sessionManager.CommandChannel <- messages.Command{command, []string{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.Config.Keymap.FocusMessages, handleFocusMessage); err != nil {
+		PrintErrorMsg("focus_messages:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.FocusInput, handleFocusInput); err != nil {
+		PrintErrorMsg("focus_input:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.FocusContacts, handleFocusContacts); err != nil {
+		PrintErrorMsg("focus_contacts:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.SwitchPanels, handleSwitchPanels); err != nil {
+		PrintErrorMsg("switch_panels:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.CommandBacklog, handleCommand("backlog")); err != nil {
+		PrintErrorMsg("command_backlog:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.CommandConnect, handleCommand("login")); err != nil {
+		PrintErrorMsg("command_connect:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.CommandQuit, handleQuit); err != nil {
+		PrintErrorMsg("command_quit:", err)
+	}
+	if err := keyBindings.Set(config.Config.Keymap.CommandHelp, handleHelp); err != nil {
+		PrintErrorMsg("command_help:", err)
+	}
+	app.SetInputCapture(keyBindings.Capture)
+	keysMessages := cbind.NewConfiguration()
+	if err := keysMessages.Set(config.Config.Keymap.MessageDownload, handleMessageCommand("download")); err != nil {
+		PrintErrorMsg("message_download:", err)
+	}
+	if err := keysMessages.Set(config.Config.Keymap.MessageOpen, handleMessageCommand("open")); err != nil {
+		PrintErrorMsg("message_open:", err)
+	}
+	if err := keysMessages.Set(config.Config.Keymap.MessageShow, handleMessageCommand("show")); err != nil {
+		PrintErrorMsg("message_show:", err)
+	}
+	if err := keysMessages.Set(config.Config.Keymap.MessageInfo, handleMessageCommand("info")); err != nil {
+		PrintErrorMsg("message_info:", err)
+	}
+	if err := keysMessages.Set(config.Config.Keymap.MessageRevoke, handleMessageCommand("revoke")); err != nil {
+		PrintErrorMsg("message_revoke:", 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() {
+	cmdPrefix := config.Config.General.CmdPrefix
 	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/contacts")
-	fmt.Fprintln(textView, "<Ctrl-W> = focus chat window")
+	fmt.Fprintln(textView, "[::b] Up/Down[::-] = scroll history/contacts")
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.SwitchPanels, "[::-] = switch input/contacts")
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.FocusMessages, "[::-] = focus message panel")
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.FocusContacts, "[::-] = focus contacts panel")
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.FocusInput, "[::-] = focus input")
 	fmt.Fprintln(textView, "")
-	fmt.Fprintln(textView, "[-::-]Chat window focused:[-::-]")
-	fmt.Fprintln(textView, "<Up/Down> = select message")
-	fmt.Fprintln(textView, "<d> = download attachment to $HOME/Downloads")
-	fmt.Fprintln(textView, "<o> = download & open attachment")
-	fmt.Fprintln(textView, "<s> = download & show image in chat using jp2a command")
+	fmt.Fprintln(textView, "[-::-]Message panel focused:[-::-]")
+	fmt.Fprintln(textView, "[::b] Up/Down[::-] = select message")
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.MessageDownload, "[::-] = download attachment -> ", config.Config.General.DownloadPath)
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.MessageOpen, "[::-] = download & open attachment -> ", config.Config.General.PreviewPath)
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.MessageShow, "[::-] = download & show image using jp2a -> ", config.Config.General.PreviewPath)
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.MessageRevoke, "[::-] = revoke message")
+	fmt.Fprintln(textView, "[::b]", config.Config.Keymap.MessageInfo, "[::-] = info about message")
 	fmt.Fprintln(textView, "")
 	fmt.Fprintln(textView, "[-::u]Commands:[-::-]")
-	fmt.Fprintln(textView, "/connect = (re)connect in case the connection dropped")
-	fmt.Fprintln(textView, "/quit = exit app")
-	fmt.Fprintln(textView, "/help = show this help")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"backlog [::-]or[::b]", config.Config.Keymap.CommandBacklog, "[::-] = load next 10 older messages for current chat")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"connect [::-]or[::b]", config.Config.Keymap.CommandConnect, "[::-] = (re)connect in case the connection dropped")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"help [::-]or[::b]", config.Config.Keymap.CommandHelp, "[::-] = show this help")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"quit [::-]or[::b]", config.Config.Keymap.CommandQuit, "[::-] = exit app")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"leave[::-] = leave group")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"disconnect[::-] = close the connection")
+	fmt.Fprintln(textView, "[::b] "+cmdPrefix+"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
+// TODO: parse and map commands automatically
 func EnterCommand(key tcell.Key) {
 	if sndTxt == "" {
 		return
@@ -325,65 +381,37 @@ func EnterCommand(key tcell.Key) {
 		textInput.SetText("")
 		return
 	}
-	if sndTxt == "/connect" {
-		//command
-		msgStore.Init()
-		messages.Login()
-		textInput.SetText("")
-		return
-	}
-	if sndTxt == "/load" {
-		//command
-		LoadContacts()
-		textInput.SetText("")
-		return
-	}
-	if sndTxt == "/help" {
+	cmdPrefix := config.Config.General.CmdPrefix
+	if sndTxt == cmdPrefix+"help" {
 		//command
 		PrintHelp()
 		textInput.SetText("")
 		return
 	}
-	if sndTxt == "/quit" {
+	if sndTxt == cmdPrefix+"quit" {
 		//command
+		sessionManager.CommandChannel <- messages.Command{"disconnect", nil}
 		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
+	if strings.HasPrefix(sndTxt, cmdPrefix) {
+		cmd := strings.TrimPrefix(sndTxt, cmdPrefix)
+		var params []string
+		if strings.Index(cmd, " ") >= 0 {
+			cmdParts := strings.Split(cmd, " ")
+			cmd = cmdParts[0]
+			params = cmdParts[1:]
 		}
-		contact := whatsapp.Contact{
-			Jid:  parts[1] + messages.CONTACTSUFFIX,
-			Name: strings.TrimPrefix(sndTxt, "/addname "+parts[1]+" "),
-		}
-		contactChannel <- contact
+		sessionManager.CommandChannel <- messages.Command{cmd, params}
 		textInput.SetText("")
 		return
 	}
-	if currentReceiver == "" {
-		fmt.Fprintln(textView, "[red]no contact selected[-]")
-		return
+	// no command, send as message
+	msg := messages.Command{
+		Name:   "send",
+		Params: []string{currentReceiver, sndTxt},
 	}
-	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{
-		Wid:  currentReceiver,
-		Text: sndTxt,
-	}
-	sendChannel <- msg
+	sessionManager.CommandChannel <- msg
 	textInput.SetText("")
 }
 
@@ -407,9 +435,12 @@ func GetOffsetMsgId(curId string, offset int) string {
 	}
 }
 
-// prints a text message to the TextView
-func PrintTextMessage(msg whatsapp.TextMessage) {
-	fmt.Fprintln(textView, messages.GetTextMessageString(&msg))
+// resets the selection in the textView and scrolls it down
+func ResetMsgSelection() {
+	if len(textView.GetHighlights()) > 0 {
+		textView.Highlight("")
+	}
+	textView.ScrollToEnd()
 }
 
 // prints text to the TextView
@@ -419,229 +450,143 @@ func PrintText(txt string) {
 
 // prints an error to the TextView
 func PrintError(err error) {
+	if err == nil {
+		return
+	}
 	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) {
+func PrintImage(path string) {
 	var err error
-	var path string
-	PrintText("[::d]loading..[::-]")
-	if path, err = msgStore.DownloadMessage(id, false); 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
-			}
+	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
 		}
 	}
 	PrintError(err)
 }
 
-// initiates a download of a specific message attachment in a new go routine
-func DownloadMessageId(id string, open bool) {
-	PrintText("[::d]loading..[::-]")
-	go func() {
-		if result, err := msgStore.DownloadMessage(id, open); err == nil {
-			fmt.Fprintln(textView, "[::d]Downloaded as [yellow]", result, "[-::-]")
-		} else {
-			PrintError(err)
-		}
-	}()
+func UpdateStatusBar(statusInfo messages.SessionStatus) {
+	out := " "
+	if statusInfo.Connected {
+		out += "[" + config.Config.Colors.Positive + "]online[-]"
+	} else {
+		out += "[" + config.Config.Colors.Negative + "]offline[-]"
+	}
+	out += " "
+	out += "[::d] ("
+	out += fmt.Sprint(statusInfo.BatteryCharge)
+	out += "%"
+	if statusInfo.BatteryLoading {
+		out += " [" + config.Config.Colors.Positive + "]L[-]"
+	} else {
+		out += " [" + config.Config.Colors.Negative + "]l[-]"
+	}
+	if statusInfo.BatteryPowersave {
+		out += " [" + config.Config.Colors.Negative + "]S[-]"
+	} else {
+		out += " [" + config.Config.Colors.Positive + "]s[-]"
+	}
+	out += ")[::-] "
+	out += statusInfo.LastSeen
+	go app.QueueUpdateDraw(func() {
+		infoBar.SetText(out)
+	})
+	//infoBar.SetText("🔋: ??%")
 }
 
 // notifies about a new message if its recent
-func NotifyMsg(msg whatsapp.TextMessage) {
-	if int64(msg.Info.Timestamp) > time.Now().Unix()-30 {
-		//fmt.Print("\a")
-		//err := beeep.Notify(messages.GetIdName(msg.Info.RemoteJid), msg.Text, "")
-		//if err != nil {
-		//  fmt.Fprintln(textView, "[red]error in notification[-]")
-		//}
-	}
-}
-
-// 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)
-		}
-	}
-}
+//func NotifyMsg(msg whatsapp.TextMessage) {
+//if int64(msg.Info.Timestamp) > time.Now().Unix()-30 {
+//fmt.Print("\a")
+//err := beeep.Notify(messages.GetIdName(msg.Info.RemoteJid), msg.Text, "")
+//if err != nil {
+//  fmt.Fprintln(textView, "[red]error in notification[-]")
+//}
+//}
+//}
 
 // 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
+	sessionManager.CommandChannel <- messages.Command{"select", []string{currentReceiver}}
 }
 
-// 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)
-	}
-	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)
-			}
-		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
-}
+type UiHandler struct{}
 
-// 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 {
-		PrintError(err)
-	} else {
-		msgStore.AddTextMessage(&msg)
-		PrintTextMessage(msg)
-	}
-}
-
-// handler struct for whatsapp callbacks
-type textHandler struct{}
-
-// HandleError implements the error handler interface for go-whatsapp
-func (t textHandler) HandleError(err error) {
-	PrintText("[red]go-whatsapp reported an error:[-]")
-	PrintError(err)
-	return
-}
-
-// 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)
-	// add to regions if current window, otherwise its not selectable
-	id := msg.Info.Id
-	app.QueueUpdate(func() {
+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)
 	})
 }
 
-// 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
+func (u UiHandler) NewScreen(screen string, ids []string) {
+	go app.QueueUpdateDraw(func() {
+		textView.Clear()
+		textView.SetText(screen)
+		curRegions = ids
+	})
 }
 
-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
+// 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(tcell.ColorNames[config.Config.Colors.ListContact])
+			} else {
+				node.SetColor(tcell.ColorNames[config.Config.Colors.ListGroup])
+			}
+			contactRoot.AddChild(node)
+			if element == currentReceiver {
+				treeView.SetCurrentNode(node)
+			}
+		}
+	})
 }
 
-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) PrintError(err error) {
+	PrintError(err)
 }
 
-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
+func (u UiHandler) PrintText(msg string) {
+	PrintText(msg)
 }
 
-// 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
+func (u UiHandler) PrintFile(path string) {
+	PrintImage(path)
 }
 
-// handle battery messages
-//func (t textHandler) HandleBatteryMessage(msg whatsapp.BatteryMessage) {
-//  app.QueueUpdate(func() {
-//    infoBar.SetText("🔋: " + string(msg.Percentage) + "%")
-//  })
-//}
+func (u UiHandler) OpenFile(path string) {
+	open.Run(path)
+}
+
+func (u UiHandler) SetStatus(status messages.SessionStatus) {
+	UpdateStatusBar(status)
+}
+
+func (u UiHandler) GetWriter() io.Writer {
+	return textView
+}

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,29 +2,140 @@ package messages
 
 import (
 	"encoding/gob"
+	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
 	"os"
-	"sync"
+	"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
-var connMutex sync.Mutex
+// TODO: move message styling and ordering into UI, don't use strings
+// move these funcs/interface to channels
+type UiMessageHandler interface {
+	NewMessage(string, string)
+	NewScreen(string, []string)
+	SetContacts([]string)
+	PrintError(error)
+	PrintText(string)
+	PrintFile(string)
+	SetStatus(SessionStatus)
+	OpenFile(string)
+	GetWriter() io.Writer
+}
 
-// TODO: remove this circular dependeny in favor of a better way
-func SetTextView(tv *tview.TextView) {
-	textView = tv
+type SessionStatus struct {
+	BatteryCharge    int
+	BatteryLoading   bool
+	BatteryPowersave bool
+	Connected        bool
+	LastSeen         string
+}
+
+type BatteryMsg struct {
+	charge    int
+	loading   bool
+	powersave bool
+}
+
+type StatusMsg struct {
+	connected bool
+	err       error
+}
+
+type Command struct {
+	Name   string
+	Params []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
+	BatteryChannel  chan BatteryMsg
+	StatusChannel   chan StatusMsg
+	CommandChannel  chan Command
+	TextChannel     chan whatsapp.TextMessage
+	OtherChannel    chan interface{}
+	statusInfo      SessionStatus
+}
+
+func (sm *SessionManager) Init(handler UiMessageHandler) {
+	sm.db = MessageDatabase{}
+	sm.db.Init()
+	sm.uiHandler = handler
+	sm.BatteryChannel = make(chan BatteryMsg, 10)
+	sm.StatusChannel = make(chan StatusMsg, 10)
+	sm.CommandChannel = make(chan Command, 10)
+	sm.TextChannel = make(chan whatsapp.TextMessage, 10)
+	sm.OtherChannel = make(chan interface{}, 10)
+}
+
+// starts the receiver and message handling thread
+// TODO: can't be stopped, can only be called once!
+func (sm *SessionManager) StartManager() error {
+	var wac = sm.getConnection()
+	err := sm.loginWithConnection(wac)
+	if err != nil {
+		sm.uiHandler.PrintError(err)
+	}
+	wac.AddHandler(sm)
+	for {
+		select {
+		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 command := <-sm.CommandChannel:
+			sm.execCommand(command)
+		case batteryMsg := <-sm.BatteryChannel:
+			sm.statusInfo.BatteryLoading = batteryMsg.loading
+			sm.statusInfo.BatteryPowersave = batteryMsg.powersave
+			sm.statusInfo.BatteryCharge = batteryMsg.charge
+			sm.uiHandler.SetStatus(sm.statusInfo)
+		case statusMsg := <-sm.StatusChannel:
+			if statusMsg.err != nil {
+			} else {
+				sm.statusInfo.Connected = statusMsg.connected
+			}
+			wac := sm.getConnection()
+			connected := wac.GetConnected()
+			sm.statusInfo.Connected = connected
+			sm.uiHandler.SetStatus(sm.statusInfo)
+		}
+	}
+	fmt.Fprintln(sm.uiHandler.GetWriter(), "closing the receiver")
+	wac.Disconnect()
+	return nil
+}
+
+func (sm *SessionManager) setCurrentReceiver(id string) {
+	sm.currentReceiver = id
+	screen, ids := sm.db.GetMessagesString(id)
+	sm.uiHandler.NewScreen(screen, ids)
 }
 
 // gets an existing connection or creates one
-func GetConnection() *whatsapp.Conn {
-	connMutex.Lock()
-	defer connMutex.Unlock()
+func (sm *SessionManager) getConnection() *whatsapp.Conn {
 	var wac *whatsapp.Conn
 	if connection == nil {
 		wacc, err := whatsapp.NewConn(5 * time.Second)
@@ -40,19 +151,18 @@ func GetConnection() *whatsapp.Conn {
 	return wac
 }
 
-// Login logs in the user. It ries to see if a session already exists. If not, tries to create a
+// 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
+// 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 {
-	connMutex.Lock()
-	defer connMutex.Unlock()
+func (sm *SessionManager) loginWithConnection(wac *whatsapp.Conn) error {
 	if wac != nil && wac.GetConnected() {
 		wac.Disconnect()
+		sm.StatusChannel <- StatusMsg{false, nil}
 	}
 	//load saved session
 	session, err := readSession()
@@ -67,7 +177,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.uiHandler.GetWriter()))
 			terminal.Get(<-qr).Print()
 		}()
 		session, err = wac.Login(qr)
@@ -82,22 +192,360 @@ func LoginWithConnection(wac *whatsapp.Conn) error {
 		return fmt.Errorf("error saving session: %v\n", err)
 	}
 	//<-time.After(3 * time.Second)
+	sm.StatusChannel <- StatusMsg{true, nil}
 	return nil
 }
 
-// Logout logs out the user.
-func Logout() error {
-	connMutex.Lock()
-	defer connMutex.Unlock()
+func (sm *SessionManager) disconnect() error {
+	wac := sm.getConnection()
+	var err error
+	if wac != nil && wac.GetConnected() {
+		_, err = wac.Disconnect()
+	}
+	sm.StatusChannel <- StatusMsg{false, err}
+	return err
+}
+
+// logout logs out the user.
+func (ub *SessionManager) logout() error {
 	return removeSession()
 }
 
+func (sm *SessionManager) execCommand(command Command) {
+	cmd := command.Name
+	switch cmd {
+	default:
+		sm.uiHandler.PrintText("[red]Unknown command: [-]" + cmd)
+	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":
+		sm.uiHandler.PrintError(sm.login())
+	case "connect":
+		sm.uiHandler.PrintError(sm.login())
+	case "disconnect":
+		sm.uiHandler.PrintError(sm.disconnect())
+	case "logout":
+		sm.uiHandler.PrintError(sm.logout())
+	case "send":
+		if checkParam(command.Params, 2) {
+			textParams := command.Params[1:]
+			text := strings.Join(textParams, " ")
+			sm.sendText(command.Params[0], text)
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] send [user-id[] [message text[]")
+		}
+	case "select":
+		if checkParam(command.Params, 1) {
+			sm.setCurrentReceiver(command.Params[0])
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] select [user-id[]")
+		}
+	case "info":
+		if checkParam(command.Params, 1) {
+			sm.uiHandler.PrintText(sm.db.GetMessageInfo(command.Params[0]))
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] info [message-id[]")
+		}
+	case "download":
+		if checkParam(command.Params, 1) {
+			if path, err := sm.downloadMessage(command.Params[0], false); err != nil {
+				sm.uiHandler.PrintError(err)
+			} else {
+				sm.uiHandler.PrintText("[::d] -> " + path + "[::-]")
+			}
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] download [message-id[]")
+		}
+	case "open":
+		if checkParam(command.Params, 1) {
+			if path, err := sm.downloadMessage(command.Params[0], true); err == nil {
+				sm.uiHandler.OpenFile(path)
+			} else {
+				sm.uiHandler.PrintError(err)
+			}
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] open [message-id[]")
+		}
+	case "show":
+		if checkParam(command.Params, 1) {
+			if path, err := sm.downloadMessage(command.Params[0], true); err == nil {
+				sm.uiHandler.PrintFile(path)
+			} else {
+				sm.uiHandler.PrintError(err)
+			}
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] show [message-id[]")
+		}
+	case "revoke":
+		if checkParam(command.Params, 1) {
+			wac := sm.getConnection()
+			var revId string
+			var err error
+			if msgg, ok := sm.db.otherMessages[command.Params[0]]; ok {
+				switch msg := (*msgg).(type) {
+				default:
+				case whatsapp.ImageMessage:
+					revId, err = wac.RevokeMessage(msg.Info.RemoteJid, msg.Info.Id, msg.Info.FromMe)
+				case whatsapp.DocumentMessage:
+					revId, err = wac.RevokeMessage(msg.Info.RemoteJid, msg.Info.Id, msg.Info.FromMe)
+				case whatsapp.AudioMessage:
+					revId, err = wac.RevokeMessage(msg.Info.RemoteJid, msg.Info.Id, msg.Info.FromMe)
+				case whatsapp.VideoMessage:
+					revId, err = wac.RevokeMessage(msg.Info.RemoteJid, msg.Info.Id, msg.Info.FromMe)
+				}
+			} else {
+				if msg, ok := sm.db.messagesById[command.Params[0]]; ok {
+					revId, err = wac.RevokeMessage(msg.Info.RemoteJid, msg.Info.Id, msg.Info.FromMe)
+				}
+			}
+			if err == nil {
+				sm.uiHandler.PrintText("revoked: " + revId)
+			}
+			sm.uiHandler.PrintError(err)
+		} else {
+			sm.uiHandler.PrintText("[red]Usage:[-] revoke [message-id[]")
+		}
+	case "leave":
+		groupId := sm.currentReceiver
+		if checkParam(command.Params, 1) {
+			groupId = command.Params[0]
+		}
+		wac := sm.getConnection()
+		var err error
+		_, err = wac.LeaveGroup(groupId)
+		if err == nil {
+			sm.uiHandler.PrintText("left group " + groupId)
+		}
+		sm.uiHandler.PrintError(err)
+	}
+}
+
+func checkParam(arr []string, length int) bool {
+	if arr == nil || len(arr) < length {
+		return false
+	}
+	return true
+}
+
+// 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.Config.General.DownloadPath
+		} else {
+			fileName += config.Config.General.PreviewPath
+		}
+		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")
+}
+
+// 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)
+		if sm.currentReceiver == wid {
+			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)
+	statusMsg := StatusMsg{false, err}
+	sm.StatusChannel <- statusMsg
+	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 (sm *SessionManager) HandleBatteryMessage(msg whatsapp.BatteryMessage) {
+	sm.BatteryChannel <- BatteryMsg{msg.Percentage, msg.Plugged, msg.Powersave}
+}
+
+// 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)
@@ -110,7 +558,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
 	}
@@ -125,5 +573,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,28 +1,20 @@
 package messages
 
 import (
-	"errors"
-	"io/ioutil"
-	"os"
 	"sort"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/Rhymen/go-whatsapp"
+	"github.com/normen/whatscli/config"
 	"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
 	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
-	mutex         sync.Mutex
 }
 
 // initialize the database
@@ -36,8 +28,6 @@ func (db *MessageDatabase) Init() {
 
 // add a text message to the database, stored by RemoteJid
 func (db *MessageDatabase) AddTextMessage(msg *whatsapp.TextMessage) bool {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
 	//var this = *db
 	var didNew = false
 	var wid = msg.Info.RemoteJid
@@ -50,18 +40,19 @@ func (db *MessageDatabase) AddTextMessage(msg *whatsapp.TextMessage) bool {
 		db.latestMessage[wid] = msg.Info.Timestamp
 		didNew = true
 	}
-	db.textMessages[wid] = append(db.textMessages[wid], msg)
-	db.messagesById[msg.Info.Id] = 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
 }
 
 // add audio/video/image/doc message, stored by message id
 func (db *MessageDatabase) AddOtherMessage(msg *interface{}) {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
 	var id = ""
 	switch v := (*msg).(type) {
 	default:
@@ -81,8 +72,6 @@ func (db *MessageDatabase) AddOtherMessage(msg *interface{}) {
 
 // get an array of all chat ids
 func (db *MessageDatabase) GetContactIds() []string {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
 	//var this = *db
 	keys := make([]string, len(db.textMessages))
 	i := 0
@@ -97,8 +86,6 @@ func (db *MessageDatabase) GetContactIds() []string {
 }
 
 func (db *MessageDatabase) GetMessageInfo(id string) string {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
 	if _, ok := db.otherMessages[id]; ok {
 		return "[yellow]OtherMessage[-]"
 	}
@@ -116,125 +103,37 @@ func (db *MessageDatabase) GetMessageInfo(id string) string {
 
 // get a string containing all messages for a chat by chat id
 func (db *MessageDatabase) GetMessagesString(wid string) (string, []string) {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
 	//var this = *db
 	var out = ""
 	var arr = []string{}
 	for _, element := range db.textMessages[wid] {
-		out += GetTextMessageString(element)
+		out += getTextMessageString(element)
 		out += "\n"
 		arr = append(arr, element.Info.Id)
 	}
 	return out, arr
 }
 
-// load data for message specified by message id TODO: support types
-func (db *MessageDatabase) LoadMessageData(wid string) ([]byte, error) {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
-	if msg, ok := 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 (db *MessageDatabase) DownloadMessage(wid string, open bool) (string, error) {
-	db.mutex.Lock()
-	defer db.mutex.Unlock()
-	if msg, ok := db.otherMessages[wid]; ok {
-		var fileName string = GetHomeDir() + "Downloads" + 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, open)
-				} 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, open)
-				} 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, open)
-				} 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, open)
-				} else {
-					return fileName, err
-				}
-			}
-		}
-	}
-	return "", errors.New("No attachments found")
-}
-
 // create a formatted string with regions based on message ID from a text message
-func GetTextMessageString(msg *whatsapp.TextMessage) string {
+// TODO: move message styling into UI
+func getTextMessageString(msg *whatsapp.TextMessage) string {
+	colorMe := config.Config.Colors.ChatMe
+	colorContact := config.Config.Colors.ChatContact
 	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](" + tim.Format("02-01-06 15:04:05") + ") [blue::b]Me: [-::-]" + text
+		out += "[-::d](" + time + ") [" + colorMe + "::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
+		out += "[-::d](" + time + ") [" + colorContact + "::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 += "[-::d](" + time + ") [" + colorContact + "::b]" + GetIdShort(msg.Info.RemoteJid) + ": [-::-]" + text
 	}
 	out += "[\"\"]"
 	return out
 }
-
-// helper to save an attachment and open it if specified
-func saveAttachment(data []byte, path string, openIt bool) (string, error) {
-	err := ioutil.WriteFile(path, data, 0644)
-	if err == nil {
-		if openIt {
-			open.Run(path)
-		}
-	} else {
-		return path, err
-	}
-	return path, nil
-}