cwinfo/matterbridge
4
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-06-26 13:09:24 +00:00
Code Releases Activity

Use upstream whatsapp again (#809)

Browse Source
This commit is contained in:
Wim
2019-05-30 12:20:56 +02:00
committed by GitHub
parent 9619dff334
commit 3418e8c9af
89 changed files with 2145 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/whatsapp/handlers.go
View File

@ -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"
)
/*

2
bridge/whatsapp/helpers.go
View File

@ -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 {

7
bridge/whatsapp/whatsapp.go
View File

@ -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)