jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhancement: Improve JID handling and logging in MUC plugin; update status code return type

Browse Source
This commit is contained in:
jinyu 2024-11-15 17:53:08 +08:00 committed by mathieui
parent df0ecfc142
commit f24a7679e5
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slixmpp/__init__.py
View File

@ -27,3 +27,9 @@ from slixmpp.clientxmpp import ClientXMPP
from slixmpp.componentxmpp import ComponentXMPP from slixmpp.componentxmpp import ComponentXMPP
from slixmpp.version import __version__, __version_info__ from slixmpp.version import __version__, __version_info__
__all__ = [
'Message', 'Presence', 'Iq', 'JID', 'InvalidJID', 'ET', 'ElementBase',
'register_stanza_plugin', 'XMLStream', 'BaseXMPP', 'ClientXMPP', 'ComponentXMPP',
'__version__', '__version_info__'
]

28
slixmpp/plugins/xep_0045/muc.py
View File

@ -650,13 +650,23 @@ class XEP_0045(BasePlugin):
:param room: Room to check. :param room: Room to check.
:param jid: FULL JID to check. :param jid: FULL JID to check.
""" """
bare_match = False
for nick in self.rooms[room]: for nick in self.rooms[room]:
entry = self.rooms[room][nick] entry = self.rooms[room][nick]
if not entry.get('jid'): if not entry.get('jid'):
continue continue
if entry is not None and entry['jid'] == jid.full:
if entry['jid'] == jid.full:
return True return True
return False elif JID(entry['jid']) == jid.bare:
bare_match = True
if bare_match:
logging.info(
"Could not retrieve full JID, falling back to bare JID for %s in %s",
jid, room
)
return bare_match
def get_nick(self, room: JID, jid: JID) -> Optional[str]: def get_nick(self, room: JID, jid: JID) -> Optional[str]:
"""Get the nickname of a specific JID in a room. """Get the nickname of a specific JID in a room.
@ -664,13 +674,23 @@ class XEP_0045(BasePlugin):
:param room: Room to inspect. :param room: Room to inspect.
:param jid: FULL JID whose nick to return. :param jid: FULL JID whose nick to return.
""" """
bare_match = None
for nick in self.rooms[room]: for nick in self.rooms[room]:
entry = self.rooms[room][nick] entry = self.rooms[room][nick]
if not entry.get('jid'): if not entry.get('jid'):
continue continue
if entry is not None and entry['jid'] == jid.full:
if entry['jid'] == jid.full:
return nick return nick
return None elif JID(entry['jid']) == jid.bare:
bare_match = nick
if bare_match:
logging.info(
"Could not retrieve full JID, falling back to bare JID for %s in %s",
jid, room
)
return bare_match
def get_joined_rooms(self) -> List[JID]: def get_joined_rooms(self) -> List[JID]:
"""Get the list of rooms we sent a join presence to """Get the list of rooms we sent a join presence to

8
slixmpp/plugins/xep_0045/stanza.py
View File

@ -28,7 +28,7 @@ class MUCBase(ElementBase):
plugin_attrib = 'muc' plugin_attrib = 'muc'
interfaces = {'affiliation', 'role', 'jid', 'nick', 'room', 'status_codes'} interfaces = {'affiliation', 'role', 'jid', 'nick', 'room', 'status_codes'}
def get_status_codes(self) -> Set[str]: def get_status_codes(self) -> Set[int]:
status = self.xml.findall(f'{{{NS_USER}}}status') status = self.xml.findall(f'{{{NS_USER}}}status')
return {int(status.attrib['code']) for status in status} return {int(status.attrib['code']) for status in status}
@ -275,7 +275,8 @@ class MUCUserItem(ElementBase):
jid = self.xml.attrib.get('jid', None) jid = self.xml.attrib.get('jid', None)
if jid: if jid:
return JID(jid) return JID(jid)
return jid else:
return None
class MUCActor(ElementBase): class MUCActor(ElementBase):
@ -288,7 +289,8 @@ class MUCActor(ElementBase):
jid = self.xml.attrib.get('jid', None) jid = self.xml.attrib.get('jid', None)
if jid: if jid:
return JID(jid) return JID(jid)
return jid else:
return None
class MUCDestroy(ElementBase): class MUCDestroy(ElementBase):