narayana/telegabber
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Always send XMPP messages with a resource

Browse source
This commit is contained in:
Bohdan Horbeshko 2022-05-26 07:14:38 -04:00
parent ae16fd2a0b
commit 70841a2bea
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -13,4 +13,4 @@ require (
gosrc.io/xmpp v0.5.2-0.20211214110136-5f99e1cd06e1 gosrc.io/xmpp v0.5.2-0.20211214110136-5f99e1cd06e1
) )
replace gosrc.io/xmpp => dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829 replace gosrc.io/xmpp => dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f

2
go.sum
View file

@ -1,5 +1,7 @@
dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829 h1:qe81G6+t1V1ySRMa7lSu5CayN5aP5GEiHXL2DYwHzuA= dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829 h1:qe81G6+t1V1ySRMa7lSu5CayN5aP5GEiHXL2DYwHzuA=
dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY= dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f h1:6249ajbMjgYz53Oq0IjTvjHXbxTfu29Mj1J/6swRHs4=
dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7 h1:GbV1Lv3lVHsSeKAqPTBem72OCsGjXntW4jfJdXciE+w= github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7 h1:GbV1Lv3lVHsSeKAqPTBem72OCsGjXntW4jfJdXciE+w=
github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7/go.mod h1:ZzkRfuaFj8etIYMj/ECtXtgfz72RE6U+dos27b3XIwk= github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7/go.mod h1:ZzkRfuaFj8etIYMj/ECtXtgfz72RE6U+dos27b3XIwk=
github.com/agnivade/wasmbrowsertest v0.3.1/go.mod h1:zQt6ZTdl338xxRaMW395qccVE2eQm0SjC/SDz0mPWQI= github.com/agnivade/wasmbrowsertest v0.3.1/go.mod h1:zQt6ZTdl338xxRaMW395qccVE2eQm0SjC/SDz0mPWQI=

7
telegram/client.go
View file

@ -48,7 +48,6 @@ type Client struct {
options []client.Option options []client.Option
me *client.User me *client.User
resource string
xmpp *xmpp.Component xmpp *xmpp.Component
jid string jid string
Session *persistence.Session Session *persistence.Session
@ -116,14 +115,8 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component
IgnoreFileNames: false, IgnoreFileNames: false,
} }
resource := conf.Tdlib.Client.DeviceModel
if resource == "" {
resource = "telegabber"
}
return &Client{ return &Client{
parameters: &parameters, parameters: &parameters,
resource: resource,
xmpp: component, xmpp: component,
jid: jid, jid: jid,
Session: session, Session: session,

2
telegram/utils.go
View file

@ -225,7 +225,7 @@ func (c *Client) ProcessStatusUpdate(chatID int64, status string, show string, o
gateway.SPShow(show), gateway.SPShow(show),
gateway.SPStatus(status), gateway.SPStatus(status),
gateway.SPPhoto(photo), gateway.SPPhoto(photo),
gateway.SPResource(c.resource), gateway.SPResource(gateway.Jid.Resource),
gateway.SPImmed(gateway.SPImmed.Get(oldArgs)), gateway.SPImmed(gateway.SPImmed.Get(oldArgs)),
} }
if presenceType != "" { if presenceType != "" {

7
xmpp/component.go
View file

@ -45,6 +45,13 @@ func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig) (*xmpp.Strea
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
if gateway.Jid.Resource == "" {
if tc.Tdlib.Client.DeviceModel != "" {
gateway.Jid.Resource = tc.Tdlib.Client.DeviceModel
} else {
gateway.Jid.Resource = "telegabber"
}
}
tgConf = tc tgConf = tc

5
xmpp/handlers.go
View file

@ -88,8 +88,9 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
if ok { if ok {
session.ProcessOutgoingMessage(toID, msg.Body, msg.From) session.ProcessOutgoingMessage(toID, msg.Body, msg.From)
return return
} else if msg.To == gatewayJid { } else {
if strings.HasPrefix(msg.Body, "/") || strings.HasPrefix(msg.Body, "!") { toJid, err := stanza.NewJid(msg.To)
if err == nil && toJid.Bare() == gatewayJid && (strings.HasPrefix(msg.Body, "/") || strings.HasPrefix(msg.Body, "!")) {
response := session.ProcessTransportCommand(msg.Body, resource) response := session.ProcessTransportCommand(msg.Body, resource)
if response != "" { if response != "" {
gateway.SendMessage(msg.From, "", response, component) gateway.SendMessage(msg.From, "", response, component)