Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
04960123da | ||
|
|
ab03aeb7a0 | ||
|
|
f6860b56b8 | ||
|
|
6bea425367 | ||
|
|
1b3379b613 | ||
|
|
1cc68c9203 | ||
|
|
c3a6f98b13 | ||
|
|
21fec5a5d0 | ||
|
|
b2b798c514 | ||
|
|
5d63cf41eb | ||
|
|
e519c4a892 | ||
|
|
754106de62 | ||
|
|
07474c5b3d | ||
|
|
b142aef93c | ||
|
|
babe81c1aa | ||
|
|
b89ecfec79 | ||
|
|
5e7659b845 | ||
|
|
eee49d713d | ||
|
|
2a6b0efe68 | ||
|
|
9ee28a011c | ||
|
|
16a6519ba7 | ||
|
|
bb00a9a8f0 | ||
|
|
4ef8b76a55 |
52
README.md
52
README.md
@@ -2,31 +2,7 @@
|
||||
|
||||
A command line interface for whatsapp, based on [go-whatsapp](https://github.com/Rhymen/go-whatsapp) and [tview](https://github.com/rivo/tview)
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────────────┐
|
||||
│ WhatsCLI v0.4.2 Help: /name NewName | /addname 123456 NewName | /quit |│
|
||||
├──────────────────────────────┬──────────────────────────────────────────┤
|
||||
│Contacts │(03-14-12 22:59:00) Me: Hey, whatscli here│
|
||||
│├──Peter │(03-14-12 23:00:00) Peter: Cool 😀 │
|
||||
│├──Paul │ │
|
||||
│└──Mary │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ │ │
|
||||
│ ├──────────────────────────────────────────┤
|
||||
│ │Yeah, love the shell! │
|
||||
└──────────────────────────────┴──────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
|
||||
## Features
|
||||
|
||||
@@ -40,13 +16,14 @@ Things that work.
|
||||
|
||||
### Caveats
|
||||
|
||||
This is a WIP. Heres some things you might expect to work that don't. Plus some other things I should mention.
|
||||
This is a WIP and mainly meant for my personal use. Heres some things you might expect to work that don't. Plus some other things I should mention.
|
||||
|
||||
- Only shows existing chats
|
||||
- Only fetches a few old messages
|
||||
- No incoming message notification / count
|
||||
- No proper connection drop handling
|
||||
- Not configurable at all
|
||||
- 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
|
||||
|
||||
@@ -54,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)
|
||||
- Scan the QR code with WhatsApp on your phone (resize shell or change font size to see whole code)
|
||||
|
||||
### Package Managers
|
||||
|
||||
Some ways to install via package managers are supported but the installed version might be out of date.
|
||||
|
||||
#### MacOS (homebrew)
|
||||
|
||||
- `brew install normen/tap/whatscli`
|
||||
|
||||
#### Arch Linux (AUR)
|
||||
|
||||
- `git clone https://aur.archlinux.org/whatscli.git`
|
||||
- `cd whatscli`
|
||||
- `makepkg -si`
|
||||
- `yay -S whatscli`
|
||||
|
||||
|
||||
BIN
doc/screenshot.png
Normal file
BIN
doc/screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 421 KiB |
2
go.mod
2
go.mod
@@ -14,7 +14,7 @@ require (
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||
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-20201118182958-a01c418693c7 // indirect
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
|
||||
golang.org/x/text v0.3.4 // indirect
|
||||
google.golang.org/protobuf v1.25.0 // indirect
|
||||
)
|
||||
|
||||
58
go.sum
58
go.sum
@@ -1,44 +1,24 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
|
||||
github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/Rhymen/go-whatsapp v0.0.0/go.mod h1:rdQr95g2C1xcOfM7QGOhza58HeI3I+tZ/bbluv7VazA=
|
||||
github.com/Rhymen/go-whatsapp v0.1.0 h1:XTXhFIQ/fx9jKObUnUX2Q+nh58EyeHNhX7DniE8xeuA=
|
||||
github.com/Rhymen/go-whatsapp v0.1.0/go.mod h1:xJSy+okeRjKkQEH/lEYrnekXB3PG33fqL0I6ncAkV50=
|
||||
github.com/Rhymen/go-whatsapp v0.1.1-0.20201007125822-005103751b7a h1:LW+rX0NY6LzMPa2hJcgmQlfiFJUihzOMAaIoCq+P3xc=
|
||||
github.com/Rhymen/go-whatsapp v0.1.1-0.20201007125822-005103751b7a/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
|
||||
github.com/Rhymen/go-whatsapp v0.1.1-0.20201117204225-79ad714fa46a h1:IhYU0cQ0cvMO9MOuOO08X8zUtMQ+AVIV0D+7eZVtHe8=
|
||||
github.com/Rhymen/go-whatsapp v0.1.1-0.20201117204225-79ad714fa46a/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
|
||||
github.com/Rhymen/go-whatsapp v0.1.1 h1:OK+bCugQcr2YjyYKeDzULqCtM50TPUFM6LvQtszKfcw=
|
||||
github.com/Rhymen/go-whatsapp v0.1.1/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
|
||||
github.com/Rhymen/go-whatsapp/examples/echo v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:zgCiQtBtZ4P4gFWvwl9aashsdwOcbb/EHOGRmSzM8ME=
|
||||
github.com/Rhymen/go-whatsapp/examples/restoreSession v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:5sCUSpG616ZoSJhlt9iBNI/KXBqrVLcNUJqg7J9+8pU=
|
||||
github.com/Rhymen/go-whatsapp/examples/sendImage v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:RdiyhanVEGXTam+mZ3k6Y3VDCCvXYCwReOoxGozqhHw=
|
||||
github.com/Rhymen/go-whatsapp/examples/sendTextMessages v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:suwzklatySS3Q0+NCxCDh5hYfgXdQUWU1DNcxwAxStM=
|
||||
github.com/SchulteMK/go-whatsapp v0.0.0-20201117193111-50e7347bfbb6 h1:Rsit49rPlurIGzQn9VGOPph0pNjUX+bo+9Lg51D8rn0=
|
||||
github.com/SchulteMK/go-whatsapp v0.0.0-20201117193111-50e7347bfbb6/go.mod h1:o7jjkvKnigfu432dMbQ/w4PH0Yp5u4Y6ysCNjUlcYCk=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
|
||||
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
|
||||
github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=
|
||||
github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0=
|
||||
github.com/gdamore/tcell/v2 v2.0.0 h1:GRWG8aLfWAlekj9Q6W29bVvkHENc6hp79XOqG4AWDOs=
|
||||
github.com/gdamore/tcell/v2 v2.0.0/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
|
||||
github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7NxVyGo8M3KI5jbkiwNAdZFFzAdC68up4=
|
||||
github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA=
|
||||
github.com/gen2brain/beeep v0.0.0-20200526185328-e9c15c258e28 h1:M2Zt3G2w6Q57GZndOYk42p7RvMeO8izO8yKTfIxGqxA=
|
||||
github.com/gen2brain/beeep v0.0.0-20200526185328-e9c15c258e28/go.mod h1:ElSskYZe3oM8kThaHGJ+kiN2yyUMVXMZ7WxF9QqLDS8=
|
||||
github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=
|
||||
github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=
|
||||
github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
|
||||
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk=
|
||||
github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
|
||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||
@@ -54,61 +34,37 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c h1:16eHWuMGvCjSfgRJKqIzapE78onvvTbdi1rMkU00lZw=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gopherjs/gopherwasm v1.1.0 h1:fA2uLoctU5+T3OhOn2vYP0DVT6pxc7xhTlBB1paATqQ=
|
||||
github.com/gopherjs/gopherwasm v1.1.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
|
||||
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
|
||||
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
|
||||
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
|
||||
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||
github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
|
||||
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
|
||||
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
|
||||
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||
github.com/mattn/go-isatty v0.0.5 h1:tHXDdz1cpzGaovsTB+TVB8q90WEokoVmfMqoVcrLUgw=
|
||||
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
|
||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
|
||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/rivo/tview v0.0.0-20201018122409-d551c850a743 h1:9BBjVJTRxuYBeCAv9DFH2hSzY0ujLx5sxMg5D3K/Xeg=
|
||||
github.com/rivo/tview v0.0.0-20201018122409-d551c850a743/go.mod h1:t7mcA3nlK9dxD1DMoz/DQRMWFMkGBUj6rJBM5VNfLFA=
|
||||
github.com/rivo/tview v0.0.0-20201117185959-f9f2182520da h1:XUh+g7tjO81Ph5+7GSco4VLrBbQPnakm8M6sQU+fT5Y=
|
||||
github.com/rivo/tview v0.0.0-20201117185959-f9f2182520da/go.mod h1:0ha5CGekam8ZV1kxkBxSlh7gfQ7YolUj2P/VruwH0QY=
|
||||
github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893 h1:24As98PZlIdjZn6V4wUulAbYlG7RPg/du9A1FZdT/vs=
|
||||
github.com/rivo/tview v0.0.0-20201118063654-f007e9ad3893/go.mod h1:0ha5CGekam8ZV1kxkBxSlh7gfQ7YolUj2P/VruwH0QY=
|
||||
github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
|
||||
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
|
||||
github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo=
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
||||
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
|
||||
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
|
||||
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af h1:6yITBqGTE2lEeTPG04SN9W+iWHCRyHqlVYILiSXziwk=
|
||||
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af/go.mod h1:4F09kP5F+am0jAwlQLddpoMDM+iewkxxt6nxUQ5nq5o=
|
||||
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582 h1:0WDrJ1E7UolDk1KhTXxxw3Fc8qtk5x7dHP431KHEJls=
|
||||
golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582/go.mod h1:tCqSYrHVcf3i63Co2FzBkTCo2gdF6Zak62921dSfraU=
|
||||
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
|
||||
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
@@ -128,27 +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-20200302150141-5c8b2ff67527/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/sys v0.0.0-20201117170446-d9b008d0a637 h1:O5hKNaGxIT4A8OTMnuh6UpmBdI3SAPxlZ3g0olDrJVM=
|
||||
golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7 h1:s330+6z/Ko3J0o6rvOcwXe5nzs7UT9tLKHoOXYn6uE0=
|
||||
golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201118182958-a01c418693c7 h1:Z991aAXPjz0tLnj74pVXW3eWJ5lHMIBvbRfMq4M2jHA=
|
||||
golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
|
||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
@@ -173,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=
|
||||
|
||||
159
main.go
159
main.go
@@ -1,7 +1,10 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -16,7 +19,7 @@ type waMsg struct {
|
||||
Text string
|
||||
}
|
||||
|
||||
var VERSION string = "v0.6.2"
|
||||
var VERSION string = "v0.6.10"
|
||||
|
||||
var sendChannel chan waMsg
|
||||
var textChannel chan whatsapp.TextMessage
|
||||
@@ -68,19 +71,28 @@ func main() {
|
||||
|
||||
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 {
|
||||
@@ -127,6 +139,8 @@ func main() {
|
||||
if len(hls) > 0 {
|
||||
DownloadMessageId(hls[0], false)
|
||||
textView.Highlight("")
|
||||
textView.ScrollToEnd()
|
||||
app.SetFocus(textInput)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -135,14 +149,28 @@ func main() {
|
||||
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.Fprintf(textView, msgStore.GetMessageInfo(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
|
||||
}
|
||||
@@ -167,6 +195,9 @@ func main() {
|
||||
}
|
||||
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 {
|
||||
@@ -211,7 +242,7 @@ func main() {
|
||||
app.SetFocus(textInput)
|
||||
go func() {
|
||||
if err := StartTextReceiver(); err != nil {
|
||||
fmt.Fprintln(textView, "[red]", err, "[-]")
|
||||
PrintError(err)
|
||||
}
|
||||
}()
|
||||
app.Run()
|
||||
@@ -253,6 +284,9 @@ func MakeTree() *tview.TreeView {
|
||||
}
|
||||
if event.Key() == tcell.KeyCtrlW {
|
||||
app.SetFocus(textView)
|
||||
if curRegions != nil && len(curRegions) > 0 {
|
||||
textView.Highlight(curRegions[len(curRegions)-1])
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return event
|
||||
@@ -262,22 +296,24 @@ func MakeTree() *tview.TreeView {
|
||||
|
||||
// prints help to chat view
|
||||
func PrintHelp() {
|
||||
fmt.Fprintln(textView, "[::b]WhatsCLI "+VERSION+"[-]\n")
|
||||
fmt.Fprintln(textView, "[::b]WhatsCLI "+VERSION+"[-]")
|
||||
fmt.Fprintln(textView, "")
|
||||
fmt.Fprintln(textView, "[-::u]Keys:[-::-]")
|
||||
fmt.Fprintln(textView, "<Tab> = switch input/contacts")
|
||||
fmt.Fprintln(textView, "<Up/Dn> = scroll history")
|
||||
fmt.Fprintln(textView, "<Ctrl-W> = focus chat window\n")
|
||||
fmt.Fprintln(textView, "<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")
|
||||
fmt.Fprintln(textView, "<o> = open attachment\n")
|
||||
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, "")
|
||||
fmt.Fprintln(textView, "[-::u]Commands:[-::-]")
|
||||
fmt.Fprintln(textView, "/name NewName = name selected contact")
|
||||
fmt.Fprintln(textView, "/addname 1234567 NewName = add name for number")
|
||||
fmt.Fprintln(textView, "/connect = (re)connect in case the connection dropped")
|
||||
fmt.Fprintln(textView, "/load = reload contacts")
|
||||
fmt.Fprintln(textView, "/quit = exit app")
|
||||
fmt.Fprintln(textView, "/help = show this help\n")
|
||||
fmt.Fprintln(textView, "/help = show this help")
|
||||
fmt.Fprintln(textView, "")
|
||||
}
|
||||
|
||||
// called when text is entered by the user
|
||||
@@ -291,7 +327,8 @@ func EnterCommand(key tcell.Key) {
|
||||
}
|
||||
if sndTxt == "/connect" {
|
||||
//command
|
||||
messages.GetConnection()
|
||||
msgStore.Init()
|
||||
messages.Login()
|
||||
textInput.SetText("")
|
||||
return
|
||||
}
|
||||
@@ -370,6 +407,63 @@ 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))
|
||||
}
|
||||
|
||||
// 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) {
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
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)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
// 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()
|
||||
@@ -446,48 +540,20 @@ func SendText(wid string, text string) {
|
||||
|
||||
_, err := messages.GetConnection().Send(msg)
|
||||
if err != nil {
|
||||
fmt.Fprintln(textView, "[red]error sending message: ", err, "[-]")
|
||||
PrintError(err)
|
||||
} else {
|
||||
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[-]")
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
// prints a text message to the TextView
|
||||
func PrintTextMessage(msg whatsapp.TextMessage) {
|
||||
fmt.Fprintln(textView, messages.GetTextMessageString(&msg))
|
||||
}
|
||||
|
||||
// handler struct for whatsapp callbacks
|
||||
type textHandler struct{}
|
||||
|
||||
// HandleError implements the error handler interface for go-whatsapp
|
||||
func (t textHandler) HandleError(err error) {
|
||||
// TODO : handle go routine here
|
||||
fmt.Fprintln(textView, "[red]error in textHandler : ", err, "[-]")
|
||||
PrintText("[red]go-whatsapp reported an error:[-]")
|
||||
PrintError(err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -499,6 +565,11 @@ func (t textHandler) HandleTextMessage(msg whatsapp.TextMessage) {
|
||||
return
|
||||
}
|
||||
PrintTextMessage(msg)
|
||||
// add to regions if current window, otherwise its not selectable
|
||||
id := msg.Info.Id
|
||||
app.QueueUpdate(func() {
|
||||
curRegions = append(curRegions, id)
|
||||
})
|
||||
}
|
||||
|
||||
// methods to convert messages to TextMessage
|
||||
|
||||
@@ -3,15 +3,18 @@ package messages
|
||||
import (
|
||||
"encoding/gob"
|
||||
"fmt"
|
||||
"github.com/rivo/tview"
|
||||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/rivo/tview"
|
||||
|
||||
"github.com/Rhymen/go-whatsapp"
|
||||
"github.com/normen/whatscli/qrcode"
|
||||
)
|
||||
|
||||
var textView *tview.TextView
|
||||
var connMutex sync.Mutex
|
||||
|
||||
// TODO: remove this circular dependeny in favor of a better way
|
||||
func SetTextView(tv *tview.TextView) {
|
||||
@@ -20,6 +23,8 @@ func SetTextView(tv *tview.TextView) {
|
||||
|
||||
// gets an existing connection or creates one
|
||||
func GetConnection() *whatsapp.Conn {
|
||||
connMutex.Lock()
|
||||
defer connMutex.Unlock()
|
||||
var wac *whatsapp.Conn
|
||||
if connection == nil {
|
||||
wacc, err := whatsapp.NewConn(5 * time.Second)
|
||||
@@ -44,8 +49,10 @@ func Login() error {
|
||||
// LoginWithConnection logs in the user using a provided connection. It ries to see if a session already exists. If not, tries to create a
|
||||
// new one using qr scanned on the terminal.
|
||||
func LoginWithConnection(wac *whatsapp.Conn) error {
|
||||
if wac.Info != nil && wac.Info.Connected {
|
||||
return nil
|
||||
connMutex.Lock()
|
||||
defer connMutex.Unlock()
|
||||
if wac != nil && wac.GetConnected() {
|
||||
wac.Disconnect()
|
||||
}
|
||||
//load saved session
|
||||
session, err := readSession()
|
||||
@@ -80,6 +87,8 @@ func LoginWithConnection(wac *whatsapp.Conn) error {
|
||||
|
||||
// Logout logs out the user.
|
||||
func Logout() error {
|
||||
connMutex.Lock()
|
||||
defer connMutex.Unlock()
|
||||
return removeSession()
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/Rhymen/go-whatsapp"
|
||||
@@ -21,41 +22,46 @@ type MessageDatabase struct {
|
||||
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
|
||||
func (db *MessageDatabase) Init() {
|
||||
//var this = *db
|
||||
(*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)
|
||||
db.textMessages = make(map[string][]*whatsapp.TextMessage)
|
||||
db.messagesById = make(map[string]*whatsapp.TextMessage)
|
||||
db.otherMessages = make(map[string]*interface{})
|
||||
db.latestMessage = make(map[string]uint64)
|
||||
}
|
||||
|
||||
// add a text message to the database, stored by RemoteJid
|
||||
func (db *MessageDatabase) AddTextMessage(msg *whatsapp.TextMessage) bool {
|
||||
db.mutex.Lock()
|
||||
defer db.mutex.Unlock()
|
||||
//var this = *db
|
||||
var didNew = false
|
||||
var wid = msg.Info.RemoteJid
|
||||
if (*db).textMessages[wid] == nil {
|
||||
if db.textMessages[wid] == nil {
|
||||
var newArr = []*whatsapp.TextMessage{}
|
||||
(*db).textMessages[wid] = newArr
|
||||
(*db).latestMessage[wid] = msg.Info.Timestamp
|
||||
db.textMessages[wid] = newArr
|
||||
db.latestMessage[wid] = msg.Info.Timestamp
|
||||
didNew = true
|
||||
} else if (*db).latestMessage[wid] < msg.Info.Timestamp {
|
||||
(*db).latestMessage[wid] = msg.Info.Timestamp
|
||||
} else if db.latestMessage[wid] < msg.Info.Timestamp {
|
||||
db.latestMessage[wid] = msg.Info.Timestamp
|
||||
didNew = true
|
||||
}
|
||||
(*db).textMessages[wid] = append((*db).textMessages[wid], msg)
|
||||
(*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
|
||||
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{}) {
|
||||
db.mutex.Lock()
|
||||
defer db.mutex.Unlock()
|
||||
var id = ""
|
||||
switch v := (*msg).(type) {
|
||||
default:
|
||||
@@ -69,31 +75,35 @@ func (db *MessageDatabase) AddOtherMessage(msg *interface{}) {
|
||||
id = v.Info.Id
|
||||
}
|
||||
if id != "" {
|
||||
(*db).otherMessages[id] = msg
|
||||
db.otherMessages[id] = msg
|
||||
}
|
||||
}
|
||||
|
||||
// get an array of all chat ids
|
||||
func (db *MessageDatabase) GetContactIds() []string {
|
||||
db.mutex.Lock()
|
||||
defer db.mutex.Unlock()
|
||||
//var this = *db
|
||||
keys := make([]string, len((*db).textMessages))
|
||||
keys := make([]string, len(db.textMessages))
|
||||
i := 0
|
||||
for k := range (*db).textMessages {
|
||||
for k := range db.textMessages {
|
||||
keys[i] = k
|
||||
i++
|
||||
}
|
||||
sort.Slice(keys, func(i, j int) bool {
|
||||
return (*db).latestMessage[keys[i]] > (*db).latestMessage[keys[j]]
|
||||
return db.latestMessage[keys[i]] > db.latestMessage[keys[j]]
|
||||
})
|
||||
return keys
|
||||
}
|
||||
|
||||
func (db *MessageDatabase) GetMessageInfo(id string) string {
|
||||
if _, ok := (*db).otherMessages[id]; ok {
|
||||
db.mutex.Lock()
|
||||
defer db.mutex.Unlock()
|
||||
if _, ok := db.otherMessages[id]; ok {
|
||||
return "[yellow]OtherMessage[-]"
|
||||
}
|
||||
out := ""
|
||||
if msg, ok := (*db).messagesById[id]; ok {
|
||||
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"
|
||||
@@ -106,10 +116,12 @@ 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] {
|
||||
for _, element := range db.textMessages[wid] {
|
||||
out += GetTextMessageString(element)
|
||||
out += "\n"
|
||||
arr = append(arr, element.Info.Id)
|
||||
@@ -117,79 +129,112 @@ func (db *MessageDatabase) GetMessagesString(wid string) (string, []string) {
|
||||
return out, arr
|
||||
}
|
||||
|
||||
// create a formatted string with regions based on message ID from a text message
|
||||
func GetTextMessageString(msg *whatsapp.TextMessage) string {
|
||||
out := ""
|
||||
text := tview.Escape((*msg).Text)
|
||||
tim := time.Unix(int64((*msg).Info.Timestamp), 0)
|
||||
out += "[\""
|
||||
out += (*msg).Info.Id
|
||||
out += "\"]"
|
||||
if (*msg).Info.FromMe { //msg from me
|
||||
out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [blue::b]Me: [-::-]" + text
|
||||
} else if strings.Contains((*msg).Info.RemoteJid, GROUPSUFFIX) { // group msg
|
||||
userId := (*msg).Info.SenderJid
|
||||
out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort(userId) + ": [-::-]" + text
|
||||
} else { // message from others
|
||||
out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort((*msg).Info.RemoteJid) + ": [-::-]" + text
|
||||
// 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()
|
||||
}
|
||||
}
|
||||
out += "[\"\"]"
|
||||
return out
|
||||
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 = ""
|
||||
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:
|
||||
if data, err := v.Download(); err == nil {
|
||||
fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "image/")
|
||||
err := saveAttachment(data, fileName, open)
|
||||
return fileName, err
|
||||
} else {
|
||||
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:
|
||||
if data, err := v.Download(); err == nil {
|
||||
fileName = v.Info.Id + "." + strings.TrimPrefix(strings.TrimPrefix(v.Type, "application/"), "document/")
|
||||
err := saveAttachment(data, fileName, open)
|
||||
return fileName, err
|
||||
} else {
|
||||
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:
|
||||
if data, err := v.Download(); err == nil {
|
||||
fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "audio/")
|
||||
err := saveAttachment(data, fileName, open)
|
||||
return fileName, err
|
||||
} else {
|
||||
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:
|
||||
if data, err := v.Download(); err == nil {
|
||||
fileName = v.Info.Id + "." + strings.TrimPrefix(v.Type, "video/")
|
||||
err := saveAttachment(data, fileName, open)
|
||||
return fileName, err
|
||||
} else {
|
||||
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 {
|
||||
out := ""
|
||||
text := tview.Escape(msg.Text)
|
||||
tim := time.Unix(int64(msg.Info.Timestamp), 0)
|
||||
out += "[\""
|
||||
out += msg.Info.Id
|
||||
out += "\"]"
|
||||
if msg.Info.FromMe { //msg from me
|
||||
out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [blue::b]Me: [-::-]" + text
|
||||
} else if strings.Contains(msg.Info.RemoteJid, GROUPSUFFIX) { // group msg
|
||||
userId := msg.Info.SenderJid
|
||||
out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort(userId) + ": [-::-]" + text
|
||||
} else { // message from others
|
||||
out += "[-::d](" + tim.Format("02-01-06 15:04:05") + ") [green::b]" + GetIdShort(msg.Info.RemoteJid) + ": [-::-]" + text
|
||||
}
|
||||
out += "[\"\"]"
|
||||
return out
|
||||
}
|
||||
|
||||
// helper to save an attachment and open it if specified
|
||||
func saveAttachment(data []byte, fileName string, openIt bool) error {
|
||||
path := GetHomeDir() + "Downloads" + string(os.PathSeparator) + fileName
|
||||
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 err
|
||||
return path, err
|
||||
}
|
||||
return nil
|
||||
return path, nil
|
||||
}
|
||||
|
||||
16
release.sh
16
release.sh
@@ -1,5 +1,6 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
# get verison from main.go VERSION string
|
||||
if [ $# -eq 0 ]; then
|
||||
VERSION=$(cat main.go|grep "VERSION string"| awk -v FS="(\")" '{print $2}')
|
||||
else
|
||||
@@ -11,6 +12,7 @@ LINUXF=whatscli-$VERSION-linux.zip
|
||||
MACF=whatscli-$VERSION-macos.zip
|
||||
RASPIF=whatscli-$VERSION-raspberrypi.zip
|
||||
|
||||
# build zip files with binaries
|
||||
GOOS=darwin go build -o whatscli
|
||||
zip $MACF whatscli
|
||||
rm whatscli
|
||||
@@ -24,6 +26,7 @@ GOOS=linux GOARCH=arm GOARM=5 go build -o whatscli
|
||||
zip $RASPIF whatscli
|
||||
rm whatscli
|
||||
|
||||
# publish to github
|
||||
git pull
|
||||
LASTTAG=$(git describe --tags --abbrev=0)
|
||||
git log $LASTTAG..HEAD --no-decorate --pretty=format:"- %s" --abbrev-commit > changes.txt
|
||||
@@ -31,3 +34,16 @@ vim changes.txt
|
||||
gh release create $VERSION $LINUXF $MACF $WINF $RASPIF -F changes.txt -t $VERSION
|
||||
rm changes.txt
|
||||
rm *.zip
|
||||
|
||||
# update homebrew tap
|
||||
URL="https://github.com/normen/whatscli/archive/$VERSION.tar.gz"
|
||||
wget $URL
|
||||
SHASUM=$(shasum -a 256 $VERSION.tar.gz|awk '{print$1}')
|
||||
rm $VERSION.tar.gz
|
||||
cd ../../BrewCode/homebrew-tap
|
||||
sed -i bak "s/sha256 \".*/sha256 \"$SHASUM\"/" Formula/whatscli.rb
|
||||
sed -i bak "s!url \".*!url \"$URL\"!" Formula/whatscli.rb
|
||||
rm Formula/whatscli.rbbak
|
||||
git add -A
|
||||
git commit -m "update whatscli to $VERSION"
|
||||
git push
|
||||
|
||||
Reference in New Issue
Block a user