diff options
Diffstat (limited to 'xmpp')
| -rw-r--r-- | xmpp/extensions/extensions.go | 1 | ||||
| -rw-r--r-- | xmpp/gateway/gateway.go | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/xmpp/extensions/extensions.go b/xmpp/extensions/extensions.go index 1c32fcd..3a2f998 100644 --- a/xmpp/extensions/extensions.go +++ b/xmpp/extensions/extensions.go @@ -224,6 +224,7 @@ type PresenceXMucUserExtension struct { type PresenceXMucUserItem struct { XMLName xml.Name `xml:"item"` Affiliation string `xml:"affiliation,attr"` + Jid string `xml:"jid,attr"` Role string `xml:"role,attr"` } diff --git a/xmpp/gateway/gateway.go b/xmpp/gateway/gateway.go index e4a1be7..d6b7826 100644 --- a/xmpp/gateway/gateway.go +++ b/xmpp/gateway/gateway.go @@ -240,8 +240,11 @@ var SPResource = args.NewString() // SPImmed skips queueing var SPImmed = args.NewBool(args.Default(true)) -// SPAffiliation is a XEP-0045 MUC affiliation -var SPAffiliation = args.NewString() +// SPMUCAffiliation is a XEP-0045 MUC affiliation +var SPMUCAffiliation = args.NewString() + +// SPMUCJid is a real jid of a MUC member +var SPMUCJid = args.NewString() // SPMUCStatusCodes is a set of XEP-0045 MUC status codes var SPMUCStatusCodes = args.New() @@ -301,8 +304,8 @@ func newPresence(bareJid string, to string, args ...args.V) stanza.Presence { }) } } - if SPAffiliation.IsSet(args) { - affiliation := SPAffiliation.Get(args) + if SPMUCAffiliation.IsSet(args) { + affiliation := SPMUCAffiliation.Get(args) if affiliation != "" { userExt := extensions.PresenceXMucUserExtension{ Item: extensions.PresenceXMucUserItem{ @@ -310,6 +313,9 @@ func newPresence(bareJid string, to string, args ...args.V) stanza.Presence { Role: affilationToRole(affiliation), }, } + if SPMUCJid.IsSet(args) { + userExt.Item.Jid = SPMUCJid.Get(args) + } if SPMUCStatusCodes.IsSet(args) { statusCodes := SPMUCStatusCodes.Get(args).([]uint16) for _, statusCode := range statusCodes { |