summaryrefslogtreecommitdiffstats
path: root/bridge/whatsapp
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-05-30 12:20:56 +0200
committerGitHub <noreply@github.com>2019-05-30 12:20:56 +0200
commit3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4 (patch)
treec5358b971a95749bece9469e959041d4f2e54cc3 /bridge/whatsapp
parent9619dff33417548a50e51a4f75f41b9de4a73327 (diff)
downloadmatterbridge-msglm-3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4.tar.gz
matterbridge-msglm-3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4.tar.bz2
matterbridge-msglm-3418e8c9afbdf3e94ab26a20d8f12c042ae29fc4.zip
Use upstream whatsapp again (#809)
Diffstat (limited to 'bridge/whatsapp')
-rw-r--r--bridge/whatsapp/handlers.go4
-rw-r--r--bridge/whatsapp/helpers.go2
-rw-r--r--bridge/whatsapp/whatsapp.go7
3 files changed, 6 insertions, 7 deletions
diff --git a/bridge/whatsapp/handlers.go b/bridge/whatsapp/handlers.go
index d419ac20..456f2009 100644
--- a/bridge/whatsapp/handlers.go
+++ b/bridge/whatsapp/handlers.go
@@ -6,9 +6,9 @@ import (
"github.com/42wim/matterbridge/bridge/config"
- "github.com/matterbridge/go-whatsapp"
+ "github.com/Rhymen/go-whatsapp"
- whatsappExt "github.com/matterbridge/mautrix-whatsapp/whatsapp-ext"
+ whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext"
)
/*
diff --git a/bridge/whatsapp/helpers.go b/bridge/whatsapp/helpers.go
index d8743628..5268ba3e 100644
--- a/bridge/whatsapp/helpers.go
+++ b/bridge/whatsapp/helpers.go
@@ -6,7 +6,7 @@ import (
"os"
qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
- "github.com/matterbridge/go-whatsapp"
+ "github.com/Rhymen/go-whatsapp"
)
func qrFromTerminal(invert bool) chan string {
diff --git a/bridge/whatsapp/whatsapp.go b/bridge/whatsapp/whatsapp.go
index 286d463c..c66e13ac 100644
--- a/bridge/whatsapp/whatsapp.go
+++ b/bridge/whatsapp/whatsapp.go
@@ -11,10 +11,9 @@ import (
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
+ "github.com/Rhymen/go-whatsapp"
- "github.com/matterbridge/go-whatsapp"
-
- whatsappExt "github.com/matterbridge/mautrix-whatsapp/whatsapp-ext"
+ whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext"
)
const (
@@ -89,7 +88,7 @@ func (b *Bwhatsapp) Connect() error {
b.Log.Debugln("Restoring WhatsApp session..")
// https://github.com/Rhymen/go-whatsapp#restore
- session, err = b.conn.RestoreSession(session)
+ session, err = b.conn.RestoreWithSession(session)
if err != nil {
// TODO return or continue to normal login?
// restore session connection timed out (I couldn't get over it without logging in again)