parse_jid is in helpers
This commit is contained in:
parent
e1890c3938
commit
c54194d844
|
@ -497,7 +497,7 @@ class ConnectionBytestream:
|
||||||
gajim.socks5queue.activate_proxy(host['idx'])
|
gajim.socks5queue.activate_proxy(host['idx'])
|
||||||
break
|
break
|
||||||
raise common.xmpp.NodeProcessed
|
raise common.xmpp.NodeProcessed
|
||||||
jid = gajim.parse_jid(streamhost.getAttr('jid'))
|
jid = helpers.parse_jid(streamhost.getAttr('jid'))
|
||||||
if 'streamhost-used' in file_props and \
|
if 'streamhost-used' in file_props and \
|
||||||
file_props['streamhost-used'] is True:
|
file_props['streamhost-used'] is True:
|
||||||
raise common.xmpp.NodeProcessed
|
raise common.xmpp.NodeProcessed
|
||||||
|
@ -1150,7 +1150,7 @@ class ConnectionVcard:
|
||||||
storage = query.getTag('storage')
|
storage = query.getTag('storage')
|
||||||
metas = storage.getTags('meta')
|
metas = storage.getTags('meta')
|
||||||
for meta in metas:
|
for meta in metas:
|
||||||
jid = gajim.parse_jid(meta.getAttr('jid'))
|
jid = helpers.parse_jid(meta.getAttr('jid'))
|
||||||
tag = meta.getAttr('tag')
|
tag = meta.getAttr('tag')
|
||||||
data = {'jid': jid}
|
data = {'jid': jid}
|
||||||
order = meta.getAttr('order')
|
order = meta.getAttr('order')
|
||||||
|
@ -1519,7 +1519,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
if not print_status:
|
if not print_status:
|
||||||
print_status = conf.getTagData('show_status')
|
print_status = conf.getTagData('show_status')
|
||||||
bm = {'name': conf.getAttr('name'),
|
bm = {'name': conf.getAttr('name'),
|
||||||
'jid': gajim.parse_jid(conf.getAttr('jid')),
|
'jid': helpers.parse_jid(conf.getAttr('jid')),
|
||||||
'autojoin': autojoin_val,
|
'autojoin': autojoin_val,
|
||||||
'minimize': minimize_val,
|
'minimize': minimize_val,
|
||||||
'password': conf.getTagData('password'),
|
'password': conf.getTagData('password'),
|
||||||
|
@ -1539,7 +1539,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
# http://www.xmpp.org/extensions/xep-0145.html
|
# http://www.xmpp.org/extensions/xep-0145.html
|
||||||
notes = storage.getTags('note')
|
notes = storage.getTags('note')
|
||||||
for note in notes:
|
for note in notes:
|
||||||
jid = gajim.parse_jid(note.getAttr('jid'))
|
jid = helpers.parse_jid(note.getAttr('jid'))
|
||||||
annotation = note.getData()
|
annotation = note.getData()
|
||||||
self.annotations[jid] = annotation
|
self.annotations[jid] = annotation
|
||||||
|
|
||||||
|
@ -1785,7 +1785,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
action = 'add'
|
action = 'add'
|
||||||
for item in msg.getTag('x',
|
for item in msg.getTag('x',
|
||||||
namespace=common.xmpp.NS_ROSTERX).getChildren():
|
namespace=common.xmpp.NS_ROSTERX).getChildren():
|
||||||
jid = gajim.parse_jid(item.getAttr('jid'))
|
jid = helpers.parse_jid(item.getAttr('jid'))
|
||||||
name = item.getAttr('name')
|
name = item.getAttr('name')
|
||||||
groups=[]
|
groups=[]
|
||||||
for group in item.getTags('group'):
|
for group in item.getTags('group'):
|
||||||
|
@ -1832,7 +1832,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
if addressTag and jid == gajim.get_jid_from_account(self.name):
|
if addressTag and jid == gajim.get_jid_from_account(self.name):
|
||||||
address = addressTag.getTag('address', attrs={'type': 'ofrom'})
|
address = addressTag.getTag('address', attrs={'type': 'ofrom'})
|
||||||
if address:
|
if address:
|
||||||
frm = gajim.parse_jid(address.getAttr('jid'))
|
frm = helpers.parse_jid(address.getAttr('jid'))
|
||||||
jid = gajim.get_jid_without_resource(frm)
|
jid = gajim.get_jid_without_resource(frm)
|
||||||
|
|
||||||
# invitations
|
# invitations
|
||||||
|
@ -1850,7 +1850,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
xtags = msg.getTags('x')
|
xtags = msg.getTags('x')
|
||||||
for xtag in xtags:
|
for xtag in xtags:
|
||||||
if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite:
|
if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite:
|
||||||
room_jid = gajim.parse_jid(xtag.getAttr('jid'))
|
room_jid = helpers.parse_jid(xtag.getAttr('jid'))
|
||||||
is_continued = False
|
is_continued = False
|
||||||
if xtag.getTag('continue'):
|
if xtag.getTag('continue'):
|
||||||
is_continued = True
|
is_continued = True
|
||||||
|
@ -2050,7 +2050,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
|
|
||||||
def dispatch_invite_message(self, invite, frm):
|
def dispatch_invite_message(self, invite, frm):
|
||||||
item = invite.getTag('invite')
|
item = invite.getTag('invite')
|
||||||
jid_from = gajim.parse_jid(item.getAttr('from'))
|
jid_from = helpers.parse_jid(item.getAttr('from'))
|
||||||
reason = item.getTagData('reason')
|
reason = item.getTagData('reason')
|
||||||
item = invite.getTag('password')
|
item = invite.getTag('password')
|
||||||
password = invite.getTagData('password')
|
password = invite.getTagData('password')
|
||||||
|
@ -2254,7 +2254,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
r = destroy.getTagData('reason')
|
r = destroy.getTagData('reason')
|
||||||
if r:
|
if r:
|
||||||
reason += ' (%s)' % r
|
reason += ' (%s)' % r
|
||||||
jid = gajim.parse_jid(destroy.getAttr('jid'))
|
jid = helpers.parse_jid(destroy.getAttr('jid'))
|
||||||
if jid:
|
if jid:
|
||||||
reason += '\n' + _('You can join this room instead: %s') % jid
|
reason += '\n' + _('You can join this room instead: %s') % jid
|
||||||
statusCode = ['destroyed']
|
statusCode = ['destroyed']
|
||||||
|
@ -2401,7 +2401,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
|
||||||
users_dict = {}
|
users_dict = {}
|
||||||
for item in items:
|
for item in items:
|
||||||
if item.has_attr('jid') and item.has_attr('affiliation'):
|
if item.has_attr('jid') and item.has_attr('affiliation'):
|
||||||
jid = gajim.parse_jid(item.getAttr('jid'))
|
jid = helpers.parse_jid(item.getAttr('jid'))
|
||||||
affiliation = item.getAttr('affiliation')
|
affiliation = item.getAttr('affiliation')
|
||||||
users_dict[jid] = {'affiliation': affiliation}
|
users_dict[jid] = {'affiliation': affiliation}
|
||||||
if item.has_attr('nick'):
|
if item.has_attr('nick'):
|
||||||
|
|
Loading…
Reference in New Issue