karmanyaahm
/
unified-push-xmpp
forked from genofire/unified-push-xmpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: karmanyaahm:main
Branches Tags
karmanyaahm:main
karmanyaahm:history
karmanyaahm:history_old
karmanyaahm:h
genofire:license
genofire:main
genofire:docs-service-discovery
...
pull from: karmanyaahm:h
Branches Tags
karmanyaahm:history
karmanyaahm:main
karmanyaahm:history_old
karmanyaahm:h
genofire:license
genofire:main
genofire:docs-service-discovery

2 Commits
main ... h

Author SHA1 Message Date
Karmanyaah Malhotra 5d34dfb506 Update storage lib references 2021-09-15 21:44:49 -05:00
Karmanyaah Malhotra 41e0cfccaf remove mellium replace 2021-09-15 21:44:30 -05:00
3 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
distributor/go.mod
View File

@ -11,7 +11,7 @@ require (
mellium.im/sasl v0.2.1
mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c
mellium.im/xmpp v0.19.0
unifiedpush.org/go/np2p_dbus v0.0.0-20210916020553-6eec6f305585
unifiedpush.org/go/np2p_dbus v0.0.0-20210916024230-0bcac24079b3
)
require (
@ -35,5 +35,3 @@ require (
)
replace dev.sum7.eu/genofire/unified-push-xmpp/messages => ../messages
replace mellium.im/xmpp => ../../../../mellium.im/xmpp

6
distributor/go.sum
View File

@ -741,9 +741,11 @@ mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w=
mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ=
mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c h1:1RCzOXu94kvNjuCC89G+5XTP6GOdoDrLsYdGIryyc2Y=
mellium.im/xmlstream v0.15.3-0.20210221202126-7cc1407dad4c/go.mod h1:7SUlP7f2qnMczK+Cu/OFgqaIhldMolVjo8np7xG41D0=
mellium.im/xmpp v0.19.0 h1:zgW0jOOxEfQn8v+zUsInaZikSa8BELpKpvnTYzM435E=
mellium.im/xmpp v0.19.0/go.mod h1:zpU69WRb0YuYcVTM/GVweZQP8r48nj1Tlq8RLXUOSNE=
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
unifiedpush.org/go/np2p_dbus v0.0.0-20210916020553-6eec6f305585 h1:KVZ5crwEMgSPdxum+abczj/5IWGhE603sPPItqoQDDY=
unifiedpush.org/go/np2p_dbus v0.0.0-20210916020553-6eec6f305585/go.mod h1:4ug2cMRBjAeOiQVmArby6gg9GH0ZYvb8WXZ+yhrgzlw=
unifiedpush.org/go/np2p_dbus v0.0.0-20210916024230-0bcac24079b3 h1:zGMxFWjJEnVw11fTHO32WpR2JaqZbDVRT7/IA6IWEc4=
unifiedpush.org/go/np2p_dbus v0.0.0-20210916024230-0bcac24079b3/go.mod h1:4ug2cMRBjAeOiQVmArby6gg9GH0ZYvb8WXZ+yhrgzlw=

4
distributor/xmpp.go
View File

@ -266,7 +266,7 @@ func (s *XMPPService) Register(appID, appToken string) (string, string, error) {
return "", errStr, err
}
logger.Info("success")
return conn.Endpoint, "", nil
return conn.Settings, "", nil
}
errStr := "Unknown Error"
if errr := iqRegister.Register.Error; errr != nil {
@ -290,7 +290,7 @@ func (s *XMPPService) Unregister(appToken string) {
logger = logger.WithFields(map[string]interface{}{
"appID": conn.AppID,
"publicToken": conn.PublicToken,
"endpoint": conn.Endpoint,
"endpoint": conn.Settings,
})
if err = s.dbus.NewConnector(conn.AppID).Unregistered(conn.AppToken); err != nil {
logger.WithField("error", err).Error("send unregister per dbus ")