Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/pysher/pusher.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ def subscribe(self, channel_name, auth=None):
:param str auth: The token to use if authenticated externally.
:rtype: pysher.Channel
"""
self._subscribe(channel_name, auth)
self.channels[channel_name] = Channel(channel_name, self.connection, auth)

return self.channels[channel_name]

def _subscribe(self, channel_name, auth=None):
data = {'channel': channel_name}
if auth is None:
if channel_name.startswith('presence-'):
Expand All @@ -109,10 +115,6 @@ def subscribe(self, channel_name, auth=None):

self.connection.send_event('pusher:subscribe', data)

self.channels[channel_name] = Channel(channel_name, self.connection)

return self.channels[channel_name]

def unsubscribe(self, channel_name):
"""Unsubscribe from a channel

Expand Down Expand Up @@ -147,12 +149,7 @@ def _connection_handler(self, event_name, data, channel_name):
def _reconnect_handler(self):
"""Handle a reconnect."""
for channel_name, channel in self.channels.items():
data = {'channel': channel_name}

if channel.auth:
data['auth'] = channel.auth

self.connection.send_event('pusher:subscribe', data)
self._subscribe(channel_name, channel.auth)

def _generate_auth_token(self, channel_name):
"""Generate a token for authentication with the given channel.
Expand Down