diff options
| author | mathieui <mathieui@mathieui.net> | 2020-05-20 00:05:07 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2020-05-20 00:05:07 +0200 |
| commit | 936350471c07e12e0fd13da3eee6c8561053a8c4 (patch) | |
| tree | c8fb0f0c1a510601224d00102aa21f897abbf047 | |
| parent | 36a0281b6761371d5a42a14acc7f7081c0bf076c (diff) | |
| parent | bf70fb8a050a3fdc5265a58f3b7f2c5ad7364008 (diff) | |
| download | poezio-936350471c07e12e0fd13da3eee6c8561053a8c4.tar.gz poezio-936350471c07e12e0fd13da3eee6c8561053a8c4.tar.bz2 poezio-936350471c07e12e0fd13da3eee6c8561053a8c4.tar.xz poezio-936350471c07e12e0fd13da3eee6c8561053a8c4.zip | |
Merge branch 'ignore-muc-avatar' into 'master'
MucTab: Ignore presence from MUC barejid
See merge request poezio/poezio!103
| -rw-r--r-- | poezio/tabs/muctab.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py index d4ff1d48..dc1a40d4 100644 --- a/poezio/tabs/muctab.py +++ b/poezio/tabs/muctab.py @@ -513,6 +513,9 @@ class MucTab(ChatTab): """ Presence received while we are not in the room (before code=110) """ + # If presence is coming from MUC barejid, ignore. + if not presence['from'].resource: + return None from_nick, _, affiliation, show, status, role, jid, typ = dissect_presence( presence) if typ == 'unavailable': @@ -596,6 +599,9 @@ class MucTab(ChatTab): """ Handle new presences when we are already in the room """ + # If presence is coming from MUC barejid, ignore. + if not presence['from'].resource: + return None from_nick, from_room, affiliation, show, status, role, jid, typ = dissect_presence( presence) change_nick = '303' in status_codes |