summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-15 22:19:47 -0700
committerLance Stout <lancestout@gmail.com>2012-10-15 22:19:47 -0700
commit747a6e94e6039c1e349dafc22d1f3cd2baee6d02 (patch)
treeff8ebe061e71fc6e98a991399f464d35f70baaa1 /sleekxmpp
parentcebc798e72fcc1a53b6962d26ec6bad121a953c1 (diff)
downloadslixmpp-747a6e94e6039c1e349dafc22d1f3cd2baee6d02.tar.gz
slixmpp-747a6e94e6039c1e349dafc22d1f3cd2baee6d02.tar.bz2
slixmpp-747a6e94e6039c1e349dafc22d1f3cd2baee6d02.tar.xz
slixmpp-747a6e94e6039c1e349dafc22d1f3cd2baee6d02.zip
Auto-subscribe to whitelisted JIDs if auto_subscribe is true
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/basexmpp.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index a1969e34..f26c048f 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -746,6 +746,8 @@ class BaseXMPP(XMLStream):
item = self.roster[pres['to']][pres['from']]
if item['whitelisted']:
item.authorize()
+ if roster.auto_subscribe:
+ item.subscribe()
elif roster.auto_authorize:
item.authorize()
if roster.auto_subscribe: