From 41030d5499b994a248053882aeb84abb70a942a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCller?= Date: Wed, 6 Jan 2016 19:56:30 +0100 Subject: [PATCH 01/12] fix for messages only containing whitespaces --- bot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot.py b/bot.py index 631d82a..2555fcb 100644 --- a/bot.py +++ b/bot.py @@ -45,7 +45,7 @@ class Bot(): args = message.strip().split(" ") cmd = args.pop(0) - if cmd[0] == '\\': + if len(cmd) > 0 and cmd[0] == '\\': try: self.call(cmd[1:], args) except KeyError: From 502077dc51a020c1e09a9ca861f341f7cf666e3e Mon Sep 17 00:00:00 2001 From: moyamo Date: Sun, 10 Jan 2016 00:02:19 +0200 Subject: [PATCH 02/12] Send residential memory usage to spectrum server --- Spectrum2/backend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index b2e5891..871b482 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -6,6 +6,8 @@ import os import logging import google.protobuf +import resource + def WRAP(MESSAGE, TYPE): wrap = protocol_pb2.WrapperMessage() wrap.type = TYPE @@ -620,7 +622,7 @@ class SpectrumBackend: pass def handleMemoryUsage(self): - return (0,0) + return (resource.getrusage(resource.RUSAGE_SELF).ru_maxrss, 0) def handleExitRequest(self): sys.exit(1) From dc3033c81195bae13cc622d65355c5f66fa78376 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 23 Feb 2016 09:09:27 +0100 Subject: [PATCH 03/12] added systemd unit --- contrib/spectrum@.service | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 contrib/spectrum@.service diff --git a/contrib/spectrum@.service b/contrib/spectrum@.service new file mode 100644 index 0000000..24f5806 --- /dev/null +++ b/contrib/spectrum@.service @@ -0,0 +1,11 @@ +[Unit] +description=spectrum2 whatsapp +After=network.target + +[Service] +ExecStart=/usr/bin/spectrum2 --no-daemonize -j whatsapp.example.com --config /etc/spectrum2/transports/whatsapp.cfg +Restart=always +User=spectrum2 + +[Install] +WantedBy=multi-user.target From f6e2ba94ccce3f026f801fbf62d6eb65997d960a Mon Sep 17 00:00:00 2001 From: moyamo Date: Wed, 23 Mar 2016 10:48:19 +0200 Subject: [PATCH 04/12] Update S40YowsupEnv temporarily This commit should be removed when yowsup updates. --- yowsupwrapper.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index f5bece2..7d4c013 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -55,9 +55,19 @@ from functools import partial #from session import MsgIDs +# Temporary env until yowsup updates +class UpdatedS40YowsupEnv(env.S40YowsupEnv): + _VERSION = "2.13.39" + _OS_NAME= "S40" + _OS_VERSION = "14.26" + _DEVICE_NAME = "302" + _MANUFACTURER = "Nokia" + _TOKEN_STRING = "PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk{phone}" + _AXOLOTL = True + class YowsupApp(object): def __init__(self): - env.CURRENT_ENV = env.S40YowsupEnv() + env.CURRENT_ENV = UpdatedS40YowsupEnv() layers = (YowsupAppLayer, YowParallelLayer((YowAuthenticationProtocolLayer, From 4643bb433d6201bcaf89e2c9a113a757a1e88efa Mon Sep 17 00:00:00 2001 From: moyamo Date: Thu, 24 Mar 2016 10:49:29 +0200 Subject: [PATCH 05/12] Patch YowAxoltolLayer to fix padding problems These changes should be reverted when yowsup updates. --- yowsupwrapper.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 048ba98..3a88938 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -45,9 +45,38 @@ from functools import partial #from session import MsgIDs +# Temporarily work around yowsup padding bugs with new protocol +class UpdatedYowAxolotlLayer(YowAxolotlLayer): + def decodeInt7bit(self, string): + idx = 0 + while ord(string[idx]) >= 128: + idx += 1 + consumedBytes = idx + 1 + value = 0 + while idx >= 0: + value <<= 7 + value += ord(string[idx]) % 128 + idx -= 1 + return value, consumedBytes + + def unpadV2Plaintext(self, v2plaintext): + end = -ord(v2plaintext[-1]) # length of the left padding + length,consumed = self.decodeInt7bit(v2plaintext[1:]) + return v2plaintext[1+consumed:end] + +# Temporary env until yowsup updates +class UpdatedS40YowsupEnv(env.S40YowsupEnv): + _VERSION = "2.13.39" + _OS_NAME= "S40" + _OS_VERSION = "14.26" + _DEVICE_NAME = "302" + _MANUFACTURER = "Nokia" + _TOKEN_STRING = "PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk{phone}" + _AXOLOTL = True + class YowsupApp(object): def __init__(self): - env.CURRENT_ENV = env.S40YowsupEnv() + env.CURRENT_ENV = UpdatedS40YowsupEnv() layers = (YowsupAppLayer, YowParallelLayer((YowAuthenticationProtocolLayer, @@ -65,7 +94,7 @@ class YowsupApp(object): YowProfilesProtocolLayer, YowGroupsProtocolLayer, YowPresenceProtocolLayer)), - YowAxolotlLayer, + UpdatedYowAxolotlLayer, YowCoderLayer, YowCryptLayer, YowStanzaRegulator, From feb4e4ac88723d18bd70cdeb2971b5c822517aed Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 6 Apr 2016 14:55:59 +0200 Subject: [PATCH 06/12] added note about available branches to readme --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index e025ca7..b5bd6f6 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,16 @@ transWhat is a WhatsApp XMPP Gateway based on [Spectrum 2](http://www.spectrum.im) and [Yowsup 2](https://github.com/tgalal/yowsup). +#### Branches + + - [yowsup-1](http://github.com/stv0g/transwhat/tree/yowsup-1) My original version which is based on @tgalal first Yowsup version (**deprecated** and broken). + - [yowsup-2](http://github.com/stv0g/transwhat/tree/yowsup-2) Major rewrite from @moyamo for @tgalal's new Yowsup 2 (**recommended**). + - [develop](http://github.com/stv0g/transwhat/tree/develop) A develop branch with the latest fixes and improvements. This branch is based on `yowsup-2`. + +For production, please use the `yowsup-2` branch. + +Please file bugreports against the `develop` branch. + ## [Installation](INSTALL.md) ## [Usage](USAGE.md) From c005c31afae432176f8df0adefcc96684a4ef548 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 6 Apr 2016 21:10:04 +0200 Subject: [PATCH 07/12] added new option for log file --- transwhat.py | 14 +++++++++----- utils.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/transwhat.py b/transwhat.py index 07e36bf..4273ca5 100755 --- a/transwhat.py +++ b/transwhat.py @@ -43,6 +43,7 @@ from yowsup.stacks import YowStack # Arguments parser = argparse.ArgumentParser() parser.add_argument('--debug', action='store_true') +parser.add_argument('--log', type=str) parser.add_argument('--host', type=str, required=True) parser.add_argument('--port', type=int, required=True) parser.add_argument('--service.backend_id', metavar="ID", type=int, required=True) @@ -52,12 +53,15 @@ parser.add_argument('-j', type=str, required=True) args, unknown = parser.parse_known_args() YowConstants.PATH_STORAGE='/var/lib/spectrum2/' + args.j -loggingfile = '/var/log/spectrum2/' + args.j + '/backends/backend.log' + +if args.log is None: + args.log = '/var/log/spectrum2/' + args.j + '/backends/backend.log' + # Logging -logging.basicConfig( \ - filename=loggingfile,\ - format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s", \ - level = logging.DEBUG if args.debug else logging.INFO \ +logging.basicConfig( + filename=args.log, + format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s", + level = logging.DEBUG if args.debug else logging.INFO ) # Handler diff --git a/utils.py b/utils.py index f6d120c..a55546b 100644 --- a/utils.py +++ b/utils.py @@ -50,4 +50,4 @@ def decodePassword(password): return base64.b64decode(bytes(password.encode("utf-8"))) def sha1hash(data): - return hashlib.sha1(data).hexdigest() + return hashlib.sha1(data).hexdigest() From d9bd18013d1f5e7e316d33e9f761c706beb8a7aa Mon Sep 17 00:00:00 2001 From: moyamo Date: Sat, 9 Apr 2016 22:07:26 +0200 Subject: [PATCH 08/12] Convert str literals to unicode literals --- buddy.py | 2 +- session.py | 303 +++++++++++++++++++++++++---------------------------- utils.py | 6 +- 3 files changed, 148 insertions(+), 163 deletions(-) diff --git a/buddy.py b/buddy.py index 62a216b..06edae6 100644 --- a/buddy.py +++ b/buddy.py @@ -79,7 +79,7 @@ class BuddyList(dict): self.session.sendSync(contacts, delta=False, interactive=True, success=self.onSync) - self.logger.debug("Roster add: %s", str(list(contacts))) + self.logger.debug("Roster add: %s",list(contacts)) for number in contacts: buddy = self[number] diff --git a/session.py b/session.py index 32caedc..07c2ee3 100644 --- a/session.py +++ b/session.py @@ -1,10 +1,10 @@ -__author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" -__license__ = "GPLv3" -__maintainer__ = "Steffen Vogel" -__email__ = "post@steffenvogel.de" +__author__ = u"Steffen Vogel" +__copyright__ = u"Copyright 2015, Steffen Vogel" +__license__ = u"GPLv3" +__maintainer__ = u"Steffen Vogel" +__email__ = u"post@steffenvogel.de" -""" +u""" This file is part of transWhat transWhat is free software: you can redistribute it and/or modify @@ -59,14 +59,14 @@ class Session(YowsupApp): def __init__(self, backend, user, legacyName, extra): super(Session, self).__init__() self.logger = logging.getLogger(self.__class__.__name__) - self.logger.info("Created: %s", legacyName) + self.logger.info(u"Created: %s", legacyName) self.backend = backend self.user = user self.legacyName = legacyName self.status = protocol_pb2.STATUS_NONE - self.statusMessage = '' + self.statusMessage = u'' self.groups = {} self.gotGroupList = False @@ -90,55 +90,45 @@ class Session(YowsupApp): self.bot = Bot(self) self.imgMsgId = None - self.imgPath = "" + self.imgPath = u"" self.imgBuddy = None - self.imgType = "" + self.imgType = u"" def __del__(self): # handleLogoutRequest self.logout() def logout(self): - self.logger.info("%s logged out", self.user) + self.logger.info(u"%s logged out", self.user) super(Session, self).logout() self.loggedIn = False def login(self, password): - self.logger.info("%s attempting login", self.user) + self.logger.info(u"%s attempting login", self.user) self.password = password self.shouldBeConncted = True super(Session, self).login(self.legacyName, self.password) - def _shortenGroupId(self, gid): - # FIXME: might have problems if number begins with 0 - return gid -# return '-'.join(hex(int(s))[2:] for s in gid.split('-')) - - def _lengthenGroupId(self, gid): - return gid - # FIXME: might have problems if number begins with 0 -# return '-'.join(str(int(s, 16)) for s in gid.split('-')) - def updateRoomList(self): rooms = [] text = [] for room, group in self.groups.iteritems(): - rooms.append([self._shortenGroupId(room), group.subject]) - text.append(self._shortenGroupId(room) + '@' + self.backend.spectrum_jid + ' :' + group.subject) + rooms.append([room, group.subject]) + text.append(room.decode('utf-8') + u'@' + self.backend.spectrum_jid.decode('utf-8') + u' :' + group.subject.decode('utf-8')) - self.logger.debug("Got rooms: %s", rooms) + self.logger.debug(u"Got rooms: %s", rooms) self.backend.handleRoomList(rooms) - message = "Note, you are a participant of the following groups:\n" +\ - '\n'.join(text) + '\nIf you do not join them you will lose messages' + message = u"Note, you are a participant of the following groups:\n" +\ + u'\n'.join(text) + u'\nIf you do not join them you will lose messages' #self.bot.send(message) def _updateGroups(self, response, request): - self.logger.debug('Received groups list %s', response) + self.logger.debug(u'Received groups list %s', str(response).decode('utf-8')) groups = response.getGroups() for group in groups: room = group.getId() - owner = group.getOwner().split('@')[0] - subjectOwner = group.getSubjectOwner().split('@')[0] + owner = group.getOwner().split(u'@')[0] + subjectOwner = group.getSubjectOwner().split(u'@')[0] subject = utils.softToUni(group.getSubject()) if room in self.groups: @@ -148,7 +138,7 @@ class Session(YowsupApp): oroom.subject = subject else: self.groups[room] = Group(room, owner, subject, subjectOwner, self.backend, self.user) -# self.joinRoom(self._shortenGroupId(room), self.user.split("@")[0]) +# self.joinRoom(self._shortenGroupId(room), self.user.split(u"@")[0]) self.groups[room].addParticipants(group.getParticipants().keys(), self.buddies, self.legacyName) @@ -158,8 +148,8 @@ class Session(YowsupApp): 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], u"", msg[2]) + self.logger.debug(u"Send queued group message to: %s %s %s", msg[0],msg[1], msg[2]) self.gotGroupList = True for room, nick in self.joinRoomQueue: @@ -171,9 +161,9 @@ class Session(YowsupApp): if not self.gotGroupList: self.joinRoomQueue.append((room, nick)) return - room = self._lengthenGroupId(room) + room = room if room in self.groups: - self.logger.info("Joining room: %s room=%s, nick=%s", + self.logger.info(u"Joining room: %s room=%s, nick=%s", self.legacyName, room, nick) group = self.groups[room] @@ -186,52 +176,52 @@ class Session(YowsupApp): ownerNick = group.subjectOwner group.sendParticipantsToSpectrum(self.legacyName) - self.backend.handleSubject(self.user, self._shortenGroupId(room), + self.backend.handleSubject(self.user, room, group.subject, ownerNick) - self.logger.debug("Room subject: room=%s, subject=%s", - room, group.subject) + self.logger.debug(u"Room subject: room=%s, subject=%s", + room.decode('utf-8'), group.subject.decode('utf-8')) self.backend.handleRoomNicknameChanged( - self.user, self._shortenGroupId(room), group.subject + self.user, room, group.subject ) else: - self.logger.warn("Room doesn't exist: %s", room) + self.logger.warn(u"Room doesn't exist: %s", room) def leaveRoom(self, room): if room in self.groups: - self.logger.info("Leaving room: %s room=%s", self.legacyName, room) + self.logger.info(u"Leaving room: %s room=%s", self.legacyName, room) group = self.groups[room] group.joined = False else: - self.logger.warn("Room doesn't exist: %s. Unable to leave.", room) + self.logger.warn(u"Room doesn't exist: %s. Unable to leave.", room) def _lastSeen(self, number, seconds): - self.logger.debug("Last seen %s at %s seconds" % (number, str(seconds))) + self.logger.debug(u"Last seen %s at %s seconds", number, seconds) if seconds < 60: self.onPresenceAvailable(number) else: self.onPresenceUnavailable(number) def sendReadReceipts(self, buddy): for _id, _from, participant in self.recvMsgIDs: - if _from.split('@')[0] == buddy: - self.sendReceipt(_id, _from, 'read', participant) + if _from.split(u'@')[0] == buddy: + self.sendReceipt(_id, _from, u'read', participant) self.recvMsgIDs.remove((_id, _from, participant)) - self.logger.debug("Send read receipt to %s (ID: %s)", _from, _id) + self.logger.debug(u"Send read receipt to %s (ID: %s)", _from, _id) # Called by superclass def onAuthSuccess(self, status, kind, creation, expiration, props, nonce, t): - self.logger.info("Auth success: %s", self.user) + self.logger.info(u"Auth success: %s", self.user) self.backend.handleConnected(self.user) - self.backend.handleBuddyChanged(self.user, "bot", self.bot.name, - ["Admin"], protocol_pb2.STATUS_ONLINE) + self.backend.handleBuddyChanged(self.user, u"bot", self.bot.name, + [u"Admin"], protocol_pb2.STATUS_ONLINE) # Initialisation? self.requestPrivacyList() self.requestClientConfig() self.requestServerProperties() # ? - self.logger.debug('Requesting groups list') + self.logger.debug(u'Requesting groups list') self.requestGroupsList(self._updateGroups) # self.requestBroadcastList() @@ -242,67 +232,62 @@ class Session(YowsupApp): if self.initialized == False: self.sendOfflineMessages() - #self.bot.call("welcome") + #self.bot.call(u"welcome") self.initialized = True self.loggedIn = True # Called by superclass def onAuthFailed(self, reason): - self.logger.info("Auth failed: %s (%s)", self.user, reason) + self.logger.info(u"Auth failed: %s (%s)", self.user, reason) self.backend.handleDisconnected(self.user, 0, reason) self.password = None self.loggedIn = False # Called by superclass def onDisconnect(self): - self.logger.debug('Disconnected') - self.backend.handleDisconnected(self.user, 0, 'Disconnected for unknown reasons') + self.logger.debug(u'Disconnected') + self.backend.handleDisconnected(self.user, 0, u'Disconnected for unknown reasons') # Called by superclass def onReceipt(self, _id, _from, timestamp, type, participant, offline, items): - self.logger.debug("received receipt, sending ack: " + - ' '.join(map(str, [_id, _from, timestamp, - type, participant, offline, items])) + self.logger.debug(u"received receipt, sending ack: %s", + [_id, _from, timestamp, type, participant, offline, items] ) try: - number = _from.split('@')[0] + number = _from.split(u'@')[0] self.backend.handleMessageAck(self.user, number, self.msgIDs[_id].xmppId) self.msgIDs[_id].cnt = self.msgIDs[_id].cnt + 1 if self.msgIDs[_id].cnt == 2: del self.msgIDs[_id] except KeyError: - self.logger.error("Message %s not found. Unable to send ack", _id) + self.logger.error(u"Message %s not found. Unable to send ack", _id) # Called by superclass def onAck(self, _id, _class, _from, timestamp): - self.logger.debug('received ack ' + - ' '.join(map(str, [_id, _class, _from,timestamp,])) - ) + self.logger.debug(u'received ack: %s', [_id, _class, _from, timestamp]) # Called by superclass def onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body): - self.logger.debug('received TextMessage' + - ' '.join(map(str, [ - _id, _from, to, notify, timestamp, - participant, offline, retry, body - ])) - ) - buddy = _from.split('@')[0] + self.logger.debug(u'received TextMessage %s', [ + _id, _from, to, notify, timestamp, + participant, offline, retry, body + ]) + buddy = _from.split(u'@')[0] messageContent = utils.softToUni(body) self.sendReceipt(_id, _from, None, participant) self.recvMsgIDs.append((_id, _from, participant)) - self.logger.info("Message received from %s to %s: %s (at ts=%s)", + self.logger.info(u"Message received from %s to %s: %s (at ts=%s)", buddy, self.legacyName, messageContent, timestamp) if participant is not None: # Group message or broadcast - partname = participant.split('@')[0] - if _from.split('@')[1] == 'broadcast': # Broadcast message + partname = participant.split(u'@')[0] + if _from.split(u'@')[1] == u'broadcast': # Broadcast message message = self.broadcast_prefix + messageContent self.sendMessageToXMPP(partname, message, timestamp) else: # Group message if notify is None: - notify = "" + notify = u"" self.sendGroupMessageToXMPP(buddy, partname, messageContent, timestamp, notify) else: @@ -310,14 +295,14 @@ class Session(YowsupApp): # Called by superclass def onImage(self, image): - self.logger.debug('Received image message %s', str(image)) - buddy = image._from.split('@')[0] + self.logger.debug(u'Received image message %s', str(image)) + buddy = image._from.split(u'@')[0] participant = image.participant if image.caption is None: - image.caption = '' + image.caption = u'' if participant is not None: # Group message - partname = participant.split('@')[0] - if image._from.split('@')[1] == 'broadcast': # Broadcast message + partname = participant.split(u'@')[0] + if image._from.split(u'@')[1] == u'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, image.timestamp) self.sendMessageToXMPP(partname, image.url, image.timestamp) self.sendMessageToXMPP(partname, image.caption, image.timestamp) @@ -333,13 +318,13 @@ class Session(YowsupApp): # Called by superclass def onAudio(self, audio): - self.logger.debug('Received audio message %s', str(audio)) - buddy = audio._from.split('@')[0] + self.logger.debug(u'Received audio message %s', str(audio)) + buddy = audio._from.split(u'@')[0] participant = audio.participant message = audio.url if participant is not None: # Group message - partname = participant.split('@')[0] - if audio._from.split('@')[1] == 'broadcast': # Broadcast message + partname = participant.split(u'@')[0] + if audio._from.split(u'@')[1] == u'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, audio.timestamp) self.sendMessageToXMPP(partname, message, audio.timestamp) else: # Group message @@ -352,14 +337,14 @@ class Session(YowsupApp): # Called by superclass def onVideo(self, video): - self.logger.debug('Received video message %s', str(video)) - buddy = video._from.split('@')[0] + self.logger.debug(u'Received video message %s', str(video)) + buddy = video._from.split(u'@')[0] participant = video.participant message = video.url if participant is not None: # Group message - partname = participant.split('@')[0] - if video._from.split('@')[1] == 'broadcast': # Broadcast message + partname = participant.split(u'@')[0] + if video._from.split(u'@')[1] == u'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, video.timestamp) self.sendMessageToXMPP(partname, message, video.timestamp) else: # Group message @@ -371,20 +356,20 @@ class Session(YowsupApp): def onLocation(self, location): - buddy = location._from.split('@')[0] + buddy = location._from.split(u'@')[0] latitude = location.getLatitude() longitude = location.getLongitude() url = location.getLocationURL() participant = location.participant - latlong = 'geo:' + latitude + ',' + longitude + latlong = u'geo:' + latitude + u',' + longitude - self.logger.debug("Location received from %s: %s, %s", + self.logger.debug(u"Location received from %s: %s, %s", buddy, latitude, longitude) if participant is not None: # Group message - partname = participant.split('@')[0] - if location._from.split('@')[1] == 'broadcast': # Broadcast message + partname = participant.split(u'@')[0] + if location._from.split(u'@')[1] == u'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, location.timestamp) if url is not None: self.sendMessageToXMPP(partname, url, location.timestamp) @@ -398,22 +383,20 @@ class Session(YowsupApp): self.sendMessageToXMPP(buddy, url, location.timestamp) self.sendMessageToXMPP(buddy, latlong, location.timestamp) self.sendReceipt(location._id, location._from, None, location.participant) - self.recvMsgIDs.append((loaction._id, location._from, location.participant)) + self.recvMsgIDs.append((location._id, location._from, location.participant)) # Called by superclass def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant): - self.logger.debug('received VCard' + - ' '.join(map(str, [ + self.logger.debug(u'received VCard %s', [ _id, _from, name, card_data, to, notify, timestamp, participant - ])) - ) - message = "Received VCard (not implemented yet)" - buddy = _from.split("@")[0] + ]) + message = u"Received VCard (not implemented yet)" + buddy = _from.split(u"@")[0] if participant is not None: # Group message - partname = participant.split('@')[0] - if _from.split('@')[1] == 'broadcast': # Broadcast message + partname = participant.split(u'@')[0] + if _from.split(u'@')[1] == u'broadcast': # Broadcast message message = self.broadcast_prefix + message self.sendMessageToXMPP(partname, message, timestamp) else: # Group message @@ -428,15 +411,15 @@ class Session(YowsupApp): def transferFile(self, buddy, name, data): # Not working - self.logger.debug('transfering file %s', name) + self.logger.debug(u'transfering file %s', name) self.backend.handleFTStart(self.user, buddy, name, len(data)) self.backend.handleFTData(0, data) self.backend.handleFTFinish(self.user, buddy, name, len(data), 0) # Called by superclass def onContactTyping(self, buddy): - self.logger.info("Started typing: %s", buddy) - if buddy != 'bot': + self.logger.info(u"Started typing: %s", buddy) + if buddy != u'bot': self.sendPresence(True) self.backend.handleBuddyTyping(self.user, buddy) @@ -445,15 +428,15 @@ class Session(YowsupApp): # Called by superclass def onContactPaused(self, buddy): - self.logger.info("Paused typing: %s", buddy) - if buddy != 'bot': + self.logger.info(u"Paused typing: %s", buddy) + if buddy != u'bot': self.backend.handleBuddyTyped(self.user, buddy) self.timer = Timer(3, self.backend.handleBuddyStoppedTyping, (self.user, buddy)).start() # Called by superclass def onAddedToGroup(self, group): - self.logger.debug("Added to group: %s", group) + self.logger.debug(u"Added to group: %s", group) room = group.getGroupId() owner = group.getCreatorJid(full = False) subjectOwner = group.getSubjectOwnerJid(full = False) @@ -461,25 +444,25 @@ class Session(YowsupApp): self.groups[room] = Group(room, owner, subject, subjectOwner, self.backend, self.user) self.groups[room].addParticipants(group.getParticipants, self.buddies, self.legacyName) - self.bot.send("You have been added to group: %s@%s (%s)" - % (self._shortenGroupId(room), subject, self.backend.spectrum_jid)) + self.bot.send(u"You have been added to group: %s@%s (%s)" + % (room, subject, self.backend.spectrum_jid)) # Called by superclass def onParticipantsAddedToGroup(self, group): - self.logger.debug("Participants added to group: %s", group) - room = group.getGroupId().split('@')[0] + self.logger.debug(u"Participants added to group: %s", group) + room = group.getGroupId().split(u'@')[0] self.groups[room].addParticipants(group.getParticipants(), self.buddies, self.legacyName) self.groups[room].sendParticipantsToSpectrum(self.legacyName) # Called by superclass def onSubjectChanged(self, room, subject, subjectOwner, timestamp): self.logger.debug( - "onSubjectChange(rrom=%s, subject=%s, subjectOwner=%s, timestamp=%s)", + u"onSubjectChange(room=%s, subject=%s, subjectOwner=%s, timestamp=%s)", room, subject, subjectOwner, timestamp) try: group = self.groups[room] except KeyError: - self.logger.error("Subject of non-existant group (%s) changed", group) + self.logger.error(u"Subject of non-existant group (%s) changed", group) else: group.subject = subject group.subjectOwner = subjectOwner @@ -491,74 +474,74 @@ class Session(YowsupApp): # Called by superclass def onParticipantsRemovedFromGroup(self, room, participants): - self.logger.debug("Participants removed from group: %s, %s", + self.logger.debug(u"Participants removed from group: %s, %s", room, participants) self.groups[room].removeParticipants(participants) # Called by superclass def onContactStatusChanged(self, number, status): - self.logger.debug("%s changed their status to %s", number, status) + self.logger.debug(u"%s changed their status to %s", number, status) try: buddy = self.buddies[number] buddy.statusMsg = status self.buddies.updateSpectrum(buddy) except KeyError: - self.logger.debug("%s not in buddy list", number) + self.logger.debug(u"%s not in buddy list", number) # Called by superclass def onContactPictureChanged(self, number): - self.logger.debug("%s changed their profile picture", number) + self.logger.debug(u"%s changed their profile picture", number) self.buddies.requestVCard(number) # Called by superclass def onContactAdded(self, number, nick): - self.logger.debug("Adding new contact %s (%s)", nick, number) + self.logger.debug(u"Adding new contact %s (%s)", nick, number) self.updateBuddy(number, nick, []) # Called by superclass def onContactRemoved(self, number): - self.logger.debug("Removing contact %s", number) + self.logger.debug(u"Removing contact %s", number) self.removeBuddy(number) def onContactUpdated(self, oldnumber, newnumber): - self.logger.debug("Contact has changed number from %s to %s", + self.logger.debug(u"Contact has changed number from %s to %s", oldnumber, newnumber) if newnumber in self.buddies: - self.logger.warn("Contact %s exists, just updating", newnumber) + self.logger.warn(u"Contact %s exists, just updating", newnumber) self.buddies.refresh(newnumber) try: buddy = self.buddies[oldnumber] except KeyError: - self.logger.warn("Old contact (%s) not found. Adding new contact (%s)", + self.logger.warn(u"Old contact (%s) not found. Adding new contact (%s)", oldnumber, newnumber) - nick = "" + nick = u"" else: self.removeBuddy(buddy.number) nick = buddy.nick self.updateBuddy(newnumber, nick, []) def onPresenceReceived(self, _type, name, jid, lastseen): - self.logger.info("Presence received: %s %s %s %s", _type, name, jid, lastseen) - buddy = jid.split("@")[0] + self.logger.info(u"Presence received: %s %s %s %s", _type, name, jid, lastseen) + buddy = jid.split(u"@")[0] try: buddy = self.buddies[buddy] except KeyError: # Sometimes whatsapp send our own presence if buddy != self.legacyName: - self.logger.error("Buddy not found: %s", buddy) + self.logger.error(u"Buddy not found: %s", buddy) return if (lastseen == str(buddy.lastseen)) and (_type == buddy.presence): return - if ((lastseen != "deny") and (lastseen != None) and (lastseen != "none")): + if ((lastseen != u"deny") and (lastseen != None) and (lastseen != u"none")): buddy.lastseen = int(lastseen) if (_type == None): buddy.lastseen = time.time() buddy.presence = _type - if _type == "unavailable": + if _type == u"unavailable": self.onPresenceUnavailable(buddy) else: self.onPresenceAvailable(buddy) @@ -566,17 +549,17 @@ class Session(YowsupApp): def onPresenceAvailable(self, buddy): - self.logger.info("Is available: %s", buddy) + self.logger.info(u"Is available: %s", buddy) self.buddies.updateSpectrum(buddy) def onPresenceUnavailable(self, buddy): - self.logger.info("Is unavailable: %s", buddy) + self.logger.info(u"Is unavailable: %s", buddy) self.buddies.updateSpectrum(buddy) # spectrum RequestMethods def sendTypingStarted(self, buddy): - if buddy != "bot": - self.logger.info("Started typing: %s to %s", self.legacyName, buddy) + if buddy != u"bot": + self.logger.info(u"Started typing: %s to %s", self.legacyName, buddy) self.sendTyping(buddy, True) self.sendReadReceipts(buddy) # If he is typing he is present @@ -645,33 +628,33 @@ class Session(YowsupApp): break if number is not None: self.logger.debug("Private message sent from %s to %s", self.legacyName, number) - waId = self.sendTextMessage(number + '@s.whatsapp.net', message) + waId = self.sendTextMessage(number + u'@s.whatsapp.net', message) self.msgIDs[waId] = MsgIDs( ID, waId) else: self.logger.error("Attempted to send private message to non-existent user") self.logger.debug("%s to %s in %s", self.legacyName, nick, room) else: room = sender - if message[0] == '\\' and message[:1] != '\\\\': + if message[0] == u'\\' and message[:1] != u'\\\\': self.logger.debug("Executing command %s in %s", message, room) self.executeCommand(message, room) else: try: - group = self.groups[self._lengthenGroupId(room)] + group = self.groups[room] self.logger.debug("Group Message from %s to %s Groups: %s", group.nick , group , self.groups) self.backend.handleMessage( - self.user, room, message.decode('utf-8'), group.nick, xhtml=xhtml + self.user, room, message.decode(u'utf-8'), group.nick, xhtml=xhtml ) except KeyError: - self.logger.error('Group not found: %s', room) + self.logger.error(u'Group not found: %s', room) if (".jpg" in message.lower()) or (".webp" in message.lower()): - self.sendImage(message, ID, room + '@g.us') + self.sendImage(message, ID, room + u'@g.us') elif "geo:" in message.lower(): self._sendLocation(room + "@g.us", message, ID) else: - self.sendTextMessage(room + '@g.us', message) + self.sendTextMessage(room + u'@g.us', message) else: # private msg buddy = sender # if message == "\\lastseen": @@ -692,14 +675,14 @@ class Session(YowsupApp): elif "geo:" in message.lower(): self._sendLocation(buddy + "@s.whatsapp.net", message, ID) else: - waId = self.sendTextMessage(sender + '@s.whatsapp.net', message) + waId = self.sendTextMessage(sender + u'@s.whatsapp.net', message) self.msgIDs[waId] = MsgIDs( ID, waId) self.logger.info("WA Message send to %s with ID %s", buddy, waId) - #self.sendTextMessage(sender + '@s.whatsapp.net', message) + #self.sendTextMessage(sender + u'@s.whatsapp.net', message) def executeCommand(self, command, room): - if command == '\\leave': + if command == u'\\leave': self.logger.debug("Leaving room %s", room) # Leave group on whatsapp side self.leaveGroup(room) @@ -720,9 +703,9 @@ class Session(YowsupApp): self.requestLastSeen(buddy, onSuccess, onError) def _sendLocation(self, buddy, message, ID): - #with open('/opt/transwhat/map.jpg', 'rb') as imageFile: + #with open(u'/opt/transwhat/map.jpg', 'rb') as imageFile: # raw = base64.b64encode(imageFile.read()) - latitude,longitude = message.split(':')[1].split(',') + latitude,longitude = message.split(u':')[1].split(',') waId = self.sendLocation(buddy, float(latitude), float(longitude)) self.msgIDs[waId] = MsgIDs( ID, waId) self.logger.info("WA Location Message send to %s with ID %s", buddy, waId) @@ -781,7 +764,7 @@ class Session(YowsupApp): self.bot.send("%s: %s" % (nick, messageContent)) except KeyError: self.logger.warn("Group is not in group list") - self.backend.handleMessage(self.user, self._shortenGroupId(room), + self.backend.handleMessage(self.user, room, messageContent, number, "", timestamp) @@ -799,7 +782,7 @@ class Session(YowsupApp): def changeStatusMessage(self, statusMessage): if (statusMessage != self.statusMessage) or (self.initialized == False): self.statusMessage = statusMessage - self.setStatus(statusMessage.encode('utf-8')) + self.setStatus(statusMessage.encode(u'utf-8')) self.logger.info("Status message changed: %s", statusMessage) #if self.initialized == False: @@ -833,7 +816,7 @@ class Session(YowsupApp): def createThumb(self, size=100, raw=False): img = Image.open(self.imgPath) width, height = img.size - img_thumbnail = self.imgPath + '_thumbnail' + img_thumbnail = self.imgPath + u'_thumbnail' if width > height: nheight = float(height) / width * size @@ -843,7 +826,7 @@ class Session(YowsupApp): nheight = size img.thumbnail((nwidth, nheight), Image.ANTIALIAS) - img.save(img_thumbnail, 'JPEG') + img.save(img_thumbnail, u'JPEG') with open(img_thumbnail, 'rb') as imageFile: raw = base64.b64encode(imageFile.read()) @@ -852,38 +835,38 @@ class Session(YowsupApp): # Not used def onLocationReceived(self, messageId, jid, name, preview, latitude, longitude, receiptRequested, isBroadcast): - buddy = jid.split("@")[0] - self.logger.info("Location received from %s: %s, %s", buddy, latitude, longitude) + buddy = jid.split(u"@")[0] + self.logger.info(u"Location received from %s: %s, %s", buddy, latitude, longitude) - url = "http://maps.google.de?%s" % urllib.urlencode({ "q": "%s %s" % (latitude, longitude) }) + url = u"http://maps.google.de?%s" % urllib.urlencode({ u"q": u"%s %s" % (latitude, longitude) }) self.sendMessageToXMPP(buddy, utils.shorten(url)) - if receiptRequested: self.call("message_ack", (jid, messageId)) + if receiptRequested: self.call(u"message_ack", (jid, messageId)) def onGroupSubjectReceived(self, messageId, gjid, jid, subject, timestamp, receiptRequested): - room = gjid.split("@")[0] - buddy = jid.split("@")[0] + room = gjid.split(u"@")[0] + buddy = jid.split(u"@")[0] self.backend.handleSubject(self.user, room, subject, buddy) - if receiptRequested: self.call("subject_ack", (gjid, messageId)) + if receiptRequested: self.call(u"subject_ack", (gjid, messageId)) # Yowsup Notifications def onGroupParticipantRemoved(self, gjid, jid, author, timestamp, messageId, receiptRequested): - room = gjid.split("@")[0] - buddy = jid.split("@")[0] + room = gjid.split(u"@")[0] + buddy = jid.split(u"@")[0] - self.logger.info("Removed %s from room %s", buddy, room) + self.logger.info(u"Removed %s from room %s", buddy, room) self.backend.handleParticipantChanged(self.user, buddy, room, protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_NONE) # TODO - if receiptRequested: self.call("notification_ack", (gjid, messageId)) + if receiptRequested: self.call(u"notification_ack", (gjid, messageId)) def onContactProfilePictureUpdated(self, jid, timestamp, messageId, pictureId, receiptRequested): # TODO - if receiptRequested: self.call("notification_ack", (jid, messageId)) + if receiptRequested: self.call(u"notification_ack", (jid, messageId)) def onGroupPictureUpdated(self, jid, author, timestamp, messageId, pictureId, receiptRequested): # TODO - if receiptRequested: self.call("notification_ack", (jid, messageId)) + if receiptRequested: self.call(u"notification_ack", (jid, messageId)) diff --git a/utils.py b/utils.py index a55546b..930733f 100644 --- a/utils.py +++ b/utils.py @@ -43,8 +43,10 @@ def ago(secs): return "%d %s ago" % (diff, period) def softToUni(message): - message = message.decode("utf-8") - return e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE) + # Deprecated + # message = message.decode("utf-8") + # return e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE) + return message def decodePassword(password): return base64.b64decode(bytes(password.encode("utf-8"))) From ef50b4c1db3ddc2eacf9ab2bcdc03627f9640b1f Mon Sep 17 00:00:00 2001 From: moyamo Date: Sat, 9 Apr 2016 22:48:02 +0200 Subject: [PATCH 09/12] Send timestamp with receipts (should help fix stream errors) --- session.py | 30 +++++++++++++++--------------- yowsupwrapper.py | 6 ++++-- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/session.py b/session.py index 07c2ee3..2b9d285 100644 --- a/session.py +++ b/session.py @@ -201,10 +201,10 @@ class Session(YowsupApp): else: self.onPresenceUnavailable(number) def sendReadReceipts(self, buddy): - for _id, _from, participant in self.recvMsgIDs: + for _id, _from, participant, t in self.recvMsgIDs: if _from.split(u'@')[0] == buddy: - self.sendReceipt(_id, _from, u'read', participant) - self.recvMsgIDs.remove((_id, _from, participant)) + self.sendReceipt(_id, _from, 'read', participant, t) + self.recvMsgIDs.remove((_id, _from, participant, t)) self.logger.debug(u"Send read receipt to %s (ID: %s)", _from, _id) # Called by superclass @@ -276,8 +276,8 @@ class Session(YowsupApp): ]) buddy = _from.split(u'@')[0] messageContent = utils.softToUni(body) - self.sendReceipt(_id, _from, None, participant) - self.recvMsgIDs.append((_id, _from, participant)) + self.sendReceipt(_id, _from, None, participant, timestamp) + self.recvMsgIDs.append((_id, _from, participant, timestamp)) self.logger.info(u"Message received from %s to %s: %s (at ts=%s)", buddy, self.legacyName, messageContent, timestamp) if participant is not None: # Group message or broadcast @@ -312,8 +312,8 @@ class Session(YowsupApp): else: self.sendMessageToXMPP(buddy, image.url, image.timestamp) self.sendMessageToXMPP(buddy, image.caption, image.timestamp) - self.sendReceipt(image._id, image._from, None, image.participant) - self.recvMsgIDs.append((image._id, image._from, image.participant)) + self.sendReceipt(image._id, image._from, None, image.participant, image.timestamp) + self.recvMsgIDs.append((image._id, image._from, image.participant, image.timestamp)) # Called by superclass @@ -331,8 +331,8 @@ class Session(YowsupApp): self.sendGroupMessageToXMPP(buddy, partname, message, audio.timestamp) else: self.sendMessageToXMPP(buddy, message, audio.timestamp) - self.sendReceipt(audio._id, audio._from, None, audio.participant) - self.recvMsgIDs.append((audio._id, audio._from, audio.participant)) + self.sendReceipt(audio._id, audio._from, None, audio.participant, audio.timestamp) + self.recvMsgIDs.append((audio._id, audio._from, audio.participant, audio.timestamp)) # Called by superclass @@ -351,8 +351,8 @@ class Session(YowsupApp): self.sendGroupMessageToXMPP(buddy, partname, message, video.timestamp) else: self.sendMessageToXMPP(buddy, message, video.timestamp) - self.sendReceipt(video._id, video._from, None, video.participant) - self.recvMsgIDs.append((video._id, video._from, video.participant)) + self.sendReceipt(video._id, video._from, None, video.participant, video.timestamp) + self.recvMsgIDs.append((video._id, video._from, video.participant, video.timestamp)) def onLocation(self, location): @@ -382,8 +382,8 @@ class Session(YowsupApp): if url is not None: self.sendMessageToXMPP(buddy, url, location.timestamp) self.sendMessageToXMPP(buddy, latlong, location.timestamp) - self.sendReceipt(location._id, location._from, None, location.participant) - self.recvMsgIDs.append((location._id, location._from, location.participant)) + self.sendReceipt(location._id, location._from, None, location.participant, location.timestamp) + self.recvMsgIDs.append((location._id, location._from, location.participant, location.timestamp)) @@ -405,8 +405,8 @@ class Session(YowsupApp): self.sendMessageToXMPP(buddy, message, timestamp) # self.sendMessageToXMPP(buddy, card_data) #self.transferFile(buddy, str(name), card_data) - self.sendReceipt(_id, _from, None, participant) - self.recvMsgIDs.append((_id, _from, participant)) + self.sendReceipt(_id, _from, None, participant, timestamp) + self.recvMsgIDs.append((_id, _from, participant, timestamp)) def transferFile(self, buddy, name, data): diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 2156c20..ee9d19c 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -153,7 +153,7 @@ class YowsupApp(object): """ self.stack.broadcastEvent(YowLayerEvent(YowNetworkLayer.EVENT_STATE_DISCONNECT)) - def sendReceipt(self, _id, _from, read, participant): + def sendReceipt(self, _id, _from, read, participant, t): """ Send a receipt (delivered: double-tick, read: blue-ticks) @@ -162,8 +162,10 @@ class YowsupApp(object): - _from: jid of person who sent the message - read: ('read' or None) None is just delivered, 'read' is read - participant + - t: The time the original message was sent. """ - receipt = OutgoingReceiptProtocolEntity(_id, _from, read, participant) + self.logger.debug(u'Sending receipt to whatsapp: %s', [_id, _from, read, participant, t]) + receipt = OutgoingReceiptProtocolEntity(_id, _from, read, participant, t=t) self.sendEntity(receipt) def downloadMedia(self, url, onSuccess = None, onFailure = None): From c72f0e9616a6516e5321dbcf21ea9196ba574ff5 Mon Sep 17 00:00:00 2001 From: moyamo Date: Sat, 9 Apr 2016 22:48:44 +0200 Subject: [PATCH 10/12] Disable updating users VCard because it is causing crashes --- whatsappbackend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/whatsappbackend.py b/whatsappbackend.py index 691dc73..93ea1fd 100644 --- a/whatsappbackend.py +++ b/whatsappbackend.py @@ -118,8 +118,8 @@ class WhatsAppBackend(SpectrumBackend): self.sessions[user].requestVCard(buddy, ID) def handleVCardUpdatedRequest(self, user, photo, nickname): - self.logger.debug("handleVCardUpdatedRequest(user=%s, nickname=%s)", user, nickname) - self.sessions[user].setProfilePicture(photo) + self.logger.debug("handleVCardUpdatedRequest(user=%s, nickname=%s) not implemented", user, nickname) + #self.sessions[user].setProfilePicture(photo) def handleBuddyBlockToggled(self, user, buddy, blocked): self.logger.debug("handleBuddyBlockedToggled(user=%s, buddy=%s, blocked=%s)", user, buddy, blocked) From 875717bf9a791649a3d25f4b88e36a9554e5d718 Mon Sep 17 00:00:00 2001 From: moyamo Date: Sat, 9 Apr 2016 23:05:16 +0200 Subject: [PATCH 11/12] Revert "Patch YowAxoltolLayer to fix padding problems" This reverts commit 4643bb433d6201bcaf89e2c9a113a757a1e88efa. --- yowsupwrapper.py | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index ee9d19c..dfbb4e6 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -55,38 +55,9 @@ from functools import partial #from session import MsgIDs -# Temporarily work around yowsup padding bugs with new protocol -class UpdatedYowAxolotlLayer(YowAxolotlLayer): - def decodeInt7bit(self, string): - idx = 0 - while ord(string[idx]) >= 128: - idx += 1 - consumedBytes = idx + 1 - value = 0 - while idx >= 0: - value <<= 7 - value += ord(string[idx]) % 128 - idx -= 1 - return value, consumedBytes - - def unpadV2Plaintext(self, v2plaintext): - end = -ord(v2plaintext[-1]) # length of the left padding - length,consumed = self.decodeInt7bit(v2plaintext[1:]) - return v2plaintext[1+consumed:end] - -# Temporary env until yowsup updates -class UpdatedS40YowsupEnv(env.S40YowsupEnv): - _VERSION = "2.13.39" - _OS_NAME= "S40" - _OS_VERSION = "14.26" - _DEVICE_NAME = "302" - _MANUFACTURER = "Nokia" - _TOKEN_STRING = "PdA2DJyKoUrwLw1Bg6EIhzh502dF9noR9uFCllGk{phone}" - _AXOLOTL = True - class YowsupApp(object): def __init__(self): - env.CURRENT_ENV = UpdatedS40YowsupEnv() + env.CURRENT_ENV = env.S40YowsupEnv() layers = (YowsupAppLayer, YowParallelLayer((YowAuthenticationProtocolLayer, @@ -104,7 +75,7 @@ class YowsupApp(object): YowProfilesProtocolLayer, YowGroupsProtocolLayer, YowPresenceProtocolLayer)), - UpdatedYowAxolotlLayer, + YowAxolotlLayer, YowCoderLayer, YowCryptLayer, YowStanzaRegulator, From d1e67d05556f65a100f61873bc0c69d01093d1c9 Mon Sep 17 00:00:00 2001 From: moyamo Date: Mon, 11 Apr 2016 16:55:12 +0200 Subject: [PATCH 12/12] Revert "Convert str literals to unicode literals" This reverts commit d9bd18013d1f5e7e316d33e9f761c706beb8a7aa. --- buddy.py | 2 +- session.py | 299 ++++++++++++++++++++++++++++------------------------- utils.py | 6 +- 3 files changed, 161 insertions(+), 146 deletions(-) diff --git a/buddy.py b/buddy.py index 06edae6..62a216b 100644 --- a/buddy.py +++ b/buddy.py @@ -79,7 +79,7 @@ class BuddyList(dict): self.session.sendSync(contacts, delta=False, interactive=True, success=self.onSync) - self.logger.debug("Roster add: %s",list(contacts)) + self.logger.debug("Roster add: %s", str(list(contacts))) for number in contacts: buddy = self[number] diff --git a/session.py b/session.py index 2b9d285..676e4c2 100644 --- a/session.py +++ b/session.py @@ -1,10 +1,10 @@ -__author__ = u"Steffen Vogel" -__copyright__ = u"Copyright 2015, Steffen Vogel" -__license__ = u"GPLv3" -__maintainer__ = u"Steffen Vogel" -__email__ = u"post@steffenvogel.de" +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" -u""" +""" This file is part of transWhat transWhat is free software: you can redistribute it and/or modify @@ -59,14 +59,14 @@ class Session(YowsupApp): def __init__(self, backend, user, legacyName, extra): super(Session, self).__init__() self.logger = logging.getLogger(self.__class__.__name__) - self.logger.info(u"Created: %s", legacyName) + self.logger.info("Created: %s", legacyName) self.backend = backend self.user = user self.legacyName = legacyName self.status = protocol_pb2.STATUS_NONE - self.statusMessage = u'' + self.statusMessage = '' self.groups = {} self.gotGroupList = False @@ -90,45 +90,55 @@ class Session(YowsupApp): self.bot = Bot(self) self.imgMsgId = None - self.imgPath = u"" + self.imgPath = "" self.imgBuddy = None - self.imgType = u"" + self.imgType = "" def __del__(self): # handleLogoutRequest self.logout() def logout(self): - self.logger.info(u"%s logged out", self.user) + self.logger.info("%s logged out", self.user) super(Session, self).logout() self.loggedIn = False def login(self, password): - self.logger.info(u"%s attempting login", self.user) + self.logger.info("%s attempting login", self.user) self.password = password self.shouldBeConncted = True super(Session, self).login(self.legacyName, self.password) + def _shortenGroupId(self, gid): + # FIXME: might have problems if number begins with 0 + return gid +# return '-'.join(hex(int(s))[2:] for s in gid.split('-')) + + def _lengthenGroupId(self, gid): + return gid + # FIXME: might have problems if number begins with 0 +# return '-'.join(str(int(s, 16)) for s in gid.split('-')) + def updateRoomList(self): rooms = [] text = [] for room, group in self.groups.iteritems(): - rooms.append([room, group.subject]) - text.append(room.decode('utf-8') + u'@' + self.backend.spectrum_jid.decode('utf-8') + u' :' + group.subject.decode('utf-8')) + rooms.append([self._shortenGroupId(room), group.subject]) + text.append(self._shortenGroupId(room) + '@' + self.backend.spectrum_jid + ' :' + group.subject) - self.logger.debug(u"Got rooms: %s", rooms) + self.logger.debug("Got rooms: %s", rooms) self.backend.handleRoomList(rooms) - message = u"Note, you are a participant of the following groups:\n" +\ - u'\n'.join(text) + u'\nIf you do not join them you will lose messages' + message = "Note, you are a participant of the following groups:\n" +\ + '\n'.join(text) + '\nIf you do not join them you will lose messages' #self.bot.send(message) def _updateGroups(self, response, request): - self.logger.debug(u'Received groups list %s', str(response).decode('utf-8')) + self.logger.debug('Received groups list %s', response) groups = response.getGroups() for group in groups: room = group.getId() - owner = group.getOwner().split(u'@')[0] - subjectOwner = group.getSubjectOwner().split(u'@')[0] + owner = group.getOwner().split('@')[0] + subjectOwner = group.getSubjectOwner().split('@')[0] subject = utils.softToUni(group.getSubject()) if room in self.groups: @@ -138,7 +148,7 @@ class Session(YowsupApp): oroom.subject = subject else: self.groups[room] = Group(room, owner, subject, subjectOwner, self.backend, self.user) -# self.joinRoom(self._shortenGroupId(room), self.user.split(u"@")[0]) +# self.joinRoom(self._shortenGroupId(room), self.user.split("@")[0]) self.groups[room].addParticipants(group.getParticipants().keys(), self.buddies, self.legacyName) @@ -148,8 +158,8 @@ class Session(YowsupApp): while self.groupOfflineQueue[room]: msg = self.groupOfflineQueue[room].pop(0) self.backend.handleMessage(self.user, room, msg[1], - msg[0], u"", msg[2]) - self.logger.debug(u"Send queued group message to: %s %s %s", + msg[0], "", msg[2]) + self.logger.debug("Send queued group message to: %s %s %s", msg[0],msg[1], msg[2]) self.gotGroupList = True for room, nick in self.joinRoomQueue: @@ -161,9 +171,9 @@ class Session(YowsupApp): if not self.gotGroupList: self.joinRoomQueue.append((room, nick)) return - room = room + room = self._lengthenGroupId(room) if room in self.groups: - self.logger.info(u"Joining room: %s room=%s, nick=%s", + self.logger.info("Joining room: %s room=%s, nick=%s", self.legacyName, room, nick) group = self.groups[room] @@ -176,52 +186,52 @@ class Session(YowsupApp): ownerNick = group.subjectOwner group.sendParticipantsToSpectrum(self.legacyName) - self.backend.handleSubject(self.user, room, + self.backend.handleSubject(self.user, self._shortenGroupId(room), group.subject, ownerNick) - self.logger.debug(u"Room subject: room=%s, subject=%s", - room.decode('utf-8'), group.subject.decode('utf-8')) + self.logger.debug("Room subject: room=%s, subject=%s", + room, group.subject) self.backend.handleRoomNicknameChanged( - self.user, room, group.subject + self.user, self._shortenGroupId(room), group.subject ) else: - self.logger.warn(u"Room doesn't exist: %s", room) + self.logger.warn("Room doesn't exist: %s", room) def leaveRoom(self, room): if room in self.groups: - self.logger.info(u"Leaving room: %s room=%s", self.legacyName, room) + self.logger.info("Leaving room: %s room=%s", self.legacyName, room) group = self.groups[room] group.joined = False else: - self.logger.warn(u"Room doesn't exist: %s. Unable to leave.", room) + self.logger.warn("Room doesn't exist: %s. Unable to leave.", room) def _lastSeen(self, number, seconds): - self.logger.debug(u"Last seen %s at %s seconds", number, seconds) + self.logger.debug("Last seen %s at %s seconds" % (number, str(seconds))) if seconds < 60: self.onPresenceAvailable(number) else: self.onPresenceUnavailable(number) def sendReadReceipts(self, buddy): for _id, _from, participant, t in self.recvMsgIDs: - if _from.split(u'@')[0] == buddy: + if _from.split('@')[0] == buddy: self.sendReceipt(_id, _from, 'read', participant, t) self.recvMsgIDs.remove((_id, _from, participant, t)) - self.logger.debug(u"Send read receipt to %s (ID: %s)", _from, _id) + self.logger.debug("Send read receipt to %s (ID: %s)", _from, _id) # Called by superclass def onAuthSuccess(self, status, kind, creation, expiration, props, nonce, t): - self.logger.info(u"Auth success: %s", self.user) + self.logger.info("Auth success: %s", self.user) self.backend.handleConnected(self.user) - self.backend.handleBuddyChanged(self.user, u"bot", self.bot.name, - [u"Admin"], protocol_pb2.STATUS_ONLINE) + self.backend.handleBuddyChanged(self.user, "bot", self.bot.name, + ["Admin"], protocol_pb2.STATUS_ONLINE) # Initialisation? self.requestPrivacyList() self.requestClientConfig() self.requestServerProperties() # ? - self.logger.debug(u'Requesting groups list') + self.logger.debug('Requesting groups list') self.requestGroupsList(self._updateGroups) # self.requestBroadcastList() @@ -232,62 +242,67 @@ class Session(YowsupApp): if self.initialized == False: self.sendOfflineMessages() - #self.bot.call(u"welcome") + #self.bot.call("welcome") self.initialized = True self.loggedIn = True # Called by superclass def onAuthFailed(self, reason): - self.logger.info(u"Auth failed: %s (%s)", self.user, reason) + self.logger.info("Auth failed: %s (%s)", self.user, reason) self.backend.handleDisconnected(self.user, 0, reason) self.password = None self.loggedIn = False # Called by superclass def onDisconnect(self): - self.logger.debug(u'Disconnected') - self.backend.handleDisconnected(self.user, 0, u'Disconnected for unknown reasons') + self.logger.debug('Disconnected') + self.backend.handleDisconnected(self.user, 0, 'Disconnected for unknown reasons') # Called by superclass def onReceipt(self, _id, _from, timestamp, type, participant, offline, items): - self.logger.debug(u"received receipt, sending ack: %s", - [_id, _from, timestamp, type, participant, offline, items] + self.logger.debug("received receipt, sending ack: " + + ' '.join(map(str, [_id, _from, timestamp, + type, participant, offline, items])) ) try: - number = _from.split(u'@')[0] + number = _from.split('@')[0] self.backend.handleMessageAck(self.user, number, self.msgIDs[_id].xmppId) self.msgIDs[_id].cnt = self.msgIDs[_id].cnt + 1 if self.msgIDs[_id].cnt == 2: del self.msgIDs[_id] except KeyError: - self.logger.error(u"Message %s not found. Unable to send ack", _id) + self.logger.error("Message %s not found. Unable to send ack", _id) # Called by superclass def onAck(self, _id, _class, _from, timestamp): - self.logger.debug(u'received ack: %s', [_id, _class, _from, timestamp]) + self.logger.debug('received ack ' + + ' '.join(map(str, [_id, _class, _from,timestamp,])) + ) # Called by superclass def onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body): - self.logger.debug(u'received TextMessage %s', [ - _id, _from, to, notify, timestamp, - participant, offline, retry, body - ]) - buddy = _from.split(u'@')[0] + self.logger.debug('received TextMessage' + + ' '.join(map(str, [ + _id, _from, to, notify, timestamp, + participant, offline, retry, body + ])) + ) + buddy = _from.split('@')[0] messageContent = utils.softToUni(body) self.sendReceipt(_id, _from, None, participant, timestamp) self.recvMsgIDs.append((_id, _from, participant, timestamp)) - self.logger.info(u"Message received from %s to %s: %s (at ts=%s)", + self.logger.info("Message received from %s to %s: %s (at ts=%s)", buddy, self.legacyName, messageContent, timestamp) if participant is not None: # Group message or broadcast - partname = participant.split(u'@')[0] - if _from.split(u'@')[1] == u'broadcast': # Broadcast message + partname = participant.split('@')[0] + if _from.split('@')[1] == 'broadcast': # Broadcast message message = self.broadcast_prefix + messageContent self.sendMessageToXMPP(partname, message, timestamp) else: # Group message if notify is None: - notify = u"" + notify = "" self.sendGroupMessageToXMPP(buddy, partname, messageContent, timestamp, notify) else: @@ -295,14 +310,14 @@ class Session(YowsupApp): # Called by superclass def onImage(self, image): - self.logger.debug(u'Received image message %s', str(image)) - buddy = image._from.split(u'@')[0] + self.logger.debug('Received image message %s', str(image)) + buddy = image._from.split('@')[0] participant = image.participant if image.caption is None: - image.caption = u'' + image.caption = '' if participant is not None: # Group message - partname = participant.split(u'@')[0] - if image._from.split(u'@')[1] == u'broadcast': # Broadcast message + partname = participant.split('@')[0] + if image._from.split('@')[1] == 'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, image.timestamp) self.sendMessageToXMPP(partname, image.url, image.timestamp) self.sendMessageToXMPP(partname, image.caption, image.timestamp) @@ -318,13 +333,13 @@ class Session(YowsupApp): # Called by superclass def onAudio(self, audio): - self.logger.debug(u'Received audio message %s', str(audio)) - buddy = audio._from.split(u'@')[0] + self.logger.debug('Received audio message %s', str(audio)) + buddy = audio._from.split('@')[0] participant = audio.participant message = audio.url if participant is not None: # Group message - partname = participant.split(u'@')[0] - if audio._from.split(u'@')[1] == u'broadcast': # Broadcast message + partname = participant.split('@')[0] + if audio._from.split('@')[1] == 'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, audio.timestamp) self.sendMessageToXMPP(partname, message, audio.timestamp) else: # Group message @@ -337,14 +352,14 @@ class Session(YowsupApp): # Called by superclass def onVideo(self, video): - self.logger.debug(u'Received video message %s', str(video)) - buddy = video._from.split(u'@')[0] + self.logger.debug('Received video message %s', str(video)) + buddy = video._from.split('@')[0] participant = video.participant message = video.url if participant is not None: # Group message - partname = participant.split(u'@')[0] - if video._from.split(u'@')[1] == u'broadcast': # Broadcast message + partname = participant.split('@')[0] + if video._from.split('@')[1] == 'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, video.timestamp) self.sendMessageToXMPP(partname, message, video.timestamp) else: # Group message @@ -356,20 +371,20 @@ class Session(YowsupApp): def onLocation(self, location): - buddy = location._from.split(u'@')[0] + buddy = location._from.split('@')[0] latitude = location.getLatitude() longitude = location.getLongitude() url = location.getLocationURL() participant = location.participant - latlong = u'geo:' + latitude + u',' + longitude + latlong = 'geo:' + latitude + ',' + longitude - self.logger.debug(u"Location received from %s: %s, %s", + self.logger.debug("Location received from %s: %s, %s", buddy, latitude, longitude) if participant is not None: # Group message - partname = participant.split(u'@')[0] - if location._from.split(u'@')[1] == u'broadcast': # Broadcast message + partname = participant.split('@')[0] + if location._from.split('@')[1] == 'broadcast': # Broadcast message self.sendMessageToXMPP(partname, self.broadcast_prefix, location.timestamp) if url is not None: self.sendMessageToXMPP(partname, url, location.timestamp) @@ -389,14 +404,16 @@ class Session(YowsupApp): # Called by superclass def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant): - self.logger.debug(u'received VCard %s', [ + self.logger.debug('received VCard' + + ' '.join(map(str, [ _id, _from, name, card_data, to, notify, timestamp, participant - ]) - message = u"Received VCard (not implemented yet)" - buddy = _from.split(u"@")[0] + ])) + ) + message = "Received VCard (not implemented yet)" + buddy = _from.split("@")[0] if participant is not None: # Group message - partname = participant.split(u'@')[0] - if _from.split(u'@')[1] == u'broadcast': # Broadcast message + partname = participant.split('@')[0] + if _from.split('@')[1] == 'broadcast': # Broadcast message message = self.broadcast_prefix + message self.sendMessageToXMPP(partname, message, timestamp) else: # Group message @@ -411,15 +428,15 @@ class Session(YowsupApp): def transferFile(self, buddy, name, data): # Not working - self.logger.debug(u'transfering file %s', name) + self.logger.debug('transfering file %s', name) self.backend.handleFTStart(self.user, buddy, name, len(data)) self.backend.handleFTData(0, data) self.backend.handleFTFinish(self.user, buddy, name, len(data), 0) # Called by superclass def onContactTyping(self, buddy): - self.logger.info(u"Started typing: %s", buddy) - if buddy != u'bot': + self.logger.info("Started typing: %s", buddy) + if buddy != 'bot': self.sendPresence(True) self.backend.handleBuddyTyping(self.user, buddy) @@ -428,15 +445,15 @@ class Session(YowsupApp): # Called by superclass def onContactPaused(self, buddy): - self.logger.info(u"Paused typing: %s", buddy) - if buddy != u'bot': + self.logger.info("Paused typing: %s", buddy) + if buddy != 'bot': self.backend.handleBuddyTyped(self.user, buddy) self.timer = Timer(3, self.backend.handleBuddyStoppedTyping, (self.user, buddy)).start() # Called by superclass def onAddedToGroup(self, group): - self.logger.debug(u"Added to group: %s", group) + self.logger.debug("Added to group: %s", group) room = group.getGroupId() owner = group.getCreatorJid(full = False) subjectOwner = group.getSubjectOwnerJid(full = False) @@ -444,25 +461,25 @@ class Session(YowsupApp): self.groups[room] = Group(room, owner, subject, subjectOwner, self.backend, self.user) self.groups[room].addParticipants(group.getParticipants, self.buddies, self.legacyName) - self.bot.send(u"You have been added to group: %s@%s (%s)" - % (room, subject, self.backend.spectrum_jid)) + self.bot.send("You have been added to group: %s@%s (%s)" + % (self._shortenGroupId(room), subject, self.backend.spectrum_jid)) # Called by superclass def onParticipantsAddedToGroup(self, group): - self.logger.debug(u"Participants added to group: %s", group) - room = group.getGroupId().split(u'@')[0] + self.logger.debug("Participants added to group: %s", group) + room = group.getGroupId().split('@')[0] self.groups[room].addParticipants(group.getParticipants(), self.buddies, self.legacyName) self.groups[room].sendParticipantsToSpectrum(self.legacyName) # Called by superclass def onSubjectChanged(self, room, subject, subjectOwner, timestamp): self.logger.debug( - u"onSubjectChange(room=%s, subject=%s, subjectOwner=%s, timestamp=%s)", + "onSubjectChange(rrom=%s, subject=%s, subjectOwner=%s, timestamp=%s)", room, subject, subjectOwner, timestamp) try: group = self.groups[room] except KeyError: - self.logger.error(u"Subject of non-existant group (%s) changed", group) + self.logger.error("Subject of non-existant group (%s) changed", group) else: group.subject = subject group.subjectOwner = subjectOwner @@ -474,74 +491,74 @@ class Session(YowsupApp): # Called by superclass def onParticipantsRemovedFromGroup(self, room, participants): - self.logger.debug(u"Participants removed from group: %s, %s", + self.logger.debug("Participants removed from group: %s, %s", room, participants) self.groups[room].removeParticipants(participants) # Called by superclass def onContactStatusChanged(self, number, status): - self.logger.debug(u"%s changed their status to %s", number, status) + self.logger.debug("%s changed their status to %s", number, status) try: buddy = self.buddies[number] buddy.statusMsg = status self.buddies.updateSpectrum(buddy) except KeyError: - self.logger.debug(u"%s not in buddy list", number) + self.logger.debug("%s not in buddy list", number) # Called by superclass def onContactPictureChanged(self, number): - self.logger.debug(u"%s changed their profile picture", number) + self.logger.debug("%s changed their profile picture", number) self.buddies.requestVCard(number) # Called by superclass def onContactAdded(self, number, nick): - self.logger.debug(u"Adding new contact %s (%s)", nick, number) + self.logger.debug("Adding new contact %s (%s)", nick, number) self.updateBuddy(number, nick, []) # Called by superclass def onContactRemoved(self, number): - self.logger.debug(u"Removing contact %s", number) + self.logger.debug("Removing contact %s", number) self.removeBuddy(number) def onContactUpdated(self, oldnumber, newnumber): - self.logger.debug(u"Contact has changed number from %s to %s", + self.logger.debug("Contact has changed number from %s to %s", oldnumber, newnumber) if newnumber in self.buddies: - self.logger.warn(u"Contact %s exists, just updating", newnumber) + self.logger.warn("Contact %s exists, just updating", newnumber) self.buddies.refresh(newnumber) try: buddy = self.buddies[oldnumber] except KeyError: - self.logger.warn(u"Old contact (%s) not found. Adding new contact (%s)", + self.logger.warn("Old contact (%s) not found. Adding new contact (%s)", oldnumber, newnumber) - nick = u"" + nick = "" else: self.removeBuddy(buddy.number) nick = buddy.nick self.updateBuddy(newnumber, nick, []) def onPresenceReceived(self, _type, name, jid, lastseen): - self.logger.info(u"Presence received: %s %s %s %s", _type, name, jid, lastseen) - buddy = jid.split(u"@")[0] + self.logger.info("Presence received: %s %s %s %s", _type, name, jid, lastseen) + buddy = jid.split("@")[0] try: buddy = self.buddies[buddy] except KeyError: # Sometimes whatsapp send our own presence if buddy != self.legacyName: - self.logger.error(u"Buddy not found: %s", buddy) + self.logger.error("Buddy not found: %s", buddy) return if (lastseen == str(buddy.lastseen)) and (_type == buddy.presence): return - if ((lastseen != u"deny") and (lastseen != None) and (lastseen != u"none")): + if ((lastseen != "deny") and (lastseen != None) and (lastseen != "none")): buddy.lastseen = int(lastseen) if (_type == None): buddy.lastseen = time.time() buddy.presence = _type - if _type == u"unavailable": + if _type == "unavailable": self.onPresenceUnavailable(buddy) else: self.onPresenceAvailable(buddy) @@ -549,17 +566,17 @@ class Session(YowsupApp): def onPresenceAvailable(self, buddy): - self.logger.info(u"Is available: %s", buddy) + self.logger.info("Is available: %s", buddy) self.buddies.updateSpectrum(buddy) def onPresenceUnavailable(self, buddy): - self.logger.info(u"Is unavailable: %s", buddy) + self.logger.info("Is unavailable: %s", buddy) self.buddies.updateSpectrum(buddy) # spectrum RequestMethods def sendTypingStarted(self, buddy): - if buddy != u"bot": - self.logger.info(u"Started typing: %s to %s", self.legacyName, buddy) + if buddy != "bot": + self.logger.info("Started typing: %s to %s", self.legacyName, buddy) self.sendTyping(buddy, True) self.sendReadReceipts(buddy) # If he is typing he is present @@ -628,33 +645,33 @@ class Session(YowsupApp): break if number is not None: self.logger.debug("Private message sent from %s to %s", self.legacyName, number) - waId = self.sendTextMessage(number + u'@s.whatsapp.net', message) + waId = self.sendTextMessage(number + '@s.whatsapp.net', message) self.msgIDs[waId] = MsgIDs( ID, waId) else: self.logger.error("Attempted to send private message to non-existent user") self.logger.debug("%s to %s in %s", self.legacyName, nick, room) else: room = sender - if message[0] == u'\\' and message[:1] != u'\\\\': + if message[0] == '\\' and message[:1] != '\\\\': self.logger.debug("Executing command %s in %s", message, room) self.executeCommand(message, room) else: try: - group = self.groups[room] + group = self.groups[self._lengthenGroupId(room)] self.logger.debug("Group Message from %s to %s Groups: %s", group.nick , group , self.groups) self.backend.handleMessage( - self.user, room, message.decode(u'utf-8'), group.nick, xhtml=xhtml + self.user, room, message.decode('utf-8'), group.nick, xhtml=xhtml ) except KeyError: - self.logger.error(u'Group not found: %s', room) + self.logger.error('Group not found: %s', room) if (".jpg" in message.lower()) or (".webp" in message.lower()): - self.sendImage(message, ID, room + u'@g.us') + self.sendImage(message, ID, room + '@g.us') elif "geo:" in message.lower(): self._sendLocation(room + "@g.us", message, ID) else: - self.sendTextMessage(room + u'@g.us', message) + self.sendTextMessage(room + '@g.us', message) else: # private msg buddy = sender # if message == "\\lastseen": @@ -675,14 +692,14 @@ class Session(YowsupApp): elif "geo:" in message.lower(): self._sendLocation(buddy + "@s.whatsapp.net", message, ID) else: - waId = self.sendTextMessage(sender + u'@s.whatsapp.net', message) + waId = self.sendTextMessage(sender + '@s.whatsapp.net', message) self.msgIDs[waId] = MsgIDs( ID, waId) self.logger.info("WA Message send to %s with ID %s", buddy, waId) - #self.sendTextMessage(sender + u'@s.whatsapp.net', message) + #self.sendTextMessage(sender + '@s.whatsapp.net', message) def executeCommand(self, command, room): - if command == u'\\leave': + if command == '\\leave': self.logger.debug("Leaving room %s", room) # Leave group on whatsapp side self.leaveGroup(room) @@ -703,9 +720,9 @@ class Session(YowsupApp): self.requestLastSeen(buddy, onSuccess, onError) def _sendLocation(self, buddy, message, ID): - #with open(u'/opt/transwhat/map.jpg', 'rb') as imageFile: + #with open('/opt/transwhat/map.jpg', 'rb') as imageFile: # raw = base64.b64encode(imageFile.read()) - latitude,longitude = message.split(u':')[1].split(',') + latitude,longitude = message.split(':')[1].split(',') waId = self.sendLocation(buddy, float(latitude), float(longitude)) self.msgIDs[waId] = MsgIDs( ID, waId) self.logger.info("WA Location Message send to %s with ID %s", buddy, waId) @@ -764,7 +781,7 @@ class Session(YowsupApp): self.bot.send("%s: %s" % (nick, messageContent)) except KeyError: self.logger.warn("Group is not in group list") - self.backend.handleMessage(self.user, room, + self.backend.handleMessage(self.user, self._shortenGroupId(room), messageContent, number, "", timestamp) @@ -782,7 +799,7 @@ class Session(YowsupApp): def changeStatusMessage(self, statusMessage): if (statusMessage != self.statusMessage) or (self.initialized == False): self.statusMessage = statusMessage - self.setStatus(statusMessage.encode(u'utf-8')) + self.setStatus(statusMessage.encode('utf-8')) self.logger.info("Status message changed: %s", statusMessage) #if self.initialized == False: @@ -816,7 +833,7 @@ class Session(YowsupApp): def createThumb(self, size=100, raw=False): img = Image.open(self.imgPath) width, height = img.size - img_thumbnail = self.imgPath + u'_thumbnail' + img_thumbnail = self.imgPath + '_thumbnail' if width > height: nheight = float(height) / width * size @@ -826,7 +843,7 @@ class Session(YowsupApp): nheight = size img.thumbnail((nwidth, nheight), Image.ANTIALIAS) - img.save(img_thumbnail, u'JPEG') + img.save(img_thumbnail, 'JPEG') with open(img_thumbnail, 'rb') as imageFile: raw = base64.b64encode(imageFile.read()) @@ -835,38 +852,38 @@ class Session(YowsupApp): # Not used def onLocationReceived(self, messageId, jid, name, preview, latitude, longitude, receiptRequested, isBroadcast): - buddy = jid.split(u"@")[0] - self.logger.info(u"Location received from %s: %s, %s", buddy, latitude, longitude) + buddy = jid.split("@")[0] + self.logger.info("Location received from %s: %s, %s", buddy, latitude, longitude) - url = u"http://maps.google.de?%s" % urllib.urlencode({ u"q": u"%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(u"message_ack", (jid, messageId)) + if receiptRequested: self.call("message_ack", (jid, messageId)) def onGroupSubjectReceived(self, messageId, gjid, jid, subject, timestamp, receiptRequested): - room = gjid.split(u"@")[0] - buddy = jid.split(u"@")[0] + room = gjid.split("@")[0] + buddy = jid.split("@")[0] self.backend.handleSubject(self.user, room, subject, buddy) - if receiptRequested: self.call(u"subject_ack", (gjid, messageId)) + if receiptRequested: self.call("subject_ack", (gjid, messageId)) # Yowsup Notifications def onGroupParticipantRemoved(self, gjid, jid, author, timestamp, messageId, receiptRequested): - room = gjid.split(u"@")[0] - buddy = jid.split(u"@")[0] + room = gjid.split("@")[0] + buddy = jid.split("@")[0] - self.logger.info(u"Removed %s from room %s", buddy, room) + self.logger.info("Removed %s from room %s", buddy, room) self.backend.handleParticipantChanged(self.user, buddy, room, protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_NONE) # TODO - if receiptRequested: self.call(u"notification_ack", (gjid, messageId)) + if receiptRequested: self.call("notification_ack", (gjid, messageId)) def onContactProfilePictureUpdated(self, jid, timestamp, messageId, pictureId, receiptRequested): # TODO - if receiptRequested: self.call(u"notification_ack", (jid, messageId)) + if receiptRequested: self.call("notification_ack", (jid, messageId)) def onGroupPictureUpdated(self, jid, author, timestamp, messageId, pictureId, receiptRequested): # TODO - if receiptRequested: self.call(u"notification_ack", (jid, messageId)) + if receiptRequested: self.call("notification_ack", (jid, messageId)) diff --git a/utils.py b/utils.py index 930733f..a55546b 100644 --- a/utils.py +++ b/utils.py @@ -43,10 +43,8 @@ def ago(secs): return "%d %s ago" % (diff, period) def softToUni(message): - # Deprecated - # message = message.decode("utf-8") - # return e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE) - return message + message = message.decode("utf-8") + return e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE) def decodePassword(password): return base64.b64decode(bytes(password.encode("utf-8")))