Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slixmpp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
42
Issues
42
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poezio
slixmpp
Commits
ef2f5d29
Commit
ef2f5d29
authored
Apr 20, 2014
by
Lance Stout
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
parents
62671e0f
93869f77
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
sleekxmpp/plugins/xep_0153/vcard_avatar.py
sleekxmpp/plugins/xep_0153/vcard_avatar.py
+6
-4
No files found.
sleekxmpp/plugins/xep_0153/vcard_avatar.py
View file @
ef2f5d29
...
...
@@ -124,10 +124,12 @@ class XEP_0153(BasePlugin):
log
.
debug
(
'Could not retrieve vCard for %s'
%
jid
)
def
_recv_presence
(
self
,
pres
):
if
pres
[
'muc'
][
'affiliation'
]:
# Don't process vCard avatars for MUC occupants
# since they all share the same bare JID.
return
try
:
if
pres
[
'muc'
][
'affiliation'
]:
# Don't process vCard avatars for MUC occupants
# since they all share the same bare JID.
return
except
:
pass
if
not
pres
.
match
(
'presence/vcard_temp_update'
):
self
.
api
[
'set_hash'
](
pres
[
'from'
],
args
=
None
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment