a3x/transpub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Respond to presence updates

Browse source
This commit is contained in:
moyamo 2015-02-27 19:24:57 +02:00
parent 99db6cce76
commit e9f40dbed9
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
session.py
View file

@ -43,6 +43,7 @@ from yowsup.layers.logger import YowLoggerLayer
from yowsup.common import YowConstants from yowsup.common import YowConstants
from yowsup import env from yowsup import env
from yowsup.layers.protocol_presence import * from yowsup.layers.protocol_presence import *
from yowsup.layers.protocol_presence.protocolentities import *
from Spectrum2 import protocol_pb2 from Spectrum2 import protocol_pb2
@ -106,7 +107,7 @@ class Session():
def call(self, method, args = ()): def call(self, method, args = ()):
args = [str(s) for s in args] args = [str(s) for s in args]
self.logger.debug("%s(%s)", method, ", ".join(args)) self.logger.debug("%s(%s)", method, ", ".join(args))
# self.frontend.methodInterface.call(method, args) self.stack.broadcastEvent(YowLayerEvent(method, **args))
def logout(self): def logout(self):
self.stack.broadcastEvent(YowLayerEvent(YowNetworkLayer.EVENT_STATE_DISCONNECT)) self.stack.broadcastEvent(YowLayerEvent(YowNetworkLayer.EVENT_STATE_DISCONNECT))
@ -209,7 +210,7 @@ class Session():
def changeStatusMessage(self, statusMessage): def changeStatusMessage(self, statusMessage):
if (statusMessage != self.statusMessage) or (self.initialized == False): if (statusMessage != self.statusMessage) or (self.initialized == False):
self.statusMessage = statusMessage self.statusMessage = statusMessage
self.call("profile_setStatus", (statusMessage.encode("utf-8"),)) self.call("profile_setStatus", message = statusMessage.encode("utf-8"))
self.logger.info("Status message changed: %s", statusMessage) self.logger.info("Status message changed: %s", statusMessage)
if self.initialized == False: if self.initialized == False:
@ -419,6 +420,7 @@ class SpectrumLayer(YowInterfaceLayer):
def onEvent(self, layerEvent): def onEvent(self, layerEvent):
# We cannot use __init__, since it can take no arguments # We cannot use __init__, since it can take no arguments
retval = False
if layerEvent.getName() == SpectrumLayer.EVENT_START: if layerEvent.getName() == SpectrumLayer.EVENT_START:
self.logger = logging.getLogger(self.__class__.__name__) self.logger = logging.getLogger(self.__class__.__name__)
self.backend = layerEvent.getArg("backend") self.backend = layerEvent.getArg("backend")
@ -428,12 +430,25 @@ class SpectrumLayer(YowInterfaceLayer):
self.buddies = BuddyList(self.legacyName, self.db) self.buddies = BuddyList(self.legacyName, self.db)
self.bot = Bot(self) self.bot = Bot(self)
return True retval = True
elif layerEvent.getName() == YowNetworkLayer.EVENT_STATE_DISCONNECTED: elif layerEvent.getName() == YowNetworkLayer.EVENT_STATE_DISCONNECTED:
reason = layerEvent.getArg("reason") reason = layerEvent.getArg("reason")
self.logger.info("Disconnected: %s (%s)", self.user, reason) self.logger.info("Disconnected: %s (%s)", self.user, reason)
self.backend.handleDisconnected(sefl.user, 0, reason) self.backend.handleDisconnected(sefl.user, 0, reason)
return False elif layerEvent.getName() == 'presence_sendAvailable':
entity = AvailablePresenceProtocolEntity()
self.toLower(entity)
retval = True
elif layerEvent.getName() == 'presence_sendUnavailable':
entity = UnavailablePresenceProtocolEntity()
self.toLower(entity)
retval = True
elif layerEvent.getName() == 'profile_setStatus':
entity = PresenceProtocolEntity(name = layerEvent.getArg('message'))
self.toLower(entity)
retval = True
self.logger.debug("EVENT %s", layerEvent.getName())
return retval
@ProtocolEntityCallback("success") @ProtocolEntityCallback("success")
def onAuthSuccess(self, entity): def onAuthSuccess(self, entity):