From 024d9a0b0eac0db5b857cd106473e023b61b3a01 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 19 Mar 2021 20:52:15 +0200 Subject: [PATCH] Update go-whatsapp --- asmux.go | 1 - go.mod | 2 +- go.sum | 2 ++ provisioning.go | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/asmux.go b/asmux.go index 282e0ad..45e39da 100644 --- a/asmux.go +++ b/asmux.go @@ -133,7 +133,6 @@ func (prov *ProvisioningAPI) AsmuxPing(w http.ResponseWriter, r *http.Request) { go user.HandleError(err) resp.Error = AsmuxWAPingFalse } else if errors.Is(err, whatsapp.ErrConnectionTimeout) { - user.Conn.CountTimeout() resp.Error = AsmuxWATimeout } else if err != nil { resp.Error = AsmuxWAPingError diff --git a/go.mod b/go.mod index 78b904c..8bbc849 100644 --- a/go.mod +++ b/go.mod @@ -16,4 +16,4 @@ require ( maunium.net/go/mautrix v0.9.2 ) -replace github.com/Rhymen/go-whatsapp => github.com/tulir/go-whatsapp v0.4.0 +replace github.com/Rhymen/go-whatsapp => github.com/tulir/go-whatsapp v0.4.1 diff --git a/go.sum b/go.sum index 86de914..1151741 100644 --- a/go.sum +++ b/go.sum @@ -317,6 +317,8 @@ github.com/tulir/go-whatsapp v0.4.0-rc.4 h1:S0ZLzeZPYUj6fATACy7Kzok9TcnntLa1xDJK github.com/tulir/go-whatsapp v0.4.0-rc.4/go.mod h1:rwwuTh1bKqhgrRvOBAr8hDqtuz8Cc1Quqw/0BeXb+/E= github.com/tulir/go-whatsapp v0.4.0 h1:rvWQZkJrDSoO8IaltASUjYTXjPymByv45RPTL0ApcYQ= github.com/tulir/go-whatsapp v0.4.0/go.mod h1:rwwuTh1bKqhgrRvOBAr8hDqtuz8Cc1Quqw/0BeXb+/E= +github.com/tulir/go-whatsapp v0.4.1 h1:NGgFhJOXRx8TGcF5eDJaE5QBBrriGdZf9X2jbKtqAYI= +github.com/tulir/go-whatsapp v0.4.1/go.mod h1:rwwuTh1bKqhgrRvOBAr8hDqtuz8Cc1Quqw/0BeXb+/E= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= diff --git a/provisioning.go b/provisioning.go index f5e51cd..98150bb 100644 --- a/provisioning.go +++ b/provisioning.go @@ -273,8 +273,6 @@ func (prov *ProvisioningAPI) Ping(w http.ResponseWriter, r *http.Request) { if err == whatsapp.ErrPingFalse { user.log.Debugln("Forwarding ping false error from provisioning API to HandleError") go user.HandleError(err) - } else if errors.Is(err, whatsapp.ErrConnectionTimeout) { - user.Conn.CountTimeout() } if err != nil { errStr = err.Error()