changed a lot

session.py

@@ -14,28 +14,36 @@ from constants import *
 
 class Session:
 
-	def __init__(self, backend, user, legacyName, password, extra, db):
+	def __init__(self, backend, user, legacyName, extra, db):
-		logging.info("new session: %s %s", legacyName, extra)
+		self.logger = logging.getLogger(self.__class__.__name__)
-
+		self.logger.info("Created: %s", legacyName)
-		password = base64.b64decode(bytes(password.encode('utf-8')))
-
-		e4u.load()
 
 		self.db = db
 		self.backend = backend
 		self.user = user
+		self.legacyName = legacyName
+
 		self.status = protocol_pb2.STATUS_NONE
 		self.statusMessage = ''
-		self.legacyName = legacyName
-		self.groups = { }
-		self.timer = None
 
-		self.roster = Roster(legacyName, db)
+		self.groups = {}
+		self.presenceRequested = []
+		self.offlineQueue = []
+		self.groupOfflineQueue = { }
+
+		self.timer = None
+		self.password = None
+		self.initialized = False
+
+		self.buddies = BuddyList(legacyName, db)
 		self.frontend = YowsupConnectionManager()
 
+		self.bot = Bot(self)
+
 		# Events
 		self.listen("auth_success", self.onAuthSuccess)
 		self.listen("auth_fail", self.onAuthFailed)
+		self.listen("disconnected", self.onDisconnected)
 
 		self.listen("contact_typing", self.onContactTyping)
 		self.listen("contact_paused", self.onContactPaused)
@@ -55,187 +63,321 @@ class Session:
 		self.listen("group_gotInfo", self.onGroupGotInfo)
 		self.listen("group_gotParticipants", self.onGroupGotParticipants)
 		self.listen("group_subjectReceived", self.onGroupSubjectReceived)
+
 		self.listen("notification_groupParticipantAdded", self.onGroupParticipantAdded)
 		self.listen("notification_groupParticipantRemoved", self.onGroupParticipantRemoved)
-		self.call("auth_login", (legacyName, password))
+		self.listen("notification_contactProfilePictureUpdated", self.onContactProfilePictureUpdated)
+		self.listen("notification_groupPictureUpdated", self.onGroupPictureUpdated)
 
-	def __del__(self):
+	def __del__(self): # handleLogoutRequest
-		self.call("disconnect", ("logout",))
+		self.logout()
-
-	def _softToUni(self, message):
-		message = unicode(message, "utf-8")
-		return e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE)
 
 	def call(self, method, args = ()):
+		args = [str(s) for s in args]
+		self.logger.debug("%s(%s)", method, ", ".join(args))
 		self.frontend.methodInterface.call(method, args)
 
 	def listen(self, event, callback):
 		self.frontend.signalInterface.registerListener(event, callback)
 
-	# RequestMethods
+	def logout(self):
+		self.call("disconnect", ("logout",))
+
+	def login(self, password):
+		self.password = utils.decodePassword(password)
+		self.call("auth_login", (self.legacyName, self.password))
+
+	def updateRoomList(self):
+		rooms = []
+		for room, group in self.groups.iteritems():
+			rooms.append([room, group.subject])
+
+		self.backend.handleRoomList(rooms)
+
+	# spectrum RequestMethods
 	def sendTypingStarted(self, buddy):
-		logging.info("started typing: %s to %s", self.legacyName, buddy)
+		if buddy != "bot":
+			self.logger.info("Started typing: %s to %s", self.legacyName, buddy)
 			self.call("typing_send", (buddy + "@s.whatsapp.net",))
 
 	def sendTypingStopped(self, buddy):
-		logging.info("stopped typing: %s to %s", self.legacyName, buddy)
+		if buddy != "bot":
+			self.logger.info("Stopped typing: %s to %s", self.legacyName, buddy)
 			self.call("typing_paused", (buddy + "@s.whatsapp.net",))
 
-	def sendMessage(self, sender, message):
+	def sendMessageToWA(self, sender, message):
-		logging.info("message send to %s: %s", sender, message)
+		self.logger.info("Message sent from %s to %s: %s", self.legacyName, sender, message)
 		message = message.encode("utf-8")
 
-		if ("-" in sender): # group msg
+		if sender == "bot":
-			if ("/" in sender):
+			self.bot.parse(message)
+		elif "-" in sender: # group msg
+			if "/" in sender:
 				room, buddy = sender.split("/")
 				self.call("message_send", (buddy + "@s.whatsapp.net", message))
 			else:
 				room = sender
-				self.backend.handleMessage(self.user, room, message, "me") # TODO
+				group = self.groups[room]
+
+				self.backend.handleMessage(self.user, room, message, group.nick)
 				self.call("message_send", (room + "@g.us", message))
 		else: # private msg
 			buddy = sender
+			if message == "\\lastseen":
+				self.presenceRequested.append(buddy)
+				self.call("presence_request", (buddy + "@s.whatsapp.net",))
+			else:
 				self.call("message_send", (buddy + "@s.whatsapp.net", message))
 
-	def changeStatus(self, status):
+	def sendMessageToXMPP(self, buddy, messageContent, timestamp = ""):
-		if (status == self.status): return
+		if timestamp:
+			timestamp = time.strftime("%Y%m%dT%H%M%S", time.gmtime(timestamp))
 
-		logging.info("status changed: %s", status)
+		if self.initialized == False:
+			self.logger.debug("Message queued from %s to %s: %s", buddy, self.legacyName, messageContent)
+			self.offlineQueue.append((buddy, messageContent, timestamp))
+		else:
+			self.logger.debug("Message sent from %s to %s: %s", buddy, self.legacyName, messageContent)
+			self.backend.handleMessage(self.user, buddy, messageContent, "", "", timestamp)
+
+	def sendGroupMessageToXMPP(self, room, buddy, messageContent, timestamp = ""):
+		if timestamp:
+			timestamp = time.strftime("%Y%m%dT%H%M%S", time.gmtime(timestamp))
+
+		if self.initialized == False:
+			self.logger.debug("Group message queued from %s to %s: %s", buddy, room, messageContent)
+
+			if room not in self.groupOfflineQueue:
+				self.groupOfflineQueue[room] = [ ]
+
+			self.groupOfflineQueue[room].append((buddy, messageContent, timestamp))
+		else:
+			self.logger.debug("Group message sent from %s to %s: %s", buddy, room, messageContent) 
+			self.backend.handleMessage(self.user, room, messageContent, buddy, "", timestamp)
+
+	def changeStatus(self, status):
+		if status != self.status:
+			self.logger.info("Status changed: %s", status)
 			self.status = status
-		if (status == protocol_pb2.STATUS_ONLINE):
+
+			if status == protocol_pb2.STATUS_ONLINE or status == protocol_pb2.STATUS_FFC:
 				self.call("presence_sendAvailable")
-		elif (status == protocol_pb2.STATUS_FFC):
-			self.call("presence_sendAvailableForChat")
 			else:
 				self.call("presence_sendUnavailable")
 
 	def changeStatusMessage(self, statusMessage):
-		if (statusMessage == self.statusMessage): return
+		if statusMessage != self.statusMessage:
-
-		logging.info("status message changed: %s", statusMessage)
 			self.statusMessage = statusMessage
 			self.call("profile_setStatus", (statusMessage.encode("utf-8"),))
+			self.logger.info("Status message changed: %s", statusMessage)
 
+			if self.initialized == False:
+				self.sendOfflineMessages()
+				self.bot.call("welcome")
+				self.initialized = True
+
+	def sendOfflineMessages(self):
+		# Flush Queues
+		while self.offlineQueue:
+			msg = self.offlineQueue.pop(0)
+			self.backend.handleMessage(self.user, msg[0], msg[1], "", "", msg[2])
+
+	# also for adding a new buddy
 	def updateBuddy(self, buddy, nick, groups):
-		if self.roster.buddies.has_key(buddy):
+		if buddy != "bot":
-			buddy = self.roster.buddies[buddy]
+			self.buddies.update(buddy, nick, groups)
-			buddy.update(nick)
+			self.updateRoster()
-			logging.info("buddy renamed: %s", buddy)
-			self.call("presence_request", (buddy.number.number + "@s.whatsapp.net",))
-		else:
-			self.roster.add(buddy, nick)
-			self.call("presence_request", (buddy + "@s.whatsapp.net",))
-			self.backend.handleBuddyChanged(self.user, buddy, nick, [], protocol_pb2.STATUS_NONE)
 
 	def removeBuddy(self, buddy):
-		self.roster.remove(buddy)
+		if buddy != "bot":
+			self.logger.info("Buddy removed: %s", buddy)
+			self.buddies.remove(buddy)
+			self.updateRoster()
+
+	def joinRoom(self, room, nick):
+		if room in self.groups:
+			group = self.groups[room]
+
+			self.logger.info("Joining room: %s room=%s, nick=%s", self.legacyName, room, nick)
+
+			group.nick = nick
 
-	def joinRoom(self, room):
 			self.call("group_getParticipants", (room + "@g.us",))
+			self.backend.handleSubject(self.user, room, group.subject, group.subjectOwner)
+		else:
+			self.logger.warn("Room doesn't exist: %s", room)
 
-	# EventHandlers
+	def updateRoster(self):
+		self.logger.debug("Update roster")
+
+		old = self.buddies.keys()
+		self.buddies.load()
+		new = self.buddies.keys()
+
+		add = set(new) - set(old)
+		remove = set(old) - set(new)
+
+		self.logger.debug("Roster remove: %s", str(list(remove)))
+		self.logger.debug("Roster add: %s", str(list(add)))
+
+		for number in remove:
+			self.backend.handleBuddyChanged(self.user, number, "", [], protocol_pb2.STATUS_NONE)
+			self.backend.handleBuddyRemoved(self.user, number)
+			self.call("presence_unsubscribe", (number + "@s.whatsapp.net",))
+
+		for number in add:
+			buddy = self.buddies[number]
+			self.backend.handleBuddyChanged(self.user, number, buddy.nick, buddy.groups, protocol_pb2.STATUS_NONE)
+			self.call("presence_request", (number + "@s.whatsapp.net",)) # includes presence_subscribe
+
+
+	# yowsup Signals
 	def onAuthSuccess(self, user):
-		logging.info("auth success: %s", user)
+		self.logger.info("Auth success: %s", user)
-		self.backend.handleConnected(self.user)
-		self.call("ready")
 
+		self.backend.handleConnected(self.user)
+		self.backend.handleBuddyChanged(self.user, "bot", self.bot.name, ["Admin"], protocol_pb2.STATUS_ONLINE)
+
+		self.updateRoster()
+
+		self.call("ready")
 		self.call("group_getGroups", ("participating",))
 
-		self.roster.load()
-		for number, buddy in self.roster.buddies.iteritems():
-			logging.info("request presence: %s", buddy)
-			self.call("presence_request", (buddy.number.number + "@s.whatsapp.net",))
-			self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, [], protocol_pb2.STATUS_NONE)
-
 	def onAuthFailed(self, user, reason):
-		logging.info("auth failed: %s (%s)", user, reason)
+		self.logger.info("Auth failed: %s (%s)", user, reason)
+		self.backend.handleDisconnected(self.user, 0, reason)
+		self.password = None
+
+	def onDisconnected(self, reason):
+		self.logger.info("Disconnected from whatsapp: %s (%s)", self.legacyName, reason)
 		self.backend.handleDisconnected(self.user, 0, reason)
 
 	def onMessageReceived(self, messageId, jid, messageContent, timestamp, receiptRequested, pushName, isBroadCast):
 		buddy = jid.split("@")[0]
-		logging.info("message received from %s: %s", buddy, messageContent)
+		messageContent = utils.softToUni(messageContent)
-		self.backend.handleMessage(self.user, buddy, self._softToUni(messageContent), timestamp=timestamp)
+
+		if isBroadCast:
+			self.logger.info("Broadcast received from %s to %s: %s (at ts=%s)", buddy, self.legacyName, messageContent, timestamp)
+			messageContent = "[Broadcast] " + messageContent
+		else:
+			self.logger.info("Message received from %s to %s: %s (at ts=%s)", buddy, self.legacyName, messageContent, timestamp)
+
+		self.sendMessageToXMPP(buddy, messageContent, timestamp)
 		if receiptRequested: self.call("message_ack", (jid, messageId))
 
 	def onMediaReceived(self, messageId, jid, preview, url, size,  receiptRequested, isBroadcast):
 		buddy = jid.split("@")[0]
-		logging.info("message received from %s: %s", buddy, url)
+
-		self.backend.handleMessage(self.user, buddy, url)
+		self.logger.info("Media received from %s: %s", buddy, url)
+		self.sendMessageToXMPP(buddy, utils.shorten(url))
 		if receiptRequested: self.call("message_ack", (jid, messageId))
 
 	def onLocationReceived(self, messageId, jid, name, preview, latitude, longitude, receiptRequested, isBroadcast):
 		buddy = jid.split("@")[0]
-		logging.info("location received from %s: %s, %s", buddy, latitude, longitude)
+		self.logger.info("Location received from %s: %s, %s", buddy, latitude, longitude)
-		self.backend.handleMessage(self.user, buddy, "http://maps.google.de?%s" % urllib.urlencode({ "q": "%s %s" % (latitude, longitude) }))
+
+		url = "http://maps.google.de?%s" % urllib.urlencode({ "q": "%s %s" % (latitude, longitude) })
+		self.sendMessageToXMPP(buddy, utils.shorten(url))
 		if receiptRequested: self.call("message_ack", (jid, messageId))
 
 	def onVcardReceived(self, messageId, jid, name, data, receiptRequested, isBroadcast): # TODO
 		buddy = jid.split("@")[0]
-		logging.info("vcard received from %s", buddy)
+		self.logger.info("VCard received from %s", buddy)
-		self.backend.handleMessage(self.user, buddy, "Received VCard (not implemented yet)")
+		self.sendMessageToXMPP(buddy, "Received VCard (not implemented yet)")
 		if receiptRequested: self.call("message_ack", (jid, messageId))
 
 	def onContactTyping(self, jid):
 		buddy = jid.split("@")[0]
-		logging.info("started typing: %s", buddy)
+		self.logger.info("Started typing: %s", buddy)
 		self.backend.handleBuddyTyping(self.user, buddy)
-		if (self.timer != None): self.timer.cancel()
+
+		if self.timer != None:
+			self.timer.cancel()
 
 	def onContactPaused(self, jid):
 		buddy = jid.split("@")[0]
-		logging.info("paused typing: %s", buddy)
+		self.logger.info("Paused typing: %s", buddy)
 		self.backend.handleBuddyTyped(self.user, jid.split("@")[0])
 		self.timer = Timer(3, self.backend.handleBuddyStoppedTyping, (self.user, buddy)).start()
 
 	def onPrecenceUpdated(self, jid, lastseen):
 		buddy = jid.split("@")[0]
-		logging.info("lastseen: %s %d secs ago", buddy, lastseen)
+		self.logger.info("Lastseen: %s %s", buddy, utils.ago(lastseen))
-		if (lastseen < 60): self.onPrecenceAvailable(jid)
+
-		else: self.onPrecenceUnavailable(jid)
+		if buddy in self.presenceRequested:
+			timestamp = time.localtime(time.time() - lastseen)
+			timestring = time.strftime("%a, %d %b %Y %H:%M:%S", timestamp)
+			self.sendMessageToXMPP(buddy, "%s (%s)" % (timestring, utils.ago(lastseen)))
+			self.presenceRequested.remove(buddy)
+
+		if lastseen < 60:
+			self.onPrecenceAvailable(jid)
+		else:
+			self.onPrecenceUnavailable(jid)
 
 	def onPrecenceAvailable(self, jid):
 		buddy = jid.split("@")[0]
-		if (self.roster.buddies.has_key(buddy)):
+
-			buddy = self.roster.buddies[buddy]
+		try:
-			logging.info("is available: %s", buddy)
+			buddy = self.buddies[buddy]
-			self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, [], protocol_pb2.STATUS_ONLINE)
+			self.logger.info("Is available: %s", buddy)
+			self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, buddy.groups, protocol_pb2.STATUS_ONLINE)
+		except KeyError:
+			self.logger.error("Buddy not found: %s", buddy)
 
 	def onPrecenceUnavailable(self, jid):
 		buddy = jid.split("@")[0]
-		if (self.roster.buddies.has_key(buddy)):
+
-			buddy = self.roster.buddies[buddy]
+		try:
-			logging.info("is unavailable: %s", buddy)
+			buddy = self.buddies[buddy]
-			self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, [], protocol_pb2.STATUS_XA)
+			self.logger.info("Is unavailable: %s", buddy)
+			self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, buddy.groups, protocol_pb2.STATUS_XA)
+		except KeyError:
+			self.logger.error("Buddy not found: %s", buddy)
 
 	def onGroupGotInfo(self, gjid, owner, subject, subjectOwner, subjectTimestamp, creationTimestamp):
 		room = gjid.split("@")[0]
+		owner = owner.split("@")[0]
+		subjectOwner = subjectOwner.split("@")[0]
 
-		if self.groups.has_key(room):
+		if room in self.groups:
 			room = self.groups[room]
 			room.owner = owner
+			room.subjectOwner = subjectOwner
 			room.subject = subject
 		else:
-			self.groups = Group(room, subject, owner)
+			self.groups[room] = Group(room, owner, subject, subjectOwner)
 
-		self.backend.handleRoomList([[room, subject]])
+		self.updateRoomList()
 
 	def onGroupGotParticipants(self, gjid, jids):
 		room = gjid.split("@")[0]
+		group = self.groups[room]
 
 		for jid in jids:
 			buddy = jid.split("@")[0]
-			logging.info("added %s to room %s", buddy, room)
+			self.logger.info("Added %s to room %s", buddy, room)
-			self.backend.handleParticipantChanged(self.user, buddy, room, protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_ONLINE)
 
-		self.backend.handleParticipantChanged(self.user, self.legacyName, room, protocol_pb2.PARTICIPANT_FLAG_ME, protocol_pb2.STATUS_ONLINE)
+			if buddy == group.owner:
-		# TODO check status and moderator
+				flags = protocol_pb2.PARTICIPANT_FLAG_MODERATOR
+			else:
+				flags = protocol_pb2.PARTICIPANT_FLAG_NONE
+
+			self.backend.handleParticipantChanged(self.user, buddy, room, flags, protocol_pb2.STATUS_ONLINE) # TODO check status
+
+			if room in self.groupOfflineQueue:
+				while self.groupOfflineQueue[room]:
+					msg = self.groupOfflineQueue[room].pop(0)
+					self.backend.handleMessage(self.user, room, msg[1], msg[0], "", msg[2])
+					self.logger.debug("Send queued group message to: %s %s %s", msg[0],msg[1], msg[2])
 
 	def onGroupMessageReceived(self, messageId, gjid, jid, messageContent, timestamp, receiptRequested, pushName):
 		buddy = jid.split("@")[0]
 		room = gjid.split("@")[0]
 
-		logging.info("group message received in  %s from %s: %s", room, buddy, messageContent)
+		self.logger.info("Group message received in  %s from %s: %s", room, buddy, messageContent)
-		self.backend.handleMessage(self.user, room, self._softToUni(messageContent), buddy, timestamp=timestamp)
+
+		self.sendGroupMessageToXMPP(room, buddy, utils.softToUni(messageContent), timestamp)
 		if receiptRequested: self.call("message_ack", (gjid, messageId))
 
 	def onGroupSubjectReceived(self, messageId, gjid, jid, subject, timestamp, receiptRequested):
@@ -245,13 +387,29 @@ class Session:
 		self.backend.handleSubject(self.user, room, subject, buddy)
 		if receiptRequested: self.call("subject_ack", (gjid, messageId))
 
+	# Yowsup Notifications
 	def onGroupParticipantAdded(self, gjid, jid, author, timestamp, messageId, receiptRequested):
 		room = gjid.split("@")[0]
 		buddy = jid.split("@")[0]
 
-		self.backend.handleParticipantChanged(self.user, buddy, room, protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_ONLINE)
+		loggin.info("Added % to room %s", buddy, room)
-#		if receiptRequested: self.call("message_ack", (gjid, messageId))
+
+		self.backend.handleParticipantChanged(self.user, buddy, room, protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_ONLINE)
+		if receiptRequested: self.call("notification_ack", (gjid, messageId))
+
+	def onGroupParticipantRemoved(self, gjid, jid, author, timestamp, messageId, receiptRequested):
+		room = gjid.split("@")[0]
+		buddy = jid.split("@")[0]
+
+		self.logger.info("Removed %s from room %s", buddy, room)
 
-	def onGroupParticipantRemoved(gjid, jid, author, timestamp, messageId, receiptRequested):
 		self.backend.handleParticipantChanged(self.user, buddy, room, protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_NONE) # TODO
-#		if receiptRequested: self.call("message_ack", (gjid, messageId))
+		if receiptRequested: self.call("notification_ack", (gjid, messageId))
+
+	def onContactProfilePictureUpdated(self, jid, timestamp, messageId, pictureId, receiptRequested):
+		# TODO
+		if receiptRequested: self.call("notification_ack", (jid, messageId))
+
+	def onGroupPictureUpdated(self, jid, author, timestamp, messageId, pictureId, receiptRequested):
+		# TODO
+		if receiptRequested: self.call("notification_ack", (jid, messageId))