only load messages to memory for inline display

improve README layout
small fix in release script
2020-11-19 20:38:02 +01:00 · 2020-11-19 18:01:01 +01:00 · 2020-11-19 17:10:09 +01:00 · 2020-11-19 17:05:21 +01:00 · 2020-11-19 16:49:29 +01:00 · 2020-11-19 16:40:59 +01:00
11 changed files with 650 additions and 185 deletions
--- a/22
+++ b/22
@@ -0,0 +1,22 @@
+# Simple Makefile for go
+
+build:
+	go build
+
+clean:
+	go clean
+
+run:
+	go run .
+
+install:
+	go install .
+
+get:
+	go get
+
+update:
+	go get -u
+
+release:
+	./release.sh
--- a/README.md
+++ b/README.md
@@ -2,52 +2,28 @@

 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

 Things that work.

+- Connects through the Web App API without a browser
 - Allows sending and receiving WhatsApp messages in a command line app
- Connects through the Web App API without browser
+- Allows downloading and opening image/video/audio/document attachments
 - Uses QR code for simple setup
 - Binaries for Windows, Mac, Linux and RaspBerry Pi

 ### 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
- Names have to be entered with the `/name` or `/addname` commands
- No support for images, videos, documents etc.
 - No incoming message notification / count
 - No proper connection drop handling
- Not configurable at all
+- 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

@@ -55,8 +31,27 @@ This is a WIP. Heres some things you might expect to work that don't. Plus some

 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)

+### Package Managers
+
+Some unofficial 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)
+
+- `git clone https://aur.archlinux.org/whatscli.git`
+- `cd whatscli`
+- `makepkg -si`
+- `yay -S whatscli`
+
--- a/doc/screenshot.png
+++ b/doc/screenshot.png
--- a/go.mod
+++ b/go.mod
@@ -3,16 +3,18 @@ module github.com/normen/whatscli
 go 1.15

 require (
-	github.com/Rhymen/go-whatsapp v0.1.1-0.20201007125822-005103751b7a
+	github.com/Rhymen/go-whatsapp v0.1.1
 	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
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/mattn/go-colorable v0.1.8
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/rivo/tview v0.0.0-20201018122409-d551c850a743
+	github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582 // indirect
-	golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48 // indirect
+	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
+	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
 )
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,9 @@
 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 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=
@@ -17,16 +14,11 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 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.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=
 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=
@@ -42,43 +34,39 @@ 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/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 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/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/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/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
+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.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/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=
 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=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -96,19 +84,18 @@ 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-20201017003518-b09fb700fbb7 h1:XtNJkfEjb4zR3q20BBBcYUykVOEMgZeIUOpBPfNYgxg=
 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/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+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=
 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=
@@ -133,7 +120,6 @@ 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=
--- a/main.go
+++ b/main.go
@@ -1,13 +1,17 @@
 package main

 import (
+	"bufio"
 	"fmt"
+	"io"
+	"os/exec"
+	"strings"
+	"time"
+
 	"github.com/Rhymen/go-whatsapp"
 	"github.com/gdamore/tcell/v2"
 	"github.com/normen/whatscli/messages"
 	"github.com/rivo/tview"
-	"strings"
-	"time"
 )

 type waMsg struct {
@@ -15,21 +19,22 @@ type waMsg struct {
 	Text string
 }

-var VERSION string = "v0.4.4"
+var VERSION string = "v0.6.7"

 var sendChannel chan waMsg
 var textChannel chan whatsapp.TextMessage
+var otherChannel chan interface{}
 var contactChannel chan whatsapp.Contact

 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 connection *whatsapp.Conn
 var msgStore messages.MessageDatabase

 var contactRoot *tview.TreeNode
@@ -49,6 +54,7 @@ func main() {

 	topBar = tview.NewTextView()
 	topBar.SetDynamicColors(true)
+	topBar.SetScrollable(false)
 	topBar.SetText("[::b] WhatsCLI " + VERSION + "  [-::d]Type /help for help")

 	//infoBar = tview.NewTextView()
@@ -63,6 +69,116 @@ func main() {
 			app.Draw()
 		})

+	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)
@@ -73,6 +189,17 @@ func main() {
 	})
 	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
@@ -115,71 +242,13 @@ func main() {
 	app.SetFocus(textInput)
 	go func() {
 		if err := StartTextReceiver(); err != nil {
-			fmt.Fprint(textView, "[red]", err, "[-]")
+			PrintError(err)
 		}
 	}()
 	app.Run()
 }

-func PrintHelp() {
-	fmt.Fprint(textView, "[::b]WhatsCLI "+VERSION+"\n\n[-][-::u]Commands:[-::-]\n/name NewName = name selected contact\n/addname 1234567 NewName = add name for number\n/load = reload contacts\n/quit = exit app\n/help = show this help\n\n[-::u]Keys:[-::-]\n<Tab> = switch input/contacts\n<Up/Dn> = scroll history\n\n")
-}
-
-func EnterCommand(key tcell.Key) {
-	if sndTxt == "" {
-		return
-	}
-	if sndTxt == "/load" {
-		//command
-		LoadContacts()
-		textInput.SetText("")
-		return
-	}
-	if sndTxt == "/help" {
-		//command
-		PrintHelp()
-		textInput.SetText("")
-		return
-	}
-	if sndTxt == "/quit" {
-		//command
-		app.Stop()
-		return
-	}
-	if strings.Index(sndTxt, "/addname ") == 0 {
-		//command
-		parts := strings.Split(sndTxt, " ")
-		if len(parts) < 3 {
-			fmt.Fprint(textView, "Use /addname 1234567 NewName\n")
-			return
-		}
-		messages.SetIdName(parts[1]+messages.CONTACTSUFFIX, strings.TrimPrefix(sndTxt, "/addname "+parts[1]+" "))
-		SetDisplayedContact(currentReceiver)
-		LoadContacts()
-		textInput.SetText("")
-		return
-	}
-	if currentReceiver == "" {
-		fmt.Fprint(textView, "[red]no contact selected[-]\n")
-		return
-	}
-	if strings.Index(sndTxt, "/name ") == 0 {
-		//command
-		messages.SetIdName(currentReceiver, strings.TrimPrefix(sndTxt, "/name "))
-		SetDisplayedContact(currentReceiver)
-		LoadContacts()
-		textInput.SetText("")
-		return
-	}
-	// send message
-	msg := waMsg{
-		Wid:  currentReceiver,
-		Text: sndTxt,
-	}
-	sendChannel <- msg
-	textInput.SetText("")
-}
-
+// creates the TreeView for contacts
 func MakeTree() *tview.TreeView {
 	rootDir := "Contacts"
 	contactRoot = tview.NewTreeNode(rootDir).
@@ -209,11 +278,177 @@ func MakeTree() *tview.TreeView {
 			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
 }

+// prints help to chat view
+func PrintHelp() {
+	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, "")
+	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> = show image in chat using jp2a command")
+	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, "")
+}
+
+// called when text is entered by the user
+func EnterCommand(key tcell.Key) {
+	if sndTxt == "" {
+		return
+	}
+	if key == tcell.KeyEsc {
+		textInput.SetText("")
+		return
+	}
+	if sndTxt == "/connect" {
+		//command
+		messages.GetConnection()
+		textInput.SetText("")
+		return
+	}
+	if sndTxt == "/load" {
+		//command
+		LoadContacts()
+		textInput.SetText("")
+		return
+	}
+	if sndTxt == "/help" {
+		//command
+		PrintHelp()
+		textInput.SetText("")
+		return
+	}
+	if sndTxt == "/quit" {
+		//command
+		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{
+		Wid:  currentReceiver,
+		Text: sndTxt,
+	}
+	sendChannel <- msg
+	textInput.SetText("")
+}
+
+// get the next message id to select (highlighted + offset)
+func GetOffsetMsgId(curId string, offset int) string {
+	if curRegions == nil || len(curRegions) == 0 {
+		return ""
+	}
+	for idx, val := range curRegions {
+		if val == curId {
+			arrPos := idx + offset
+			if len(curRegions) > arrPos && arrPos >= 0 {
+				return curRegions[arrPos]
+			}
+		}
+	}
+	if offset > 0 {
+		return curRegions[0]
+	} else {
+		return curRegions[len(curRegions)-1]
+	}
+}
+
+// prints a text message to the TextView
+func PrintTextMessage(msg whatsapp.TextMessage) {
+	fmt.Fprintln(textView, messages.GetTextMessageString(&msg))
+}
+
+// prints text to the TextView
+func PrintText(txt string) {
+	fmt.Fprintln(textView, txt)
+}
+
+// prints an error to the TextView
+func PrintError(err error) {
+	fmt.Fprintln(textView, "[red]", err.Error(), "[-]")
+}
+
+// prints an image attachment to the TextView (by message id)
+func PrintImage(id string) {
+	PrintText("[::d]loading image..[::-]")
+	var err error
+	var data []byte
+	if data, err = msgStore.LoadMessageData(id); err == nil {
+		cmd := exec.Command("jp2a", "--color", "-")
+		var stdout io.ReadCloser
+		var stdin io.WriteCloser
+		if stdout, err = cmd.StdoutPipe(); err == nil {
+			if stdin, err = cmd.StdinPipe(); err == nil {
+				if err = cmd.Start(); err == nil {
+					go func() {
+						writer := bufio.NewWriter(stdin)
+						writer.Write(data)
+					}()
+					reader := bufio.NewReader(stdout)
+					io.Copy(tview.ANSIWriter(textView), reader)
+					app.Draw()
+					return
+				}
+			}
+		}
+	}
+	PrintError(err)
+}
+
+// loads the contact data from storage to the TreeView
 func LoadContacts() {
 	var ids = msgStore.GetContactIds()
 	contactRoot.ClearChildren()
@@ -233,17 +468,20 @@ func LoadContacts() {
 	}
 }

+// sets the current contact, loads text from storage to TextView
 func SetDisplayedContact(wid string) {
 	currentReceiver = wid
 	textView.Clear()
 	textView.SetTitle(messages.GetIdName(wid))
-	textView.SetText(msgStore.GetMessagesString(wid))
+	msgTxt, regIds := msgStore.GetMessagesString(wid)
+	textView.SetText(msgTxt)
+	curRegions = regIds
 }

-// StartTextReceiver starts the handler for the text messages received
+// starts the receiver and message handling thread
 func StartTextReceiver() error {
-	var wac = GetConnection()
-	err := LoginWithConnection(wac)
+	var wac = messages.GetConnection()
+	err := messages.LoginWithConnection(wac)
 	if err != nil {
 		return fmt.Errorf("%v\n", err)
 	}
@@ -251,24 +489,29 @@ func StartTextReceiver() error {
 	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) {
+			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.Fprint(textView, "closing the receiver\n")
+	fmt.Fprintln(textView, "closing the receiver")
 	wac.Disconnect()
 	return nil
 }

+// sends text to whatsapp id
 func SendText(wid string, text string) {
 	msg := whatsapp.TextMessage{
 		Info: whatsapp.MessageInfo{
@@ -279,25 +522,45 @@ func SendText(wid string, text string) {
 		Text: text,
 	}

-	PrintTextMessage(msg)
-	//TODO: workaround for error when receiving&sending
-	connection.RemoveHandlers()
-	_, err := connection.Send(msg)
-	msgStore.AddTextMessage(msg)
-	connection.AddHandler(handler)
+	_, err := messages.GetConnection().Send(msg)
 	if err != nil {
-		fmt.Fprint(textView, "[red]error sending message: ", err, "\n[-]")
+		PrintError(err)
 	} else {
-		//fmt.Fprint(textView, "Sent msg with ID: ", msgID, "\n")
+		msgStore.AddTextMessage(&msg)
+		PrintTextMessage(msg)
 	}
 }

+// 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 {
+		//fmt.Print("\a")
+		//err := beeep.Notify(messages.GetIdName(msg.Info.RemoteJid), msg.Text, "")
+		//if err != nil {
+		//  fmt.Fprintln(textView, "[red]error in notification[-]")
+		//}
+	}
+}
+
+// handler struct for whatsapp callbacks
 type textHandler struct{}

-// HandleError implements the handler interface for go-whatsapp
+// HandleError implements the error handler interface for go-whatsapp
 func (t textHandler) HandleError(err error) {
 	// TODO : handle go routine here
-	fmt.Fprint(textView, "[red]error in textHandler : ", err, "\n[-]")
+	PrintError(err)
 	return
 }

@@ -305,16 +568,18 @@ func (t textHandler) HandleError(err error) {
 func (t textHandler) HandleTextMessage(msg whatsapp.TextMessage) {
 	textChannel <- msg
 	if msg.Info.RemoteJid != currentReceiver {
-		//fmt.Print("\a")
+		NotifyMsg(msg)
 		return
 	}
 	PrintTextMessage(msg)
+	// add to regions if current window, otherwise its not selectable
+	id := msg.Info.Id
+	app.QueueUpdate(func() {
+		curRegions = append(curRegions, id)
+	})
 }

-func PrintTextMessage(msg whatsapp.TextMessage) {
-	fmt.Fprint(textView, messages.GetTextMessageString(&msg))
-}
-
+// methods to convert messages to TextMessage
 func (t textHandler) HandleImageMessage(message whatsapp.ImageMessage) {
 	msg := whatsapp.TextMessage{
 		Info: whatsapp.MessageInfo{
@@ -322,10 +587,12 @@ func (t textHandler) HandleImageMessage(message whatsapp.ImageMessage) {
 			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 (t textHandler) HandleDocumentMessage(message whatsapp.DocumentMessage) {
@@ -335,10 +602,12 @@ func (t textHandler) HandleDocumentMessage(message whatsapp.DocumentMessage) {
 			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 (t textHandler) HandleVideoMessage(message whatsapp.VideoMessage) {
@@ -348,10 +617,12 @@ func (t textHandler) HandleVideoMessage(message whatsapp.VideoMessage) {
 			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 (t textHandler) HandleAudioMessage(message whatsapp.AudioMessage) {
@@ -361,16 +632,21 @@ func (t textHandler) HandleAudioMessage(message whatsapp.AudioMessage) {
 			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) {
-	contactChannel <- 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) + "%")
--- a/messages/contacts.go
+++ b/messages/contacts.go
@@ -5,10 +5,14 @@ import (
 	"os"
 	"os/user"
 	"strings"
+
+	"github.com/Rhymen/go-whatsapp"
 )

 var contacts map[string]string
+var connection *whatsapp.Conn

+// loads custom contacts from disk
 func LoadContacts() {
 	contacts = make(map[string]string)
 	file, err := os.Open(GetHomeDir() + ".whatscli.contacts")
@@ -23,6 +27,7 @@ func LoadContacts() {
 	}
 }

+// saves custom contacts to disk
 func SaveContacts() {
 	file, err := os.Create(GetHomeDir() + ".whatscli.contacts")
 	if err != nil {
@@ -37,18 +42,47 @@ func SaveContacts() {
 	return
 }

+// sets a new name for a whatsapp id
 func SetIdName(id string, name string) {
 	contacts[id] = name
 	SaveContacts()
 }

+// gets a pretty name for a whatsapp id
 func GetIdName(id string) string {
+	if _, ok := contacts[id]; ok {
+		return contacts[id]
+	}
+	if val, ok := connection.Store.Contacts[id]; ok {
+		if val.Name != "" {
+			return val.Name
+		} else if val.Short != "" {
+			return val.Short
+		} else if val.Notify != "" {
+			return val.Notify
+		}
+	}
+	return strings.TrimSuffix(id, CONTACTSUFFIX)
+}
+
+// gets a short name for a whatsapp id
+func GetIdShort(id string) string {
+	if val, ok := connection.Store.Contacts[id]; ok {
+		if val.Short != "" {
+			return val.Short
+		} else if val.Name != "" {
+			return val.Name
+		} else if val.Notify != "" {
+			return val.Notify
+		}
+	}
 	if _, ok := contacts[id]; ok {
 		return contacts[id]
 	}
 	return strings.TrimSuffix(id, CONTACTSUFFIX)
 }

+// gets the OS home dir with a path separator at the end
 func GetHomeDir() string {
 	usr, err := user.Current()
 	if err != nil {
--- a/messages/session_manager.go
+++ b/messages/session_manager.go
@@ -1,17 +1,24 @@
-package main
+package messages

 import (
 	"encoding/gob"
 	"fmt"
 	"github.com/rivo/tview"
 	"os"
-	"os/user"
 	"time"

 	"github.com/Rhymen/go-whatsapp"
 	"github.com/normen/whatscli/qrcode"
 )

+var textView *tview.TextView
+
+// TODO: remove this circular dependeny in favor of a better way
+func SetTextView(tv *tview.TextView) {
+	textView = tv
+}
+
+// gets an existing connection or creates one
 func GetConnection() *whatsapp.Conn {
 	var wac *whatsapp.Conn
 	if connection == nil {
@@ -76,13 +83,7 @@ func Logout() error {
 	return removeSession()
 }

-func GetHomeDir() string {
-	usr, err := user.Current()
-	if err != nil {
-	}
-	return usr.HomeDir + string(os.PathSeparator)
-}
-
+// reads the session file from disk
 func readSession() (whatsapp.Session, error) {
 	session := whatsapp.Session{}
 	file, err := os.Open(GetHomeDir() + ".whatscli.session")
@@ -98,6 +99,7 @@ func readSession() (whatsapp.Session, error) {
 	return session, nil
 }

+// saves the session file to disk
 func writeSession(session whatsapp.Session) error {
 	file, err := os.Create(GetHomeDir() + ".whatscli.session")
 	if err != nil {
@@ -112,6 +114,7 @@ func writeSession(session whatsapp.Session) error {
 	return nil
 }

+// deletes the session file from disk
 func removeSession() error {
 	return os.Remove(GetHomeDir() + ".whatscli.session")
 }
--- a/messages/storage.go
+++ b/messages/storage.go
@@ -1,33 +1,44 @@
 package messages

 import (
-	"github.com/Rhymen/go-whatsapp"
-	"github.com/rivo/tview"
+	"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
-	latestMessage map[string]uint64
+	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).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)
 }

-func (db *MessageDatabase) AddTextMessage(msg whatsapp.TextMessage) bool {
+// add a text message to the database, stored by RemoteJid
+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{}
+		var newArr = []*whatsapp.TextMessage{}
 		(*db).textMessages[wid] = newArr
 		(*db).latestMessage[wid] = msg.Info.Timestamp
 		didNew = true
@@ -36,12 +47,33 @@ func (db *MessageDatabase) AddTextMessage(msg whatsapp.TextMessage) bool {
 		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
 	})
 	return didNew
 }

+// add audio/video/image/doc message, stored by message id
+func (db *MessageDatabase) AddOtherMessage(msg *interface{}) {
+	var id = ""
+	switch v := (*msg).(type) {
+	default:
+	case whatsapp.ImageMessage:
+		id = v.Info.Id
+	case whatsapp.DocumentMessage:
+		id = v.Info.Id
+	case whatsapp.AudioMessage:
+		id = v.Info.Id
+	case whatsapp.VideoMessage:
+		id = v.Info.Id
+	}
+	if id != "" {
+		(*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))
@@ -53,32 +85,129 @@ func (db *MessageDatabase) GetContactIds() []string {
 	sort.Slice(keys, func(i, j int) bool {
 		return (*db).latestMessage[keys[i]] > (*db).latestMessage[keys[j]]
 	})
-	//sort.Strings(keys)
 	return keys
 }

-func (db *MessageDatabase) GetMessagesString(wid string) string {
-	//var this = *db
-	var out = ""
-	for _, element := range (*db).textMessages[wid] {
-		out += GetTextMessageString(&element)
+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)
+		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 + "\n"
+		out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [blue::b]Me: [-::-]" + text
 	} else if strings.Contains((*msg).Info.RemoteJid, GROUPSUFFIX) { // group msg
-		//(*msg).Info.SenderJid
 		userId := (*msg).Info.SenderJid
-		//userId := strings.Split(string((*msg).Info.RemoteJid), "-")[0] + CONTACTSUFFIX
-		out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdName(userId) + ": [-::-]" + text + "\n"
+		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]" + GetIdName((*msg).Info.RemoteJid) + ": [-::-]" + text + "\n"
+		out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort((*msg).Info.RemoteJid) + ": [-::-]" + text
 	}
+	out += "[\"\"]"
 	return out
 }
+
+// load data for message specified by message id TODO: support types
+func (db *MessageDatabase) LoadMessageData(wid string) ([]byte, error) {
+	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) {
+	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/")
+				path, err := saveAttachment(data, fileName, open)
+				return path, 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/")
+				path, err := saveAttachment(data, fileName, open)
+				return path, err
+			} else {
+				return fileName, err
+			}
+		case whatsapp.AudioMessage:
+			if data, err := v.Download(); err == nil {
+				fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "audio/")
+				path, err := saveAttachment(data, fileName, open)
+				return path, err
+			} else {
+				return fileName, err
+			}
+		case whatsapp.VideoMessage:
+			if data, err := v.Download(); err == nil {
+				fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "video/")
+				path, err := saveAttachment(data, fileName, open)
+				return path, 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) (string, error) {
+	path := GetHomeDir() + "Downloads" + string(os.PathSeparator) + fileName
+	err := ioutil.WriteFile(path, data, 0644)
+	if err == nil {
+		if openIt {
+			open.Run(path)
+		}
+	} else {
+		return path, err
+	}
+	return path, nil
+}
--- a/qrcode/qrcode.go
+++ b/qrcode/qrcode.go
@@ -96,7 +96,7 @@ var (
 type QRCodeString string

 func (v *QRCodeString) Print() {
-	fmt.Fprint(outer, *v)
+	fmt.Fprintln(outer, *v)
 }

 type qrcodeTerminal struct {
--- a/release.sh
+++ b/release.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
 set -e
+# get verison from main.go VERSION string
 if [ $# -eq 0 ]; then
-  echo "Usage: ./release.sh v1.0.0"
-  exit 0
+	VERSION=$(cat main.go|grep "VERSION string"| awk -v FS="(\")" '{print $2}')
+else
+  VERSION=$1
 fi
-WINF=whatscli-$1-windows.zip
-LINUXF=whatscli-$1-linux.zip
-MACF=whatscli-$1-macos.zip
-RASPIF=whatscli-$1-raspberrypi.zip
+echo Releasing $VERSION
+WINF=whatscli-$VERSION-windows.zip
+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
@@ -22,10 +26,24 @@ 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
 vim changes.txt
-gh release create $1 $LINUXF $MACF $WINF $RASPIF -F changes.txt -t $1
+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
Author	SHA1	Message	Date
normen	b2b798c514	only load messages to memory for inline display	2020-11-19 20:38:02 +01:00
normen	5d63cf41eb	improve README layout	2020-11-19 18:01:01 +01:00
normen	e519c4a892	small fix in release script	2020-11-19 17:10:09 +01:00
normen	754106de62	fix last messages in open chat not being selectable	2020-11-19 17:05:21 +01:00
normen	07474c5b3d	improve release script	2020-11-19 16:49:29 +01:00
normen	b142aef93c	add homebrew tap update to release script	2020-11-19 16:40:59 +01:00
normen	babe81c1aa	add info about package managers	2020-11-19 14:11:01 +01:00
normen	b89ecfec79	add screenshot	2020-11-19 12:36:53 +01:00
normen	5e7659b845	clean/update dependencies	2020-11-19 12:28:56 +01:00
normen	eee49d713d	upadate docs, use color in jp2a	2020-11-19 04:40:43 +01:00
normen	2a6b0efe68	always scroll back chat view when exiting	2020-11-19 04:28:35 +01:00
normen	9ee28a011c	improve focus and highlight handling	2020-11-19 04:03:51 +01:00
normen	16a6519ba7	add s key to help	2020-11-19 03:05:59 +01:00
normen	bb00a9a8f0	allow displaying images using jp2a	2020-11-19 03:04:22 +01:00
normen	4ef8b76a55	report full path on download	2020-11-19 02:59:01 +01:00
normen	6a832cbcf3	reduce data copying	2020-11-19 01:08:22 +01:00
normen	c2f3a012dc	remove highlights when pressing <Esc> or o/d	2020-11-19 00:24:27 +01:00
normen	147feb90ec	update README	2020-11-19 00:04:48 +01:00
normen	b39d4891e0	fix inverted logic for selecting messages	2020-11-19 00:02:21 +01:00
normen	19455b0baa	add some code documentation	2020-11-18 23:58:28 +01:00
normen	a37e6c7d3b	fix selection when highlight is not visible	2020-11-18 23:36:13 +01:00
normen	82d2a6637d	allow navigating chat window selection	2020-11-18 23:30:02 +01:00
normen	1eb3af823e	move session_manager to messages package	2020-11-18 22:53:00 +01:00
normen	773f9b783d	add support for opening attachments	2020-11-18 22:39:53 +01:00
normen	e290a79064	add makefile for VIM	2020-11-18 13:23:49 +01:00
normen	7ae3967fbc	improve contact handling, use short name in chat	2020-11-18 13:23:19 +01:00
normen	5045ac59f5	use short name first when loading name from web	2020-11-18 01:11:58 +01:00
normen	2db7e51327	update README	2020-11-18 01:05:24 +01:00
normen	e698b66819	use go-whatsapps built-in contacts list (d'oh!)	2020-11-18 01:00:51 +01:00
normen	7fdafb477a	bump version to 0.5.0	2020-11-17 21:52:38 +01:00
normen	13632156a1	update go-whatsapp to master, remove send workaround	2020-11-17 21:49:44 +01:00
normen	08b69673e3	don't send message on <esc>, delete input instead	2020-11-17 21:39:27 +01:00
normen	36b8bdac2f	update dependencies	2020-11-17 20:45:39 +01:00
normen	43c5795cc7	fix formatting	2020-11-17 18:54:16 +01:00
normen	2063aeec91	add Ctrl-E and Ctrl-Space to switch panes	2020-11-17 18:50:18 +01:00
normen	310e9fa2ab	use println instead of print	2020-11-17 16:24:59 +01:00
normen	c860542052	add some code documentation	2020-11-17 02:34:51 +01:00