hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to nbxmpp changes

Browse Source
This commit is contained in:
lovetox
2021-03-03 22:15:13 +01:00
parent 18c96e6244
commit 1cd530876a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
length_notifier/length_notifier.py
View File

@@ -90,11 +90,11 @@ class LengthNotifierPlugin(GajimPlugin):
# Not restricted to any JIDs # Not restricted to any JIDs
return True return True
current_jid = JID(jid) current_jid = JID.from_string(jid)
allowed_jids = self.config['JIDS'].split(',') allowed_jids = self.config['JIDS'].split(',')
for allowed_jid in allowed_jids: for allowed_jid in allowed_jids:
try: try:
address = JID(allowed_jid.strip()) address = JID.from_string(allowed_jid.strip())
except Exception as error: except Exception as error:
log.debug('Error parsing JID: %s (%s)' % (error, allowed_jid)) log.debug('Error parsing JID: %s (%s)' % (error, allowed_jid))
continue continue

2
omemo/modules/omemo.py
View File

@@ -267,7 +267,7 @@ class OMEMO(BaseModule):
contact = app.contacts.get_gc_contact(self._account, room_jid, resource) contact = app.contacts.get_gc_contact(self._account, room_jid, resource)
if contact is not None: if contact is not None:
return JID(contact.jid).bare return JID.from_string(contact.jid).bare
self._log.info('Groupchat: Last resort trying to find SID in DB') self._log.info('Groupchat: Last resort trying to find SID in DB')
from_jid = self.backend.storage.getJidFromDevice(properties.omemo.sid) from_jid = self.backend.storage.getJidFromDevice(properties.omemo.sid)

2
openpgp/pgpplugin.py
View File

@@ -140,7 +140,7 @@ class OpenPGPPlugin(GajimPlugin):
keys = app.connections[account].get_module('OpenPGP').get_keys( keys = app.connections[account].get_module('OpenPGP').get_keys(
jid, only_trusted=False) jid, only_trusted=False)
if not keys: if not keys:
con.get_module('OpenPGP').request_keylist(JID(jid)) con.get_module('OpenPGP').request_keylist(JID.from_string(jid))
ErrorDialog( ErrorDialog(
_('No OpenPGP key'), _('No OpenPGP key'),
_('We didnt receive a OpenPGP key from this contact.')) _('We didnt receive a OpenPGP key from this contact.'))

2
tictactoe/plugin.py
View File

@@ -254,7 +254,7 @@ class TicTacToeSession():
self.conn = conn self.conn = conn
self.jid = jid self.jid = jid
self.type_ = type_ self.type_ = type_
self.resource = jid.resource() self.resource = jid.resource
if thread_id: if thread_id:
self.received_thread_id = True self.received_thread_id = True