From 16c34e1b1fea28978fd9e13f0b055722bffb4227 Mon Sep 17 00:00:00 2001
From: Thomas Maier <contact@thomas-maier.net>
Date: Sun, 4 Aug 2019 21:03:44 +0200
Subject: [PATCH] service discovery working

---
 go.mod  |  7 +++----
 go.sum  | 24 ------------------------
 main.go | 14 +++-----------
 3 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 go.sum

diff --git a/go.mod b/go.mod
index abef209..2758ff0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,7 @@
 module github.com/opthomas-prime/xmpp-webhook
 
 require (
-	github.com/emgee/go-xmpp v0.0.0-20170414153234-efce8dbb9711
-	mellium.im/sasl v0.2.1
-	mellium.im/xmlstream v0.13.5
-	mellium.im/xmpp v0.13.0
+	mellium.im/sasl v0.2.2-0.20190711145101-7aedd692081c
+	mellium.im/xmlstream v0.13.6-0.20190729223506-de1fca5bec8b
+	mellium.im/xmpp v0.13.1-0.20190803132429-9960aecd011f
 )
diff --git a/go.sum b/go.sum
deleted file mode 100644
index 3ce3f96..0000000
--- a/go.sum
+++ /dev/null
@@ -1,24 +0,0 @@
-github.com/emgee/go-xmpp v0.0.0-20170414153234-efce8dbb9711 h1:BsL4akklVz02bS/nknhPwjwqtOyLjq3ZqUJT+IlqYgE=
-github.com/emgee/go-xmpp v0.0.0-20170414153234-efce8dbb9711/go.mod h1:MM5R8Ii02ZFUaKj/z80DmESVPuCGJEqdOcGue7NwRmw=
-golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-mellium.im/reader v0.1.0 h1:UUEMev16gdvaxxZC7fC08j7IzuDKh310nB6BlwnxTww=
-mellium.im/reader v0.1.0/go.mod h1:F+X5HXpkIfJ9EE1zHQG9lM/hO946iYAmU7xjg5dsQHI=
-mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w=
-mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ=
-mellium.im/xmlstream v0.13.5 h1:Y3OBsAT3a5G2B9gEv7ia3SSaLykwFB9SWvRuwd+Fplw=
-mellium.im/xmlstream v0.13.5/go.mod h1:O7wqreSmFi1LOh4RiK7r2j4H4pYDgzo1qv5ZkYJZ7Ns=
-mellium.im/xmpp v0.13.0 h1:oYZKgkGOWIn+v9RNL/EHkk1KaDRLQDEQEVAHDFynNRA=
-mellium.im/xmpp v0.13.0/go.mod h1:ypSrEi/KFrDk9fu4JpQ8HKPFtlkVrhYCk1aObOMAof0=
diff --git a/main.go b/main.go
index 075e948..750e05b 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
 	"mellium.im/xmpp/dial"
 	mjid "mellium.im/xmpp/jid"
 	"mellium.im/xmpp/stanza"
-	"net"
 	"os"
 )
 
@@ -19,17 +18,10 @@ func panicOnErr(err error) {
 }
 
 func initXMPP(jid mjid.JID, pass string) (*xmpp.Session, error) {
-	dialer := dial.Dialer{}
+	dialer := dial.Dialer{NoTLS: true}
 	conn, err := dialer.Dial(context.TODO(), "tcp", jid)
-	switch err.(type) {
-	default:
+	if err != nil {
 		return nil, err
-	case *net.DNSError:
-		dialer = dial.Dialer{NoLookup: true, NoTLS: true}
-		conn, err = dialer.Dial(context.TODO(), "tcp", jid)
-		if err != nil {
-			return nil, err
-		}
 	}
 	return xmpp.NegotiateSession(
 		context.TODO(),
@@ -69,7 +61,7 @@ func main() {
 
 	defer closeXMPP(session)
 
-    panicOnErr(session.Send(context.TODO(), stanza.WrapPresence(mjid.JID{}, stanza.AvailablePresence, nil)))
+	panicOnErr(session.Send(context.TODO(), stanza.WrapPresence(mjid.JID{}, stanza.AvailablePresence, nil)))
 
 	panicOnErr(session.Serve(nil))