From 26dc1dbf0496a83fe7604818ff39f3ed41a5533f Mon Sep 17 00:00:00 2001 From: DaZZZl Date: Wed, 6 Apr 2016 01:45:18 +0200 Subject: [PATCH 01/38] fix unicode problems first try to download encrypted images --- session.py | 32 ++++++++++++++++++++++---------- yowsupwrapper.py | 4 ++-- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/session.py b/session.py index 32caedc..21ac080 100644 --- a/session.py +++ b/session.py @@ -283,14 +283,16 @@ class Session(YowsupApp): # 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 - ])) - ) + self.logger.debug('received TextMessage') + #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) + messageContent = body #utils.softToUni(body) + self.logger.debug('received TextMessage 2') 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)", @@ -315,17 +317,27 @@ class Session(YowsupApp): participant = image.participant if image.caption is None: image.caption = '' + if image.isEncrypted(): + self.logger.debug('Received encrypted image message') + ipath = "uploads/" + str(image.timestamp) + image.getExtension() + self.logger.debug('Received encrypted image message22') + + with open("/srv/www/htdocs/" + ipath,"wb") as f: + f.write(image.getMediaContent()) + url = "http://www/" + ipath + else: + url = image.url if participant is not None: # Group 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, url, image.timestamp) self.sendMessageToXMPP(partname, image.caption, image.timestamp) else: # Group message - self.sendGroupMessageToXMPP(buddy, partname, image.url, image.timestamp) + self.sendGroupMessageToXMPP(buddy, partname, url, image.timestamp) self.sendGroupMessageToXMPP(buddy, partname, image.caption, image.timestamp) else: - self.sendMessageToXMPP(buddy, image.url, image.timestamp) + self.sendMessageToXMPP(buddy, 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)) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 0ac9a38..2649220 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -174,9 +174,9 @@ class YowsupApp(object): if resultRequestUploadIqProtocolEntity.isDuplicate(): doSendFn(filePath, resultRequestUploadIqProtocolEntity.getUrl(), jid, - resultRequestUploadIqProtocolEntity.getIp(), caption) + resultRequestUploadIqProtocolEntity.getIp(), caption, onSuccess, onFailure) else: - successFn = lambda filePath, jid, url: doSendFn(filePath, url, jid, resultRequestUploadIqProtocolEntity.getIp(), caption, onSuccess, onFailure) + successFn = lambda filePath, jid, url: doSendFn(filePath, url.encode('ascii','ignore'), jid, resultRequestUploadIqProtocolEntity.getIp(), caption, onSuccess, onFailure) ownNumber = self.stack.getLayerInterface(YowAuthenticationProtocolLayer).getUsername(full=False) mediaUploader = MediaUploader(jid, ownNumber, filePath, resultRequestUploadIqProtocolEntity.getUrl(), From c66d4927070b69e98b96c2cef9256ae4e62fd32e Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 6 Apr 2016 14:55:59 +0200 Subject: [PATCH 02/38] 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 03/38] 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 22725c042f2f2a90325f82ce83d6df16cd072347 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 6 Apr 2016 22:02:40 +0200 Subject: [PATCH 04/38] lots of whitespace cleanups --- Spectrum2/backend.py | 28 +++++---- bot.py | 2 +- session.py | 132 ++++++++++++++++++------------------------- whatsappbackend.py | 2 +- yowsupwrapper.py | 85 ++++++++++++++-------------- 5 files changed, 113 insertions(+), 136 deletions(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index 6d5f70f..6bd8970 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -277,13 +277,11 @@ class SpectrumBackend: self.handleMessageSendRequest(payload.userName, payload.buddyName, payload.message, payload.xhtml, payload.id) def handleConvMessageAckPayload(self, data): - payload = protocol_pb2.ConversationMessage() - if (payload.ParseFromString(data) == False): - #TODO: ERROR - return - self.handleMessageAckRequest(payload.userName, payload.buddyName, payload.id) - - + payload = protocol_pb2.ConversationMessage() + if (payload.ParseFromString(data) == False): + #TODO: ERROR + return + self.handleMessageAckRequest(payload.userName, payload.buddyName, payload.id) def handleAttentionPayload(self, data): payload = protocol_pb2.ConversationMessage() @@ -452,7 +450,7 @@ class SpectrumBackend: elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_EXIT: self.handleExitRequest() elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_CONV_MESSAGE_ACK: - self.handleConvMessageAckPayload(wrapper.payload) + self.handleConvMessageAckPayload(wrapper.payload) elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_RAW_XML: self.handleRawXmlRequest(wrapper.payload) elif wrapper.type == protocol_pb2.WrapperMessage.TYPE_BUDDIES: @@ -543,14 +541,14 @@ class SpectrumBackend: raise NotImplementedError, "Implement me" def handleMessageAckRequest(self, user, legacyName, ID = 0): - """ - Called when XMPP user sends message to legacy network. - @param user: XMPP JID of user for which this event occurs. - @param legacyName: Legacy network name of buddy or room. - @param ID: message ID - """ + """ + Called when XMPP user sends message to legacy network. + @param user: XMPP JID of user for which this event occurs. + @param legacyName: Legacy network name of buddy or room. + @param ID: message ID + """ - # raise NotImplementedError, "Implement me" + # raise NotImplementedError, "Implement me" pass diff --git a/bot.py b/bot.py index 2555fcb..8e41934 100644 --- a/bot.py +++ b/bot.py @@ -37,7 +37,7 @@ class Bot(): self.commands = { "help": self._help, "prune": self._prune, - "groups": self._groups, + "groups": self._groups, "getgroups": self._getgroups } diff --git a/session.py b/session.py index 32caedc..e4e8c32 100644 --- a/session.py +++ b/session.py @@ -45,13 +45,10 @@ from yowsupwrapper import YowsupApp class MsgIDs: - def __init__(self, xmppId, waId): - self.xmppId = xmppId - self.waId = waId - self.cnt = 0 - - - + def __init__(self, xmppId, waId): + self.xmppId = xmppId + self.waId = waId + self.cnt = 0 class Session(YowsupApp): broadcast_prefix = u'\U0001F4E2 ' @@ -335,7 +332,7 @@ class Session(YowsupApp): def onAudio(self, audio): self.logger.debug('Received audio message %s', str(audio)) buddy = audio._from.split('@')[0] - participant = audio.participant + participant = audio.participant message = audio.url if participant is not None: # Group message partname = participant.split('@')[0] @@ -354,7 +351,7 @@ class Session(YowsupApp): def onVideo(self, video): self.logger.debug('Received video message %s', str(video)) buddy = video._from.split('@')[0] - participant = video.participant + participant = video.participant message = video.url if participant is not None: # Group message @@ -375,12 +372,10 @@ class Session(YowsupApp): latitude = location.getLatitude() longitude = location.getLongitude() url = location.getLocationURL() - participant = location.participant + participant = location.participant latlong = 'geo:' + latitude + ',' + longitude - self.logger.debug("Location received from %s: %s, %s", - buddy, latitude, longitude) - + self.logger.debug("Location received from %s: %s, %s", buddy, latitude, longitude) if participant is not None: # Group message partname = participant.split('@')[0] @@ -563,8 +558,6 @@ class Session(YowsupApp): else: self.onPresenceAvailable(buddy) - - def onPresenceAvailable(self, buddy): self.logger.info("Is available: %s", buddy) self.buddies.updateSpectrum(buddy) @@ -674,60 +667,46 @@ class Session(YowsupApp): self.sendTextMessage(room + '@g.us', message) else: # private msg buddy = sender -# if message == "\\lastseen": -# self.call("presence_request", buddy = (buddy + "@s.whatsapp.net",)) -# else: if message.split(" ").pop(0) == "\\lastseen": - self.presenceRequested.append(buddy) - #self.call("presence_request", (buddy + "@s.whatsapp.net",)) - self._requestLastSeen(buddy) - elif message.split(" ").pop(0) == "\\gpp": - self.logger.info("Get Profile Picture! ") - self.sendMessageToXMPP(buddy, "Fetching Profile Picture") - #self.call("contact_getProfilePicture", (buddy + "@s.whatsapp.net",)) - self.requestVCard(buddy) - else: - if (".jpg" in message.lower()) or (".webp" in message.lower()): - self.sendImage(message, ID, buddy + "@s.whatsapp.net") - elif "geo:" in message.lower(): - self._sendLocation(buddy + "@s.whatsapp.net", message, ID) - else: - waId = self.sendTextMessage(sender + '@s.whatsapp.net', message) - self.msgIDs[waId] = MsgIDs( ID, waId) + self.presenceRequested.append(buddy) + self._requestLastSeen(buddy) + elif message.split(" ").pop(0) == "\\gpp": + self.sendMessageToXMPP(buddy, "Fetching Profile Picture") + self.requestVCard(buddy) + elif (".jpg" in message.lower()) or (".webp" in message.lower()): + self.sendImage(message, ID, buddy + "@s.whatsapp.net") + elif "geo:" in message.lower(): + self._sendLocation(buddy + "@s.whatsapp.net", message, ID) + else: + 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 + '@s.whatsapp.net', message) + self.logger.info("WA Message send to %s with ID %s", buddy, waId) def executeCommand(self, command, room): if command == '\\leave': self.logger.debug("Leaving room %s", room) - # Leave group on whatsapp side - self.leaveGroup(room) - # Delete Room on spectrum side + self.leaveGroup(room) # Leave group on whatsapp side group = self.groups[room] - group.leaveRoom() + group.leaveRoom() # Delete Room on spectrum side del self.groups[room] def _requestLastSeen(self, buddy): - - def onSuccess(buddy, lastseen): + def onSuccess(buddy, lastseen): timestamp = time.localtime(time.localtime()-lastseen) - timestring = time.strftime("%a, %d %b %Y %H:%M:%S", timestamp) - self.sendMessageToXMPP(buddy, "%s (%s) %s" % (timestring, utils.ago(lastseen),str(lastseen))) - def onError(errorIqEntity, originalIqEntity): - self.sendMessageToXMPP(errorIqEntity.getFrom(), "LastSeen Error") + timestring = time.strftime("%a, %d %b %Y %H:%M:%S", timestamp) + self.sendMessageToXMPP(buddy, "%s (%s) %s" % (timestring, utils.ago(lastseen),str(lastseen))) + + def onError(errorIqEntity, originalIqEntity): + self.sendMessageToXMPP(errorIqEntity.getFrom(), "LastSeen Error") self.requestLastSeen(buddy, onSuccess, onError) def _sendLocation(self, buddy, message, ID): - #with open('/opt/transwhat/map.jpg', 'rb') as imageFile: - # raw = base64.b64encode(imageFile.read()) - 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) - - + 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) def sendMessageToXMPP(self, buddy, messageContent, timestamp = "", nickname = ""): if timestamp: @@ -831,24 +810,24 @@ class Session(YowsupApp): self.buddies.requestVCard(buddy, ID) def createThumb(self, size=100, raw=False): - img = Image.open(self.imgPath) - width, height = img.size - img_thumbnail = self.imgPath + '_thumbnail' + img = Image.open(self.imgPath) + width, height = img.size + img_thumbnail = self.imgPath + '_thumbnail' - if width > height: - nheight = float(height) / width * size - nwidth = size - else: - nwidth = float(width) / height * size - nheight = size + if width > height: + nheight = float(height) / width * size + nwidth = size + else: + nwidth = float(width) / height * size + nheight = size - img.thumbnail((nwidth, nheight), Image.ANTIALIAS) - img.save(img_thumbnail, 'JPEG') + img.thumbnail((nwidth, nheight), Image.ANTIALIAS) + img.save(img_thumbnail, 'JPEG') - with open(img_thumbnail, 'rb') as imageFile: - raw = base64.b64encode(imageFile.read()) + with open(img_thumbnail, 'rb') as imageFile: + raw = base64.b64encode(imageFile.read()) - return raw + return raw # Not used def onLocationReceived(self, messageId, jid, name, preview, latitude, longitude, receiptRequested, isBroadcast): @@ -857,15 +836,16 @@ class Session(YowsupApp): 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)) - + if receiptRequested: + self.call("message_ack", (jid, messageId)) def onGroupSubjectReceived(self, messageId, gjid, jid, subject, timestamp, receiptRequested): room = gjid.split("@")[0] buddy = jid.split("@")[0] self.backend.handleSubject(self.user, room, subject, buddy) - if receiptRequested: self.call("subject_ack", (gjid, messageId)) + if receiptRequested: + self.call("subject_ack", (gjid, messageId)) # Yowsup Notifications def onGroupParticipantRemoved(self, gjid, jid, author, timestamp, messageId, receiptRequested): @@ -875,15 +855,15 @@ class Session(YowsupApp): 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("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("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("notification_ack", (jid, messageId)) diff --git a/whatsappbackend.py b/whatsappbackend.py index 691dc73..c59d4cb 100644 --- a/whatsappbackend.py +++ b/whatsappbackend.py @@ -160,7 +160,7 @@ class WhatsAppBackend(SpectrumBackend): pass def handleMessageAckRequest(self, user, legacyName, ID = 0): - self.logger.info("Meassage ACK request for %s !!",legacyName) + self.logger.info("Meassage ACK request for %s !!",legacyName) def sendData(self, data): self.io.sendData(data) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 2156c20..f6fc7fd 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -185,64 +185,63 @@ class YowsupApp(object): def sendLocation(self, to, latitude, longitude): messageEntity = LocationMediaMessageProtocolEntity(latitude,longitude, None, None, "raw", to = to) self.sendEntity(messageEntity) - return messageEntity.getId() + + return messageEntity.getId() def sendImage(self, jid, path, caption = None, onSuccess = None, onFailure = None): entity = RequestUploadIqProtocolEntity(RequestUploadIqProtocolEntity.MEDIA_TYPE_IMAGE, filePath=path) successFn = lambda successEntity, originalEntity: self.onRequestUploadResult(jid, path, successEntity, originalEntity, caption, onSuccess, onFailure) - errorFn = lambda errorEntity, originalEntity: self.onRequestUploadError(jid, path, errorEntity, originalEntity) + errorFn = lambda errorEntity, originalEntity: self.onRequestUploadError(jid, path, errorEntity, originalEntity) - self.sendIq(entity, successFn, errorFn) + self.sendIq(entity, successFn, errorFn) def onRequestUploadResult(self, jid, filePath, resultRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity, caption = None, onSuccess=None, onFailure=None): + if requestUploadIqProtocolEntity.mediaType == RequestUploadIqProtocolEntity.MEDIA_TYPE_AUDIO: + doSendFn = self.doSendAudio + else: + doSendFn = self.doSendImage - if requestUploadIqProtocolEntity.mediaType == RequestUploadIqProtocolEntity.MEDIA_TYPE_AUDIO: - doSendFn = self.doSendAudio - else: - doSendFn = self.doSendImage + if resultRequestUploadIqProtocolEntity.isDuplicate(): + doSendFn(filePath, resultRequestUploadIqProtocolEntity.getUrl(), jid, + resultRequestUploadIqProtocolEntity.getIp(), caption) + else: + successFn = lambda filePath, jid, url: doSendFn(filePath, url, jid, resultRequestUploadIqProtocolEntity.getIp(), caption, onSuccess, onFailure) - if resultRequestUploadIqProtocolEntity.isDuplicate(): - doSendFn(filePath, resultRequestUploadIqProtocolEntity.getUrl(), jid, - resultRequestUploadIqProtocolEntity.getIp(), caption) - else: - successFn = lambda filePath, jid, url: doSendFn(filePath, url, jid, resultRequestUploadIqProtocolEntity.getIp(), caption, onSuccess, onFailure) - ownNumber = self.stack.getLayerInterface(YowAuthenticationProtocolLayer).getUsername(full=False) - mediaUploader = MediaUploader(jid, ownNumber, filePath, - resultRequestUploadIqProtocolEntity.getUrl(), - resultRequestUploadIqProtocolEntity.getResumeOffset(), - successFn, self.onUploadError, self.onUploadProgress, async=False) - mediaUploader.start() + ownNumber = self.stack.getLayerInterface(YowAuthenticationProtocolLayer).getUsername(full=False) - def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity): - self.logger.error("Request upload for file %s for %s failed" % (path, jid)) + mediaUploader = MediaUploader(jid, ownNumber, filePath, + resultRequestUploadIqProtocolEntity.getUrl(), + resultRequestUploadIqProtocolEntity.getResumeOffset(), + successFn, self.onUploadError, self.onUploadProgress, async=False) - def onUploadError(self, filePath, jid, url): - #logger.error("Upload file %s to %s for %s failed!" % (filePath, url, jid)) - self.logger.error("Upload Error!") + mediaUploader.start() - def onUploadProgress(self, filePath, jid, url, progress): - #sys.stdout.write("%s => %s, %d%% \r" % (os.path.basename(filePath), jid, progress)) - #sys.stdout.flush() - pass + def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity): + self.logger.error("Request upload for file %s for %s failed" % (path, jid)) - def doSendImage(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): - entity = ImageDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to, caption = caption) - self.sendEntity(entity) + def onUploadError(self, filePath, jid, url): + self.logger.error("Upload file %s to %s for %s failed!" % (filePath, url, jid)) + + def onUploadProgress(self, filePath, jid, url, progress): + #sys.stdout.write("%s => %s, %d%% \r" % (os.path.basename(filePath), jid, progress)) + #sys.stdout.flush() + pass + + def doSendImage(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): + entity = ImageDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to, caption = caption) + self.sendEntity(entity) #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) - if onSuccess is not None: - onSuccess(entity.getId()) - return entity.getId() - - - def doSendAudio(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): - entity = AudioDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to) - self.sendEntity(entity) - #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) - if onSuccess is not None: - onSuccess(entity.getId()) - return entity.getId() - + if onSuccess is not None: + onSuccess(entity.getId()) + return entity.getId() + def doSendAudio(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): + entity = AudioDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to) + self.sendEntity(entity) + #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) + if onSuccess is not None: + onSuccess(entity.getId()) + return entity.getId() def sendPresence(self, available): """ From d9bd18013d1f5e7e316d33e9f761c706beb8a7aa Mon Sep 17 00:00:00 2001 From: moyamo Date: Sat, 9 Apr 2016 22:07:26 +0200 Subject: [PATCH 05/38] 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 06/38] 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 07/38] 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 08/38] 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 f25046de2dbdbd88adb016d06e1145043dff3552 Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Sun, 10 Apr 2016 00:21:58 +0200 Subject: [PATCH 09/38] fix encoding issues --- Spectrum2/backend.py | 3 + Spectrum2/iochannel.py | 3 + buddy.py | 30 +++---- deferred.py | 2 + group.py | 4 + registersession.py | 8 +- session.py | 200 ++++++++++++++++++++--------------------- transwhat.py | 21 ++--- utils.py | 8 +- whatsappbackend.py | 45 ++++++---- yowsupwrapper.py | 13 +-- 11 files changed, 180 insertions(+), 157 deletions(-) mode change 100755 => 100644 transwhat.py diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index 6d5f70f..ca4ea24 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import protocol_pb2 import socket import struct diff --git a/Spectrum2/iochannel.py b/Spectrum2/iochannel.py index 858fc2a..03c7089 100644 --- a/Spectrum2/iochannel.py +++ b/Spectrum2/iochannel.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import asyncore, socket import logging import sys diff --git a/buddy.py b/buddy.py index 62a216b..5fc8d39 100644 --- a/buddy.py +++ b/buddy.py @@ -65,7 +65,7 @@ class BuddyList(dict): for buddy in buddies: number = buddy.buddyName nick = buddy.alias - statusMsg = buddy.statusMessage.decode('utf-8') + statusMsg = buddy.statusMessage groups = [g for g in buddy.group] image_hash = buddy.iconHash self[number] = Buddy(self.owner, number, nick, statusMsg, @@ -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] @@ -90,21 +90,21 @@ class BuddyList(dict): for number in existing: self.session.subscribePresence(number) - self.logger.debug("%s is requesting statuses of: %s", self.user, existing) + self.logger.debug("%s is requesting statuses of: %s" % (self.user, existing)) self.session.requestStatuses(existing, success = self.onStatus) - self.logger.debug("Removing nonexisting buddies %s", nonexisting) + self.logger.debug("Removing nonexisting buddies %s" % nonexisting) for number in nonexisting: self.remove(number) del self[number] - self.logger.debug("Removing invalid buddies %s", invalid) + self.logger.debug("Removing invalid buddies %s" % invalid) for number in invalid: self.remove(number) del self[number] def onStatus(self, contacts): - self.logger.debug("%s received statuses of: %s", self.user, contacts) + self.logger.debug("%s received statuses of: %s" % (self.user, contacts)) for number, (status, time) in contacts.iteritems(): buddy = self[number] if status is None: @@ -127,7 +127,7 @@ class BuddyList(dict): else: buddy = Buddy(self.owner, number, nick, "", groups, image_hash) self[number] = buddy - self.logger.debug("Roster add: %s", buddy) + self.logger.debug("Roster add: %s" % buddy) self.session.sendSync([number], delta = True, interactive = True) self.session.subscribePresence(number) self.session.requestStatuses([number], success = self.onStatus) @@ -151,9 +151,9 @@ class BuddyList(dict): iconHash = buddy.image_hash if buddy.image_hash is not None else "" - self.logger.debug("Updating buddy %s (%s) in %s, image_hash = %s", - buddy.nick, buddy.number, buddy.groups, iconHash) - self.logger.debug("Status Message: %s", statusmsg) + self.logger.debug("Updating buddy %s (%s) in %s, image_hash = %s" % + (buddy.nick, buddy.number, buddy.groups, iconHash)) + self.logger.debug("Status Message: %s" % statusmsg) self.backend.handleBuddyChanged(self.user, buddy.number, buddy.nick, buddy.groups, status, statusMessage=statusmsg, iconHash=iconHash) @@ -190,7 +190,7 @@ class BuddyList(dict): buddynr = self.session.legacyName # Get profile picture - self.logger.debug('Requesting profile picture of %s', buddynr) + self.logger.debug('Requesting profile picture of %s' % buddynr) response = deferred.Deferred() # Error probably means image doesn't exist error = deferred.Deferred() @@ -201,12 +201,12 @@ class BuddyList(dict): pictureData = response.pictureData() # Send VCard if ID != None: - call(self.logger.debug, 'Sending VCard (%s) with image id %s: %s', - ID, response.pictureId(), pictureData.then(base64.b64encode)) + call(self.logger.debug, 'Sending VCard (%s) with image id %s: %s' % + (ID, response.pictureId(), pictureData.then(base64.b64encode))) call(self.backend.handleVCard, self.user, ID, buddy, "", "", pictureData) # If error - error.when(self.logger.debug, 'Sending VCard (%s) without image', ID) + error.when(self.logger.debug, 'Sending VCard (%s) without image' % ID) error.when(self.backend.handleVCard, self.user, ID, buddy, "", "", "") # Send image hash @@ -219,7 +219,7 @@ class BuddyList(dict): nick = "" groups = [] image_hash = pictureData.then(utils.sha1hash) - call(self.logger.debug, 'Image hash is %s', image_hash) + call(self.logger.debug, 'Image hash is %s' % image_hash) call(self.update, buddynr, nick, groups, image_hash) # No image error.when(self.logger.debug, 'No image') diff --git a/deferred.py b/deferred.py index e270c5d..27049cd 100644 --- a/deferred.py +++ b/deferred.py @@ -1,3 +1,5 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals from functools import partial class Deferred(object): diff --git a/group.py b/group.py index a571d35..0d255a9 100644 --- a/group.py +++ b/group.py @@ -1,3 +1,7 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" diff --git a/registersession.py b/registersession.py index 2fc63ca..efc7351 100644 --- a/registersession.py +++ b/registersession.py @@ -1,3 +1,5 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals from Spectrum2 import protocol_pb2 from yowsupwrapper import YowsupApp @@ -40,7 +42,7 @@ class RegisterSession(YowsupApp): 'bot', 'Number does not start with provided country code') else: self.backend.handleMessage(self.user, 'bot', 'Requesting sms code') - self.logger.debug('Requesting SMS code for %s', self.user) + self.logger.debug('Requesting SMS code for %s' % self.user) self.countryCode = country_code self._requestSMSCodeNonBlock() elif buddy == 'bot' and self.state == self.WANT_SMS: @@ -51,7 +53,7 @@ class RegisterSession(YowsupApp): self.backend.handleMessage(self.user, 'bot', 'Invalid code. Must be of the form XXX-XXX.') else: - self.logger.warn('Unauthorised user (%s) attempting to send messages', + self.logger.warn('Unauthorised user (%s) attempting to send messages' % self.user) self.backend.handleMessage(self.user, buddy, 'You are not logged in yet. You can only send messages to bot.') @@ -104,7 +106,7 @@ class RegisterSession(YowsupApp): for k, v in result.items(): if v is None: continue - out.append("%s: %s" %(k, v.encode("utf-8") if type(v) is unistr else v)) + out.append("%s: %s" % (k, v)) return "\n".join(out) diff --git a/session.py b/session.py index 32caedc..7998fa3 100644 --- a/session.py +++ b/session.py @@ -54,12 +54,12 @@ class MsgIDs: class Session(YowsupApp): - broadcast_prefix = u'\U0001F4E2 ' + broadcast_prefix = '\U0001F4E2 ' 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("Created: %s" % legacyName) self.backend = backend self.user = user @@ -99,12 +99,12 @@ class Session(YowsupApp): self.logout() def logout(self): - self.logger.info("%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("%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) @@ -126,14 +126,14 @@ class Session(YowsupApp): rooms.append([self._shortenGroupId(room), group.subject]) text.append(self._shortenGroupId(room) + '@' + self.backend.spectrum_jid + ' :' + group.subject) - self.logger.debug("Got rooms: %s", rooms) + self.logger.debug("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 = "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('Received groups list %s', response) + self.logger.debug('Received groups list %s' % response) groups = response.getGroups() for group in groups: room = group.getId() @@ -159,8 +159,8 @@ class Session(YowsupApp): 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]) + 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: self.joinRoom(room, nick) @@ -173,8 +173,8 @@ class Session(YowsupApp): return room = self._lengthenGroupId(room) if room in self.groups: - self.logger.info("Joining room: %s room=%s, nick=%s", - self.legacyName, room, nick) + self.logger.info("Joining room: %s room=%s, nick=%s" % + (self.legacyName, room, nick)) group = self.groups[room] group.joined = True @@ -188,24 +188,24 @@ class Session(YowsupApp): group.sendParticipantsToSpectrum(self.legacyName) self.backend.handleSubject(self.user, self._shortenGroupId(room), group.subject, ownerNick) - self.logger.debug("Room subject: room=%s, subject=%s", - room, group.subject) + self.logger.debug("Room subject: room=%s, subject=%s" % + (room, group.subject)) self.backend.handleRoomNicknameChanged( self.user, self._shortenGroupId(room), group.subject ) else: - self.logger.warn("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("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("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("Last seen %s at %s seconds" % (number, str(seconds))) + self.logger.debug("Last seen %s at %s seconds" % (number, seconds)) if seconds < 60: self.onPresenceAvailable(number) else: @@ -215,16 +215,16 @@ class Session(YowsupApp): if _from.split('@')[0] == buddy: self.sendReceipt(_id, _from, 'read', participant) self.recvMsgIDs.remove((_id, _from, participant)) - self.logger.debug("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("Auth success: %s", self.user) + self.logger.info("Auth success: %s" % self.user) self.backend.handleConnected(self.user) self.backend.handleBuddyChanged(self.user, "bot", self.bot.name, - ["Admin"], protocol_pb2.STATUS_ONLINE) + ["Admin"], protocol_pb2.STATUS_ONLINE) # Initialisation? self.requestPrivacyList() self.requestClientConfig() @@ -249,7 +249,7 @@ class Session(YowsupApp): # Called by superclass def onAuthFailed(self, reason): - self.logger.info("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 @@ -261,9 +261,8 @@ class Session(YowsupApp): # 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("received receipt, sending ack: %s" % + [ _id, _from, timestamp, type, participant, offline, items ] ) try: number = _from.split('@')[0] @@ -272,29 +271,26 @@ class Session(YowsupApp): 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("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('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 - ])) + + self.logger.debug('received TextMessage: %s' % + [_id, _from, to, notify, timestamp, + participant, offline, retry, body] ) buddy = _from.split('@')[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)", - buddy, self.legacyName, messageContent, timestamp) + 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('@')[0] if _from.split('@')[1] == 'broadcast': # Broadcast message @@ -310,7 +306,7 @@ class Session(YowsupApp): # Called by superclass def onImage(self, image): - self.logger.debug('Received image message %s', str(image)) + self.logger.debug('Received image message: %s' % image) buddy = image._from.split('@')[0] participant = image.participant if image.caption is None: @@ -333,7 +329,7 @@ class Session(YowsupApp): # Called by superclass def onAudio(self, audio): - self.logger.debug('Received audio message %s', str(audio)) + self.logger.debug('Received audio message: %s' % audio) buddy = audio._from.split('@')[0] participant = audio.participant message = audio.url @@ -352,7 +348,7 @@ class Session(YowsupApp): # Called by superclass def onVideo(self, video): - self.logger.debug('Received video message %s', str(video)) + self.logger.debug('Received video message: %s' % video) buddy = video._from.split('@')[0] participant = video.participant @@ -378,8 +374,8 @@ class Session(YowsupApp): participant = location.participant latlong = 'geo:' + latitude + ',' + longitude - self.logger.debug("Location received from %s: %s, %s", - buddy, latitude, longitude) + self.logger.debug("Location received from %s: %s, %s" % + (buddy, latitude, longitude)) if participant is not None: # Group message @@ -404,10 +400,8 @@ class Session(YowsupApp): # Called by superclass def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant): - self.logger.debug('received VCard' + - ' '.join(map(str, [ - _id, _from, name, card_data, to, notify, timestamp, participant - ])) + self.logger.debug('received VCard: %s' % + [ _id, _from, name, card_data, to, notify, timestamp, participant ] ) message = "Received VCard (not implemented yet)" buddy = _from.split("@")[0] @@ -428,14 +422,14 @@ class Session(YowsupApp): def transferFile(self, buddy, name, data): # Not working - self.logger.debug('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("Started typing: %s", buddy) + self.logger.info("Started typing: %s" % buddy) if buddy != 'bot': self.sendPresence(True) self.backend.handleBuddyTyping(self.user, buddy) @@ -445,7 +439,7 @@ class Session(YowsupApp): # Called by superclass def onContactPaused(self, buddy): - self.logger.info("Paused typing: %s", buddy) + self.logger.info("Paused typing: %s" % buddy) if buddy != 'bot': self.backend.handleBuddyTyped(self.user, buddy) self.timer = Timer(3, self.backend.handleBuddyStoppedTyping, @@ -453,7 +447,7 @@ class Session(YowsupApp): # Called by superclass def onAddedToGroup(self, group): - self.logger.debug("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) @@ -466,7 +460,7 @@ class Session(YowsupApp): # Called by superclass def onParticipantsAddedToGroup(self, group): - self.logger.debug("Participants added to group: %s", group) + 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) @@ -474,12 +468,13 @@ class Session(YowsupApp): # Called by superclass def onSubjectChanged(self, room, subject, subjectOwner, timestamp): self.logger.debug( - "onSubjectChange(rrom=%s, subject=%s, subjectOwner=%s, timestamp=%s)", - room, subject, subjectOwner, timestamp) + "onSubjectChange(rrom=%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("Subject of non-existant group (%s) changed" % group) else: group.subject = subject group.subjectOwner = subjectOwner @@ -491,46 +486,46 @@ class Session(YowsupApp): # Called by superclass def onParticipantsRemovedFromGroup(self, room, participants): - self.logger.debug("Participants removed from group: %s, %s", - room, participants) + 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("%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("%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("%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("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("Removing contact %s", number) + self.logger.debug("Removing contact %s" % number) self.removeBuddy(number) def onContactUpdated(self, oldnumber, newnumber): - self.logger.debug("Contact has changed number from %s to %s", - oldnumber, newnumber) + self.logger.debug("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("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)", - oldnumber, newnumber) + self.logger.warn("Old contact (%s) not found. Adding new contact (%s)" % + (oldnumber, newnumber)) nick = "" else: self.removeBuddy(buddy.number) @@ -538,17 +533,17 @@ class Session(YowsupApp): self.updateBuddy(newnumber, nick, []) def onPresenceReceived(self, _type, name, jid, lastseen): - self.logger.info("Presence received: %s %s %s %s", _type, name, jid, lastseen) + 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("Buddy not found: %s", buddy) + self.logger.error("Buddy not found: %s" % buddy) return - if (lastseen == str(buddy.lastseen)) and (_type == buddy.presence): + if (lastseen == buddy.lastseen) and (_type == buddy.presence): return if ((lastseen != "deny") and (lastseen != None) and (lastseen != "none")): @@ -566,17 +561,17 @@ class Session(YowsupApp): def onPresenceAvailable(self, buddy): - self.logger.info("Is available: %s", buddy) + self.logger.info("Is available: %s" % buddy) self.buddies.updateSpectrum(buddy) def onPresenceUnavailable(self, buddy): - self.logger.info("Is unavailable: %s", buddy) + self.logger.info("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) + 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 @@ -586,7 +581,7 @@ class Session(YowsupApp): def sendTypingStopped(self, buddy): if buddy != "bot": - self.logger.info("Stopped typing: %s to %s", self.legacyName, buddy) + self.logger.info("Stopped typing: %s to %s" % (self.legacyName, buddy)) self.sendTyping(buddy, False) self.sendReadReceipts(buddy) @@ -602,7 +597,7 @@ class Session(YowsupApp): # Success path = success.arg(0) - call(self.logger.info, "Success: Image downloaded to %s", path) + call(self.logger.info, "Success: Image downloaded to %s" % path) pathWithExt = path.then(lambda p: p + "." + imgType) call(os.rename, path, pathWithExt) pathJpg = path.then(lambda p: p + ".jpg") @@ -610,7 +605,7 @@ class Session(YowsupApp): im = call(Image.open, pathWithExt) call(im.save, pathJpg) call(os.remove, pathWithExt) - call(self.logger.info, "Sending image to %s", to) + call(self.logger.info, "Sending image to %s" % to) waId = deferred.Deferred() call(super(Session, self).sendImage, to, pathJpg, onSuccess = waId.run) call(self.setWaId, ID, waId) @@ -626,10 +621,9 @@ class Session(YowsupApp): self.msgIDs[waId] = MsgIDs(XmppId, waId) def sendMessageToWA(self, sender, message, ID, xhtml=""): - self.logger.info("Message sent from %s to %s: %s (xhtml=%s)", - self.legacyName, sender, message, xhtml) + self.logger.info("Message sent from %s to %s: %s (xhtml=%s)" % + (self.legacyName, sender, message, xhtml)) - message = message.encode("utf-8") self.sendReadReceipts(sender) if sender == "bot": @@ -644,27 +638,27 @@ class Session(YowsupApp): number = othernumber break if number is not None: - self.logger.debug("Private message sent from %s to %s", self.legacyName, number) + self.logger.debug("Private message sent from %s to %s" % (self.legacyName, number)) 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) + self.logger.debug("%s to %s in %s" % (self.legacyName, nick, room)) else: room = sender if message[0] == '\\' and message[:1] != '\\\\': - self.logger.debug("Executing command %s in %s", message, room) + self.logger.debug("Executing command %s in %s" % (message, room)) self.executeCommand(message, room) else: try: group = self.groups[self._lengthenGroupId(room)] - self.logger.debug("Group Message from %s to %s Groups: %s", - group.nick , group , self.groups) + 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, group.nick, xhtml=xhtml ) except KeyError: - self.logger.error('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 + '@g.us') @@ -695,12 +689,12 @@ class Session(YowsupApp): 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.logger.info("WA Message send to %s with ID %s" % (buddy, waId)) #self.sendTextMessage(sender + '@s.whatsapp.net', message) def executeCommand(self, command, room): if command == '\\leave': - self.logger.debug("Leaving room %s", room) + self.logger.debug("Leaving room %s" % room) # Leave group on whatsapp side self.leaveGroup(room) # Delete Room on spectrum side @@ -713,7 +707,7 @@ class Session(YowsupApp): def onSuccess(buddy, lastseen): timestamp = time.localtime(time.localtime()-lastseen) timestring = time.strftime("%a, %d %b %Y %H:%M:%S", timestamp) - self.sendMessageToXMPP(buddy, "%s (%s) %s" % (timestring, utils.ago(lastseen),str(lastseen))) + self.sendMessageToXMPP(buddy, "%s (%s) %s" % (timestring, utils.ago(lastseen), lastseen)) def onError(errorIqEntity, originalIqEntity): self.sendMessageToXMPP(errorIqEntity.getFrom(), "LastSeen Error") @@ -725,7 +719,7 @@ class Session(YowsupApp): 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) + self.logger.info("WA Location Message send to %s with ID %s" % (buddy, waId)) @@ -734,22 +728,22 @@ class Session(YowsupApp): timestamp = time.strftime("%Y%m%dT%H%M%S", time.gmtime(timestamp)) if self.initialized == False: - self.logger.debug("Message queued from %s to %s: %s", - buddy, self.legacyName, messageContent) + 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.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, number, messageContent, timestamp = u"", defaultname = u""): + def sendGroupMessageToXMPP(self, room, number, messageContent, timestamp = "", defaultname = ""): 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", - number, room, messageContent) + self.logger.debug("Group message queued from %s to %s: %s" % + (number, room, messageContent)) if room not in self.groupOfflineQueue: self.groupOfflineQueue[room] = [ ] @@ -758,8 +752,8 @@ class Session(YowsupApp): (number, messageContent, timestamp) ) else: - self.logger.debug("Group message sent from %s to %s: %s", - number, room, messageContent) + self.logger.debug("Group message sent from %s to %s: %s" % + (number, room, messageContent)) try: group = self.groups[room] # Update nickname @@ -787,7 +781,7 @@ class Session(YowsupApp): def changeStatus(self, status): if status != self.status: - self.logger.info("Status changed: %s", status) + self.logger.info("Status changed: %s" % status) self.status = status if status == protocol_pb2.STATUS_ONLINE \ @@ -799,8 +793,8 @@ 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.logger.info("Status message changed: %s", statusMessage) + self.setStatus(statusMessage) + self.logger.info("Status message changed: {0}".format(statusMessage)) #if self.initialized == False: # self.sendOfflineMessages() @@ -824,7 +818,7 @@ class Session(YowsupApp): def removeBuddy(self, buddy): if buddy != "bot": - self.logger.info("Buddy removed: %s", buddy) + self.logger.info("Buddy removed: %s" % buddy) self.buddies.remove(buddy) def requestVCard(self, buddy, ID=None): @@ -853,7 +847,7 @@ 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) + self.logger.info("Location received from %s: %s, %s" % (buddy, latitude, longitude)) url = "http://maps.google.de?%s" % urllib.urlencode({ "q": "%s %s" % (latitude, longitude) }) self.sendMessageToXMPP(buddy, utils.shorten(url)) @@ -872,7 +866,7 @@ class Session(YowsupApp): room = gjid.split("@")[0] buddy = jid.split("@")[0] - self.logger.info("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("notification_ack", (gjid, messageId)) diff --git a/transwhat.py b/transwhat.py old mode 100755 new mode 100644 index 4273ca5..4f1fb91 --- a/transwhat.py +++ b/transwhat.py @@ -1,5 +1,9 @@ #!/usr/bin/python +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" @@ -23,6 +27,7 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ + import argparse import traceback import logging @@ -43,25 +48,21 @@ 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) parser.add_argument('config', type=str) -parser.add_argument('-j', type=str, required=True) +parser.add_argument('-j', type=str, metavar="JID", required=True) args, unknown = parser.parse_known_args() YowConstants.PATH_STORAGE='/var/lib/spectrum2/' + args.j - -if args.log is None: - args.log = '/var/log/spectrum2/' + args.j + '/backends/backend.log' - +loggingfile = '/var/log/spectrum2/' + args.j + '/backends/backend.log' # Logging -logging.basicConfig( - filename=args.log, - format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s", - level = logging.DEBUG if args.debug else logging.INFO +logging.basicConfig( \ + filename=loggingfile,\ + 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 a55546b..9a5d2df 100644 --- a/utils.py +++ b/utils.py @@ -1,3 +1,7 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" @@ -25,6 +29,7 @@ import e4u import base64 import hashlib + def ago(secs): periods = ["second", "minute", "hour", "day", "week", "month", "year", "decade"] lengths = [60, 60, 24, 7,4.35, 12, 10] @@ -43,11 +48,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) def decodePassword(password): - return base64.b64decode(bytes(password.encode("utf-8"))) + return base64.b64decode(bytes(password)) def sha1hash(data): return hashlib.sha1(data).hexdigest() diff --git a/whatsappbackend.py b/whatsappbackend.py index 691dc73..924cc1e 100644 --- a/whatsappbackend.py +++ b/whatsappbackend.py @@ -1,3 +1,7 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" @@ -21,6 +25,7 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ + from Spectrum2.backend import SpectrumBackend from Spectrum2 import protocol_pb2 @@ -29,6 +34,7 @@ from registersession import RegisterSession import logging + class WhatsAppBackend(SpectrumBackend): def __init__(self, io, spectrum_jid): SpectrumBackend.__init__(self) @@ -43,7 +49,7 @@ class WhatsAppBackend(SpectrumBackend): # RequestsHandlers def handleLoginRequest(self, user, legacyName, password, extra): - self.logger.debug("handleLoginRequest(user=%s, legacyName=%s)", user, legacyName) + self.logger.debug("handleLoginRequest(user=%s, legacyName=%s)" % (user, legacyName)) # Key word means we should register a new password if password == 'register': if user not in self.sessions: @@ -55,13 +61,14 @@ class WhatsAppBackend(SpectrumBackend): self.sessions[user].login(password) def handleLogoutRequest(self, user, legacyName): - self.logger.debug("handleLogoutRequest(user=%s, legacyName=%s)", user, legacyName) + self.logger.debug("handleLogoutRequest(user=%s, legacyName=%s)" % (user, legacyName)) if user in self.sessions: self.sessions[user].logout() del self.sessions[user] def handleMessageSendRequest(self, user, buddy, message, xhtml="", ID=""): - self.logger.debug("handleMessageSendRequest(user=%s, buddy=%s, message=%s, xhtml=%s, ID=%s)", user, buddy, message, xhtml, ID) + self.logger.debug("handleMessageSendRequest(user=%s, buddy=%s, message=%s, xhtml=%s, ID=%s)" % + ( user, buddy, message, xhtml, ID)) # For some reason spectrum occasionally sends to identical messages to # a buddy, one to the bare jid and one to the /bot resource. This # causes duplicate messages. Thus we should not send consecutive @@ -73,63 +80,63 @@ class WhatsAppBackend(SpectrumBackend): self.lastMsgId[user] = ID def handleJoinRoomRequest(self, user, room, nickname, pasword): - self.logger.debug("handleJoinRoomRequest(user=%s, room=%s, nickname=%s)", user, room, nickname) + self.logger.debug("handleJoinRoomRequest(user=%s, room=%s, nickname=%s)" % (user, room, nickname)) self.sessions[user].joinRoom(room, nickname) def handleLeaveRoomRequest(self, user, room): - self.logger.debug("handleLeaveRoomRequest(user=%s, room=%s)", user, room) + self.logger.debug("handleLeaveRoomRequest(user=%s, room=%s)" % (user, room)) self.sessions[user].leaveRoom(room) def handleStatusChangeRequest(self, user, status, statusMessage): - self.logger.debug("handleStatusChangeRequest(user=%s, status=%d, statusMessage=%s)", user, status, statusMessage) + self.logger.debug("handleStatusChangeRequest(user=%s, status=%d, statusMessage=%s)" % (user, status, statusMessage)) self.sessions[user].changeStatusMessage(statusMessage) self.sessions[user].changeStatus(status) def handleBuddies(self, buddies): """Called when user logs in. Used to initialize roster.""" - self.logger.debug("handleBuddies(buddies=%s)", buddies) + self.logger.debug("handleBuddies(buddies=%s)" % buddies) buddies = [b for b in buddies.buddy] if len(buddies) > 0: user = buddies[0].userName self.sessions[user].loadBuddies(buddies) def handleBuddyUpdatedRequest(self, user, buddy, nick, groups): - self.logger.debug("handleBuddyUpdatedRequest(user=%s, buddy=%s, nick=%s, groups=%s)", user, buddy, nick, str(groups)) + self.logger.debug("handleBuddyUpdatedRequest(user=%s, buddy=%s, nick=%s, groups=%s)" % (user, buddy, nick, groups)) self.sessions[user].updateBuddy(buddy, nick, groups) def handleBuddyRemovedRequest(self, user, buddy, groups): - self.logger.debug("handleBuddyRemovedRequest(user=%s, buddy=%s, groups=%s)", user, buddy, str(groups)) + self.logger.debug("handleBuddyRemovedRequest(user=%s, buddy=%s, groups=%s)" % (user, buddy, groups)) self.sessions[user].removeBuddy(buddy) def handleTypingRequest(self, user, buddy): - self.logger.debug("handleTypingRequest(user=%s, buddy=%s)", user, buddy) + self.logger.debug("handleTypingRequest(user=%s, buddy=%s)" % (user, buddy)) self.sessions[user].sendTypingStarted(buddy) def handleTypedRequest(self, user, buddy): - self.logger.debug("handleTypedRequest(user=%s, buddy=%s)", user, buddy) + self.logger.debug("handleTypedRequest(user=%s, buddy=%s)" % (user, buddy)) self.sessions[user].sendTypingStopped(buddy) def handleStoppedTypingRequest(self, user, buddy): - self.logger.debug("handleStoppedTypingRequest(user=%s, buddy=%s)", user, buddy) + self.logger.debug("handleStoppedTypingRequest(user=%s, buddy=%s)" % (user, buddy)) self.sessions[user].sendTypingStopped(buddy) def handleVCardRequest(self, user, buddy, ID): - self.logger.debug("handleVCardRequest(user=%s, buddy=%s, ID=%s)", user, buddy, ID) + self.logger.debug("handleVCardRequest(user=%s, buddy=%s, ID=%s)" % (user, buddy, ID)) self.sessions[user].requestVCard(buddy, ID) def handleVCardUpdatedRequest(self, user, photo, nickname): - self.logger.debug("handleVCardUpdatedRequest(user=%s, nickname=%s)", user, nickname) + self.logger.debug("handleVCardUpdatedRequest(user=%s, nickname=%s)" % (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) + self.logger.debug("handleBuddyBlockedToggled(user=%s, buddy=%s, blocked=%s)" % (user, buddy, blocked)) def relogin(self, user, legacyName, password, extra): """ Used to re-initialize the session object. Used when finished with registration session and the user needs to login properly """ - self.logger.debug("relogin(user=%s, legacyName=%s)", user, legacyName) + self.logger.debug("relogin(user=%s, legacyName=%s)" % (user, legacyName)) # Change password in spectrum database self.handleQuery('register %s %s %s' % (user, legacyName, password)) # Key word means we should register a new password @@ -144,8 +151,8 @@ class WhatsAppBackend(SpectrumBackend): pass def handleFTStartRequest(self, user, buddy, fileName, size, ftID): - self.logger.debug('File send request %s, for user %s, from %s, size: %s', - fileName, user, buddy, size) + self.logger.debug('File send request %s, for user %s, from %s, size: %s' % + (fileName, user, buddy, size)) def handleFTFinishRequest(self, user, buddy, fileName, size, ftID): pass @@ -160,7 +167,7 @@ class WhatsAppBackend(SpectrumBackend): pass def handleMessageAckRequest(self, user, legacyName, ID = 0): - self.logger.info("Meassage ACK request for %s !!",legacyName) + self.logger.info("Meassage ACK request for %s !!" % legacyName) def sendData(self, data): self.io.sendData(data) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 2156c20..f60a5e7 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import logging from yowsup import env @@ -264,7 +267,7 @@ class YowsupApp(object): - phone_number: (str) The cellphone number of the person to subscribe to """ - self.logger.debug("Subscribing to Presence updates from %s", (phone_number)) + self.logger.debug("Subscribing to Presence updates from %s" % phone_number) jid = phone_number + '@s.whatsapp.net' entity = SubscribePresenceProtocolEntity(jid) self.sendEntity(entity) @@ -394,7 +397,7 @@ class YowsupApp(object): iq = GetStatusesIqProtocolEntity([c + '@s.whatsapp.net' for c in contacts]) def onSuccess(response, request): if success is not None: - self.logger.debug("Received Statuses %s", response) + self.logger.debug("Received Statuses %s" % response) s = {} for k, v in response.statuses.iteritems(): s[k.split('@')[0]] = v @@ -706,7 +709,7 @@ class YowsupApp(object): def sendEntity(self, entity): """Sends an entity down the stack (as if YowsupAppLayer called toLower)""" self.stack.broadcastEvent(YowLayerEvent(YowsupAppLayer.TO_LOWER_EVENT, - entity = entity + entity = bytearray(entity) )) def sendIq(self, iq, onSuccess = None, onError = None): @@ -798,7 +801,7 @@ class YowsupAppLayer(YowInterfaceLayer): """ Sends ack automatically """ - self.logger.debug("Received notification (%s): %s", type(entity), entity) + self.logger.debug("Received notification (%s): %s" % (type(entity), entity)) self.toLower(entity.ack()) if isinstance(entity, CreateGroupsNotificationProtocolEntity): self.caller.onAddedToGroup(entity) @@ -840,7 +843,7 @@ class YowsupAppLayer(YowInterfaceLayer): @ProtocolEntityCallback('message') def onMessageReceived(self, entity): - self.logger.debug("Received Message: %s", entity) + self.logger.debug("Received Message: %s" % entity) if entity.getType() == MessageProtocolEntity.MESSAGE_TYPE_TEXT: self.caller.onTextMessage( entity._id, From c2ea9311fcfd3e4469a497d23608b9d3a18eb2b9 Mon Sep 17 00:00:00 2001 From: git-o-bot Date: Sun, 10 Apr 2016 02:47:53 +0200 Subject: [PATCH 10/38] removed leftover .format() (python3?) --- session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session.py b/session.py index 7998fa3..c0dc01f 100644 --- a/session.py +++ b/session.py @@ -794,7 +794,7 @@ class Session(YowsupApp): if (statusMessage != self.statusMessage) or (self.initialized == False): self.statusMessage = statusMessage self.setStatus(statusMessage) - self.logger.info("Status message changed: {0}".format(statusMessage)) + self.logger.info("Status message changed: %s" % statusMessage) #if self.initialized == False: # self.sendOfflineMessages() From 5f979e37a9c167e0d2186ca3d7551b471f5b0c2e Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Sun, 10 Apr 2016 03:01:22 +0200 Subject: [PATCH 11/38] re-added commit c005c31af that got rolled back --- transwhat.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/transwhat.py b/transwhat.py index 4f1fb91..8186a93 100644 --- a/transwhat.py +++ b/transwhat.py @@ -48,6 +48,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) @@ -57,12 +58,15 @@ parser.add_argument('-j', type=str, metavar="JID", 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 From c5249e407ddb6001ce3af37006fbadbb186c8446 Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Sun, 10 Apr 2016 17:30:11 +0200 Subject: [PATCH 12/38] use unicode literals by default, enforce __str__() to return str(), handle KeyError when removing buddies that are not in buddylist --- buddy.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/buddy.py b/buddy.py index 5fc8d39..babfbde 100644 --- a/buddy.py +++ b/buddy.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" @@ -50,7 +53,8 @@ class Buddy(): self.image_hash = image_hash def __str__(self): - return "%s (nick=%s)" % (self.number, self.nick) + # we must return str here + return str("%s (nick=%s)") % (self.number, self.nick) class BuddyList(dict): @@ -96,12 +100,15 @@ class BuddyList(dict): self.logger.debug("Removing nonexisting buddies %s" % nonexisting) for number in nonexisting: self.remove(number) - del self[number] + try: del self[number] + except KeyError: self.logger.warn("non-existing buddy really didn't exist: %s" % number) self.logger.debug("Removing invalid buddies %s" % invalid) for number in invalid: self.remove(number) - del self[number] + try: del self[number] + except KeyError: self.logger.warn("non-existing buddy really didn't exist: %s" % number) + def onStatus(self, contacts): self.logger.debug("%s received statuses of: %s" % (self.user, contacts)) From 6107e38a69320c77febbfbcc008fb124b558091c Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Sun, 10 Apr 2016 22:48:04 +0200 Subject: [PATCH 13/38] use bytes() not unicode() for buffer --- Spectrum2/iochannel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spectrum2/iochannel.py b/Spectrum2/iochannel.py index 03c7089..9c558d4 100644 --- a/Spectrum2/iochannel.py +++ b/Spectrum2/iochannel.py @@ -15,7 +15,7 @@ class IOChannel(asyncore.dispatcher): self.callback = callback self.closeCallback = closeCallback - self.buffer = "" + self.buffer = bytes("") def sendData(self, data): self.buffer += data From d1a2cc63d9ccb64a50d84d9f9e1f1b7b7ee4a9ae Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Sun, 10 Apr 2016 23:06:01 +0200 Subject: [PATCH 14/38] handle status-message from number not in buddylist --- buddy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buddy.py b/buddy.py index babfbde..c3d4e4c 100644 --- a/buddy.py +++ b/buddy.py @@ -113,7 +113,8 @@ class BuddyList(dict): def onStatus(self, contacts): self.logger.debug("%s received statuses of: %s" % (self.user, contacts)) for number, (status, time) in contacts.iteritems(): - buddy = self[number] + try: buddy = self[number] + except KeyError: self.logger.warn("received status of buddy not in list: %s" % number) if status is None: buddy.statusMsg = "" else: From c8d6d95d9eb583e31c86f4898255273893c7cb72 Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Sun, 10 Apr 2016 23:54:50 +0200 Subject: [PATCH 15/38] use bytes() for data --- Spectrum2/backend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index ca4ea24..23a343e 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -27,7 +27,7 @@ class SpectrumBackend: def __init__(self): self.m_pingReceived = False - self.m_data = "" + self.m_data = bytes("") self.m_init_res = 0 self.logger = logging.getLogger(self.__class__.__name__) @@ -388,7 +388,7 @@ class SpectrumBackend: def handleDataRead(self, data): - self.m_data += data + self.m_data += bytes(data) while len(self.m_data) != 0: expected_size = 0 if (len(self.m_data) >= 4): From d1e67d05556f65a100f61873bc0c69d01093d1c9 Mon Sep 17 00:00:00 2001 From: moyamo Date: Mon, 11 Apr 2016 16:55:12 +0200 Subject: [PATCH 16/38] 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"))) From a398a69eaa2de2f1494981596a001d8f881d3547 Mon Sep 17 00:00:00 2001 From: moyamo Date: Mon, 11 Apr 2016 20:34:24 +0200 Subject: [PATCH 17/38] Add parser for spectrum configuration file --- config.py | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 config.py diff --git a/config.py b/config.py new file mode 100644 index 0000000..09dc7bb --- /dev/null +++ b/config.py @@ -0,0 +1,118 @@ +# I'm guessing this is the format of the spectrum config file in BNF +# ::= * +# ::= * * | +# ::=
| +#
::= [*] +# ::= * = * + + +class SpectrumConfig: + """ + Represents spectrum2 configuration options. + """ + def __init__(self, path_to_config_file): + """ + Initialises configuration file. + + Args: + path_to_config_file: The absolute path to the configuration file. + """ + self.config_path = path_to_config_file + self.options = self.loadConfig(self.config_path) + # Load backend_logging information + self.options.update(self.loadConfig(self['logging.backend_config'])) + + def loadConfig(self, file_name): + section = {'a': ""} # Current section heading, + # It's a dictionary because variables in python closures can't be + # assigned to. + options = dict() + # Recursive descent parser + def consume_spaces(line): + i = 0 + for c in line: + if c != ' ': + break + i += 1 + return line[i:] + + def read_identifier(line): + i = 0 + for c in line: + if c == ' ' or c==']' or c=='[' or c=='=': + break + i += 1 + # no identifier + if i == 0: + return (None, 'No identifier') + return (line[:i], line[i:]) + + def parse_section(line): + if len(line) == 0 or line[0] != '[': + return (None, 'expected [') + line = line[1:] + identifier, line = read_identifier(line) + if len(line) == 0 or line[0] != ']' or identifier is None: + return (None, line) + return (identifier, line[1:]) + + def parse_assignment(line): + key, line = read_identifier(line) + if key is None: + return (None, None, line) + line = consume_spaces(line) + if len(line) == 0 or line[0] != '=': + return (None, None, 'Expected =') + line = consume_spaces(line[1:]) + value = line[:-1] + return (key, value, '\n') + + def expr(line): + sec, newline = parse_section(line) + if sec is not None: + section['a'] = sec + else: + key, value, newline = parse_assignment(line) + if key is not None: + if section['a'] != '': + options[section['a'] + '.' + key] = value + else: + options[key] = value + else: + return (None, newline) + return (newline, None) + + def parse_line(line, line_number): + line = consume_spaces(line) + if line == '\n': + return + newline, error = expr(line) + if newline is None: + raise ConfigParseError(str(line_number) + ': ' + error + ': ' + repr(line)) + newline = consume_spaces(newline) + if newline != '\n': + raise ConfigParseError(str(line_number) + ': Expected newline got ' + repr(newline)) + + def strip_comments(line): + i = 0 + for c in line: + if c == '#' or c == '\n': + break + i += 1 + return line[:i] + '\n' + + with open(file_name, 'r') as f: + i = 1 + while True: + line = f.readline() + if line == '': + break + parse_line(strip_comments(line), i) + i += 1 + return options + + def __getitem__(self, key): + return self.options[key] + +class ConfigParseError(Exception): + pass From 47dd2a0bdfb74ea2f0f673c1234b0e792d67fa8f Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Tue, 12 Apr 2016 14:53:15 +0200 Subject: [PATCH 18/38] some more encoding fixes --- Spectrum2/backend.py | 2 +- buddy.py | 2 +- registersession.py | 2 +- yowsupwrapper.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index 23a343e..36f463b 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -388,7 +388,7 @@ class SpectrumBackend: def handleDataRead(self, data): - self.m_data += bytes(data) + self.m_data += data while len(self.m_data) != 0: expected_size = 0 if (len(self.m_data) >= 4): diff --git a/buddy.py b/buddy.py index c3d4e4c..2537f67 100644 --- a/buddy.py +++ b/buddy.py @@ -39,7 +39,7 @@ class Buddy(): def __init__(self, owner, number, nick, statusMsg, groups, image_hash): self.nick = nick self.owner = owner - self.number = number + self.number = "%s" % number self.groups = groups self.image_hash = image_hash if image_hash is not None else "" self.statusMsg = u"" diff --git a/registersession.py b/registersession.py index efc7351..7a939e2 100644 --- a/registersession.py +++ b/registersession.py @@ -36,7 +36,7 @@ class RegisterSession(YowsupApp): self.backend.handleMessage(self.user, 'bot', 'Country code must be a number') else: # Succeded in decoding country code - country_code = str(country_code) + country_code = "%s" % country_code if country_code != self.number[:len(country_code)]: self.backend.handleMessage(self.user, 'bot', 'Number does not start with provided country code') diff --git a/yowsupwrapper.py b/yowsupwrapper.py index f60a5e7..2f5c162 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -181,7 +181,7 @@ class YowsupApp(object): - to: (xxxxxxxxxx@s.whatsapp.net) who to send the message to - message: (str) the body of the message """ - messageEntity = TextMessageProtocolEntity(message, to = to) + messageEntity = TextMessageProtocolEntity(message.encode('utf-8'), to = to) self.sendEntity(messageEntity) return messageEntity.getId() @@ -566,7 +566,7 @@ class YowsupApp(object): """ pass - def onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body): + def onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body): """ Called when text message is received @@ -709,7 +709,7 @@ class YowsupApp(object): def sendEntity(self, entity): """Sends an entity down the stack (as if YowsupAppLayer called toLower)""" self.stack.broadcastEvent(YowLayerEvent(YowsupAppLayer.TO_LOWER_EVENT, - entity = bytearray(entity) + entity = entity )) def sendIq(self, iq, onSuccess = None, onError = None): From 60480d02eaeec1783377f20f1999e0978ec53874 Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Tue, 12 Apr 2016 17:01:28 +0200 Subject: [PATCH 19/38] always hand bytes() to protobuf --- Spectrum2/backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index 36f463b..2fb678b 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -14,7 +14,7 @@ import resource def WRAP(MESSAGE, TYPE): wrap = protocol_pb2.WrapperMessage() wrap.type = TYPE - wrap.payload = MESSAGE + wrap.payload = bytes(MESSAGE) return wrap.SerializeToString() class SpectrumBackend: From 05740444720bc1175d5a5c7ac59f2f4c1f1a8c6c Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Tue, 12 Apr 2016 17:13:18 +0200 Subject: [PATCH 20/38] more fixes - give protobuf the types it wants --- Spectrum2/backend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index 2fb678b..5f6d7e2 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -70,7 +70,7 @@ class SpectrumBackend: vcard.id = ID vcard.fullname = fullName vcard.nickname = nickname - vcard.photo = photo + vcard.photo = bytes(photo) message = WRAP(vcard.SerializeToString(), protocol_pb2.WrapperMessage.TYPE_VCARD) self.send(message) @@ -223,7 +223,7 @@ class SpectrumBackend: def handleFTData(self, ftID, data): d = protocol_pb2.FileTransferData() d.ftid = ftID - d.data = data + d.data = bytes(data) message = WRAP(d.SerializeToString(), protocol_pb2.WrapperMessage.TYPE_FT_DATA); self.send(message) From 5b7f8c9646d9e4d054f739d62d431d65a5697ec1 Mon Sep 17 00:00:00 2001 From: Daniel Hiepler Date: Tue, 12 Apr 2016 17:24:57 +0200 Subject: [PATCH 21/38] added unicode-literals forward-compatibility module --- bot.py | 3 +++ session.py | 3 +++ threadutils.py | 3 +++ 3 files changed, 9 insertions(+) diff --git a/bot.py b/bot.py index 2555fcb..201e542 100644 --- a/bot.py +++ b/bot.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" diff --git a/session.py b/session.py index c0dc01f..e7a6e8a 100644 --- a/session.py +++ b/session.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + __author__ = "Steffen Vogel" __copyright__ = "Copyright 2015, Steffen Vogel" __license__ = "GPLv3" diff --git a/threadutils.py b/threadutils.py index 59e7d51..cee0929 100644 --- a/threadutils.py +++ b/threadutils.py @@ -1,3 +1,6 @@ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import Queue import threading From 80059a7b910807c5fb5a77203abc3da4a8eb790f Mon Sep 17 00:00:00 2001 From: DaZZZl Date: Tue, 12 Apr 2016 18:21:04 +0200 Subject: [PATCH 22/38] read web storage from config file --- session.py | 14 +++++++++----- transwhat.py | 9 +++++++-- whatsappbackend.py | 3 ++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/session.py b/session.py index 4963ff6..392b265 100644 --- a/session.py +++ b/session.py @@ -318,12 +318,16 @@ class Session(YowsupApp): image.caption = '' if image.isEncrypted(): self.logger.debug('Received encrypted image message') - ipath = "uploads/" + str(image.timestamp) + image.getExtension() - self.logger.debug('Received encrypted image message22') + if self.backend.specConf is not None and self.backend.specConf.__getitem__("service.web_directory") is not None and self.backend.specConf.__getitem__("service.web_url") is not None : + ipath = "/" + str(image.timestamp) + image.getExtension() + + with open(self.backend.specConf.__getitem__("service.web_directory") + ipath,"wb") as f: + f.write(image.getMediaContent()) + url = self.backend.specConf.__getitem__("service.web_url") + ipath + else: + self.logger.warn('Received encrypted image: web storage not set in config!') + url = image.url - with open("/srv/www/htdocs/" + ipath,"wb") as f: - f.write(image.getMediaContent()) - url = "http://www/" + ipath else: url = image.url if participant is not None: # Group message diff --git a/transwhat.py b/transwhat.py index 4273ca5..7612419 100755 --- a/transwhat.py +++ b/transwhat.py @@ -35,7 +35,7 @@ import threadutils sys.path.insert(0, os.getcwd()) from Spectrum2.iochannel import IOChannel - +from config import SpectrumConfig from whatsappbackend import WhatsAppBackend from yowsup.common import YowConstants from yowsup.stacks import YowStack @@ -64,6 +64,11 @@ logging.basicConfig( level = logging.DEBUG if args.debug else logging.INFO ) +if args.config is not None: + specConf = SpectrumConfig(args.config) +else: + specConf = None + # Handler def handleTransportData(data): try: @@ -84,7 +89,7 @@ def connectionClosed(): # Main io = IOChannel(args.host, args.port, handleTransportData, connectionClosed) -plugin = WhatsAppBackend(io, args.j) +plugin = WhatsAppBackend(io, args.j, specConf) plugin.handleBackendConfig({ 'features': [ diff --git a/whatsappbackend.py b/whatsappbackend.py index 93ea1fd..f47bc7d 100644 --- a/whatsappbackend.py +++ b/whatsappbackend.py @@ -30,10 +30,11 @@ from registersession import RegisterSession import logging class WhatsAppBackend(SpectrumBackend): - def __init__(self, io, spectrum_jid): + def __init__(self, io, spectrum_jida, specConf): SpectrumBackend.__init__(self) self.logger = logging.getLogger(self.__class__.__name__) self.io = io + self.specConf = specConf self.sessions = { } self.spectrum_jid = spectrum_jid # Used to prevent duplicate messages From 49fc66444ca773110111daa988e429ff2a8ac26e Mon Sep 17 00:00:00 2001 From: DaZZZl Date: Tue, 12 Apr 2016 18:23:39 +0200 Subject: [PATCH 23/38] fix typo --- whatsappbackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whatsappbackend.py b/whatsappbackend.py index f47bc7d..284459e 100644 --- a/whatsappbackend.py +++ b/whatsappbackend.py @@ -30,7 +30,7 @@ from registersession import RegisterSession import logging class WhatsAppBackend(SpectrumBackend): - def __init__(self, io, spectrum_jida, specConf): + def __init__(self, io, spectrum_jid, specConf): SpectrumBackend.__init__(self) self.logger = logging.getLogger(self.__class__.__name__) self.io = io From 838f2bc71204f35b0350ac1bc2853b3a6965f6ba Mon Sep 17 00:00:00 2001 From: DaZZZl Date: Tue, 12 Apr 2016 19:01:40 +0200 Subject: [PATCH 24/38] fix unicode issues (again) --- session.py | 2 +- utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/session.py b/session.py index 392b265..e45dfe1 100644 --- a/session.py +++ b/session.py @@ -311,7 +311,7 @@ class Session(YowsupApp): # Called by superclass def onImage(self, image): - self.logger.debug('Received image message %s', str(image)) + #self.logger.debug('Received image message %s', str(image)) buddy = image._from.split('@')[0] participant = image.participant if image.caption is None: diff --git a/utils.py b/utils.py index a55546b..18cba0e 100644 --- a/utils.py +++ b/utils.py @@ -43,8 +43,8 @@ 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) + #message = message.decode("utf-8") + return message #e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE) def decodePassword(password): return base64.b64decode(bytes(password.encode("utf-8"))) From f2ccbc003b5187a4f59ffd26e23695b608ab904c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 16 Apr 2016 10:32:47 +0200 Subject: [PATCH 25/38] fixed whitespace --- bot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bot.py b/bot.py index 8e41934..f01caf7 100644 --- a/bot.py +++ b/bot.py @@ -92,9 +92,9 @@ following group commands are available for group in self.session.groups: buddy = self.session.groups[group].owner try: - nick = self.session.buddies[buddy].nick - except KeyError: - nick = buddy + nick = self.session.buddies[buddy].nick + except KeyError: + nick = buddy self.send(self.session.groups[group].id + "@" + self.session.backend.spectrum_jid + " " + self.session.groups[group].subject + " Owner: " + nick ) From 5063966772a7892261479a5e9af1541512eab4a3 Mon Sep 17 00:00:00 2001 From: git-o-bot Date: Tue, 19 Apr 2016 21:10:05 +0200 Subject: [PATCH 26/38] separated axolotol layers, use android env --- yowsupwrapper.py | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 2f5c162..644c28d 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -10,7 +10,7 @@ from yowsup.layers import YowLayerEvent, YowParallelLayer from yowsup.layers.auth import AuthError # Layers -from yowsup.layers.axolotl import YowAxolotlLayer +from yowsup.layers.axolotl import AxolotlSendLayer, AxolotlControlLayer, AxolotlReceivelayer from yowsup.layers.auth import YowCryptLayer, YowAuthenticationProtocolLayer from yowsup.layers.coder import YowCoderLayer from yowsup.layers.logger import YowLoggerLayer @@ -58,38 +58,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.AndroidYowsupEnv() layers = (YowsupAppLayer, YowParallelLayer((YowAuthenticationProtocolLayer, @@ -107,7 +78,8 @@ class YowsupApp(object): YowProfilesProtocolLayer, YowGroupsProtocolLayer, YowPresenceProtocolLayer)), - UpdatedYowAxolotlLayer, + AxolotlControlLayer, + YowParallelLayer((AxolotlSendLayer, AxolotlReceivelayer)), YowCoderLayer, YowCryptLayer, YowStanzaRegulator, From 5e1636237ea3cc48fc1118b199bcac44b6384c04 Mon Sep 17 00:00:00 2001 From: git-o-bot Date: Wed, 27 Apr 2016 23:08:47 +0200 Subject: [PATCH 27/38] always treat entity as unicode() when outputting it to logging --- yowsupwrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 644c28d..fceba36 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -815,7 +815,7 @@ class YowsupAppLayer(YowInterfaceLayer): @ProtocolEntityCallback('message') def onMessageReceived(self, entity): - self.logger.debug("Received Message: %s" % entity) + self.logger.debug("Received Message: %s" % unicode(entity)) if entity.getType() == MessageProtocolEntity.MESSAGE_TYPE_TEXT: self.caller.onTextMessage( entity._id, From e0d25122bd4f31f425bbc594a6e4c8ce80f43db8 Mon Sep 17 00:00:00 2001 From: git-o-bot Date: Fri, 29 Apr 2016 15:01:50 +0200 Subject: [PATCH 28/38] fix typo (use result of method, not method itself) --- session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session.py b/session.py index e7a6e8a..d4bbcd8 100644 --- a/session.py +++ b/session.py @@ -457,7 +457,7 @@ class Session(YowsupApp): subject = utils.softToUni(group.getSubject()) self.groups[room] = Group(room, owner, subject, subjectOwner, self.backend, self.user) - self.groups[room].addParticipants(group.getParticipants, self.buddies, self.legacyName) + 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)) From 118d65cbd84bf407ff15efaad47918b7504ff718 Mon Sep 17 00:00:00 2001 From: kiv1n Date: Wed, 10 Aug 2016 16:14:46 +0300 Subject: [PATCH 29/38] Fix Yowsup stack and env --- session.py | 2 +- yowsupwrapper.py | 86 ++++++++++++++++++++---------------------------- 2 files changed, 37 insertions(+), 51 deletions(-) diff --git a/session.py b/session.py index 2e0ad99..e90577a 100644 --- a/session.py +++ b/session.py @@ -26,7 +26,7 @@ import logging import urllib import time -from PIL import Image +# from PIL import Image import sys import os diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 3a88938..cf997e7 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -1,13 +1,14 @@ import logging from yowsup import env +from yowsup.env import S40YowsupEnv from yowsup.stacks import YowStack from yowsup.common import YowConstants from yowsup.layers import YowLayerEvent, YowParallelLayer from yowsup.layers.auth import AuthError # Layers -from yowsup.layers.axolotl import YowAxolotlLayer +# from yowsup.layers.axolotl import YowAxolotlLayer from yowsup.layers.auth import YowCryptLayer, YowAuthenticationProtocolLayer from yowsup.layers.coder import YowCoderLayer from yowsup.layers.logger import YowLoggerLayer @@ -46,62 +47,47 @@ 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] +# 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 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 +from yowsup.stacks import YowStackBuilder + class YowsupApp(object): def __init__(self): - env.CURRENT_ENV = UpdatedS40YowsupEnv() + env.CURRENT_ENV = env.S40YowsupEnv() - layers = (YowsupAppLayer, - YowParallelLayer((YowAuthenticationProtocolLayer, - YowMessagesProtocolLayer, - YowReceiptProtocolLayer, - YowAckProtocolLayer, - YowMediaProtocolLayer, - YowIbProtocolLayer, - YowIqProtocolLayer, - YowNotificationsProtocolLayer, - YowContactsIqProtocolLayer, - YowChatstateProtocolLayer, - YowCallsProtocolLayer, - YowPrivacyProtocolLayer, - YowProfilesProtocolLayer, - YowGroupsProtocolLayer, - YowPresenceProtocolLayer)), - UpdatedYowAxolotlLayer, - YowCoderLayer, - YowCryptLayer, - YowStanzaRegulator, - YowNetworkLayer - ) self.logger = logging.getLogger(self.__class__.__name__) - self.stack = YowStack(layers) + stackBuilder = YowStackBuilder() + + self.stack = stackBuilder \ + .pushDefaultLayers(True) \ + .push(YowsupAppLayer) \ + .build() self.stack.broadcastEvent( YowLayerEvent(YowsupAppLayer.EVENT_START, caller = self) ) From c12b136b76dbbcf66cee93d2d3909cc028ca9dbe Mon Sep 17 00:00:00 2001 From: kiv1n Date: Wed, 10 Aug 2016 22:08:00 +0300 Subject: [PATCH 30/38] Fix text encode for cyrillic --- session.py | 2 +- utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/session.py b/session.py index e90577a..5886f65 100644 --- a/session.py +++ b/session.py @@ -268,7 +268,7 @@ class Session(YowsupApp): self.logger.debug('received TextMessage' + ' '.join(map(str, [ _id, _from, to, notify, timestamp, - participant, offline, retry, body + participant, offline, retry, body.encode("utf-8") ])) ) buddy = _from.split('@')[0] diff --git a/utils.py b/utils.py index f6d120c..5e5c571 100644 --- a/utils.py +++ b/utils.py @@ -43,7 +43,7 @@ def ago(secs): return "%d %s ago" % (diff, period) def softToUni(message): - message = message.decode("utf-8") + message = message.encode("utf-8") return e4u.translate(message, reverse=False, **e4u.SOFTBANK_TRANSLATE_PROFILE) def decodePassword(password): From 8e92eaedc2ecdeac9659a5b042cc7aaa7e3416a8 Mon Sep 17 00:00:00 2001 From: kiv1n Date: Wed, 24 Aug 2016 20:52:02 +0300 Subject: [PATCH 31/38] Add feature for send data for decrypt image on onImage() method --- session.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/session.py b/session.py index 5886f65..eca70c3 100644 --- a/session.py +++ b/session.py @@ -298,7 +298,11 @@ class Session(YowsupApp): participant = image.participant if image.caption is None: image.caption = '' - message = image.url + ' ' + image.caption + # Add to message data for descrypt + iv, cipherKey = image.getDecryptData(); + ivHexString = "".join("{:02x}".format(ord(c)) for c in iv) + cipherKeyHexString = "".join("{:02x}".format(ord(c)) for c in cipherKey) + message = image.url + ';' + ivHexString + ';' + cipherKeyHexString if participant is not None: # Group message partname = participant.split('@')[0] self.sendGroupMessageToXMPP(buddy, partname, message, image.timestamp) From 25629839337140db6c1c8898c386d3b550bf2de5 Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Mon, 2 Jan 2017 18:20:07 +0100 Subject: [PATCH 32/38] Make transwhat.py executable --- transwhat.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 transwhat.py diff --git a/transwhat.py b/transwhat.py old mode 100644 new mode 100755 From a90c3ef923db4b821ba3992d39a07eff361bdae7 Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Mon, 2 Jan 2017 18:21:02 +0100 Subject: [PATCH 33/38] Fix missing imports for yowsup --- yowsupwrapper.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 8b64301..a21272b 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -9,6 +9,9 @@ from yowsup.stacks import YowStack from yowsup.common import YowConstants from yowsup.layers import YowLayerEvent, YowParallelLayer from yowsup.layers.auth import AuthError +from yowsup.stacks import YowStack +from yowsup.stacks import YowStackBuilder +from yowsup.common import YowConstants # Layers from yowsup.layers.axolotl import AxolotlSendLayer, AxolotlControlLayer, AxolotlReceivelayer From 324acb80fdade587a7849af81ddfe12775fd3323 Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Mon, 2 Jan 2017 22:55:50 +0100 Subject: [PATCH 34/38] Fix login --- yowsupwrapper.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 8b64301..f23d74e 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -109,12 +109,6 @@ class YowsupApp(object): """ self.stack.setProp(YowAuthenticationProtocolLayer.PROP_CREDENTIALS, (username, password)) - self.stack.setProp(YowNetworkLayer.PROP_ENDPOINT, - YowConstants.ENDPOINTS[0]) - self.stack.setProp(YowCoderLayer.PROP_DOMAIN, - YowConstants.DOMAIN) - self.stack.setProp(YowCoderLayer.PROP_RESOURCE, - env.CURRENT_ENV.getResource()) # self.stack.setProp(YowIqProtocolLayer.PROP_PING_INTERVAL, 5) try: From ccd866c72f3ed0f72743fdc046a31230ab433d50 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 11 Feb 2017 15:44:57 -0300 Subject: [PATCH 35/38] remove develop branch to avoid confusion --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b5bd6f6..4d1c165 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ transWhat is a WhatsApp XMPP Gateway based on [Spectrum 2](http://www.spectrum.i - [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. From 23bc90adf64e96cf0e2368cbbe93d74d609f1263 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 11 Feb 2017 15:52:17 -0300 Subject: [PATCH 36/38] removed timestamp parameter to sendReceipt (fixes #70) --- session.py | 14 +++++++------- yowsupwrapper.py | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/session.py b/session.py index a459c49..0740cef 100644 --- a/session.py +++ b/session.py @@ -213,7 +213,7 @@ class Session(YowsupApp): def sendReadReceipts(self, buddy): for _id, _from, participant, t in self.recvMsgIDs: if _from.split('@')[0] == buddy: - self.sendReceipt(_id, _from, 'read', participant, t) + self.sendReceipt(_id, _from, 'read', participant) self.recvMsgIDs.remove((_id, _from, participant, t)) self.logger.debug("Send read receipt to %s (ID: %s)", _from, _id) @@ -282,7 +282,7 @@ class Session(YowsupApp): offline, retry, body): buddy = _from.split('@')[0] messageContent = utils.softToUni(body) - self.sendReceipt(_id, _from, None, participant, timestamp) + self.sendReceipt(_id, _from, None, participant) self.recvMsgIDs.append((_id, _from, participant, timestamp)) self.logger.info("Message received from %s to %s: %s (at ts=%s)" % (buddy, self.legacyName, messageContent, timestamp)) @@ -335,7 +335,7 @@ class Session(YowsupApp): else: self.sendMessageToXMPP(buddy, url, image.timestamp) self.sendMessageToXMPP(buddy, image.caption, image.timestamp) - self.sendReceipt(image._id, image._from, None, image.participant, image.timestamp) + self.sendReceipt(image._id, image._from, None, image.participant) self.recvMsgIDs.append((image._id, image._from, image.participant, image.timestamp)) @@ -354,7 +354,7 @@ 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, audio.timestamp) + self.sendReceipt(audio._id, audio._from, None, audio.participant) self.recvMsgIDs.append((audio._id, audio._from, audio.participant, audio.timestamp)) @@ -374,7 +374,7 @@ 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, video.timestamp) + self.sendReceipt(video._id, video._from, None, video.participant) self.recvMsgIDs.append((video._id, video._from, video.participant, video.timestamp)) @@ -403,7 +403,7 @@ 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, location.timestamp) + self.sendReceipt(location._id, location._from, None, location.participant) self.recvMsgIDs.append((location._id, location._from, location.participant, location.timestamp)) @@ -426,7 +426,7 @@ 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, timestamp) + self.sendReceipt(_id, _from, None, participant) self.recvMsgIDs.append((_id, _from, participant, timestamp)) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 08225b0..830211a 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -130,7 +130,7 @@ class YowsupApp(object): """ self.stack.broadcastEvent(YowLayerEvent(YowNetworkLayer.EVENT_STATE_DISCONNECT)) - def sendReceipt(self, _id, _from, read, participant, t): + def sendReceipt(self, _id, _from, read, participant): """ Send a receipt (delivered: double-tick, read: blue-ticks) @@ -139,10 +139,9 @@ 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. """ - self.logger.debug(u'Sending receipt to whatsapp: %s', [_id, _from, read, participant, t]) - receipt = OutgoingReceiptProtocolEntity(_id, _from, read, participant, t=t) + self.logger.debug(u'Sending receipt to whatsapp: %s', [_id, _from, read, participant]) + receipt = OutgoingReceiptProtocolEntity(_id, _from, read, participant) self.sendEntity(receipt) def downloadMedia(self, url, onSuccess = None, onFailure = None): From 7729d61d277655f3200f3a35f0865c8d91f67246 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 11 Feb 2017 16:06:12 -0300 Subject: [PATCH 37/38] updated file headers and copyright year --- Spectrum2/backend.py | 23 +++++++++++++++++++++++ Spectrum2/iochannel.py | 23 +++++++++++++++++++++++ bot.py | 8 ++++---- buddy.py | 8 ++++---- config.py | 23 +++++++++++++++++++++++ deferred.py | 24 ++++++++++++++++++++++++ group.py | 9 ++++----- registersession.py | 23 +++++++++++++++++++++++ session.py | 8 ++++---- threadutils.py | 23 +++++++++++++++++++++++ transwhat.py | 8 +++----- utils.py | 9 ++++----- whatsappbackend.py | 8 +++----- yowsupwrapper.py | 23 +++++++++++++++++++++++ 14 files changed, 188 insertions(+), 32 deletions(-) diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index 94d000f..388e2ea 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -1,3 +1,26 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # use unicode encoding for all literals by default (for python2.x) from __future__ import unicode_literals diff --git a/Spectrum2/iochannel.py b/Spectrum2/iochannel.py index 9c558d4..a4e6010 100644 --- a/Spectrum2/iochannel.py +++ b/Spectrum2/iochannel.py @@ -1,3 +1,26 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # use unicode encoding for all literals by default (for python2.x) from __future__ import unicode_literals diff --git a/bot.py b/bot.py index e5ba617..9a28ea0 100644 --- a/bot.py +++ b/bot.py @@ -1,8 +1,5 @@ -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -24,6 +21,9 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import threading import inspect import re diff --git a/buddy.py b/buddy.py index 2537f67..18ddfd0 100644 --- a/buddy.py +++ b/buddy.py @@ -1,8 +1,5 @@ -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -24,6 +21,9 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + from Spectrum2 import protocol_pb2 import logging diff --git a/config.py b/config.py index 09dc7bb..8c0ab85 100644 --- a/config.py +++ b/config.py @@ -1,3 +1,26 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # I'm guessing this is the format of the spectrum config file in BNF # ::= * # ::= * * | diff --git a/deferred.py b/deferred.py index 27049cd..5fe46c2 100644 --- a/deferred.py +++ b/deferred.py @@ -1,5 +1,29 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # use unicode encoding for all literals by default (for python2.x) from __future__ import unicode_literals + from functools import partial class Deferred(object): diff --git a/group.py b/group.py index 0d255a9..beebf84 100644 --- a/group.py +++ b/group.py @@ -1,9 +1,5 @@ -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -25,6 +21,9 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + from Spectrum2 import protocol_pb2 class Group(): diff --git a/registersession.py b/registersession.py index 7a939e2..c276d7a 100644 --- a/registersession.py +++ b/registersession.py @@ -1,3 +1,26 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # use unicode encoding for all literals by default (for python2.x) from __future__ import unicode_literals from Spectrum2 import protocol_pb2 diff --git a/session.py b/session.py index 0740cef..c76190c 100644 --- a/session.py +++ b/session.py @@ -1,8 +1,5 @@ -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -24,6 +21,9 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import utils import logging import urllib diff --git a/threadutils.py b/threadutils.py index cee0929..ddb8ebe 100644 --- a/threadutils.py +++ b/threadutils.py @@ -1,3 +1,26 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # use unicode encoding for all literals by default (for python2.x) from __future__ import unicode_literals diff --git a/transwhat.py b/transwhat.py index 929727d..971f813 100755 --- a/transwhat.py +++ b/transwhat.py @@ -1,11 +1,7 @@ #!/usr/bin/python -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -27,6 +23,8 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals import argparse import traceback diff --git a/utils.py b/utils.py index 795e48a..c693f37 100644 --- a/utils.py +++ b/utils.py @@ -1,9 +1,5 @@ -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -25,6 +21,9 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals + import e4u import base64 import hashlib diff --git a/whatsappbackend.py b/whatsappbackend.py index 6230d94..90409da 100644 --- a/whatsappbackend.py +++ b/whatsappbackend.py @@ -1,9 +1,5 @@ -# use unicode encoding for all literals by default (for python2.x) -from __future__ import unicode_literals - - __author__ = "Steffen Vogel" -__copyright__ = "Copyright 2015, Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" __license__ = "GPLv3" __maintainer__ = "Steffen Vogel" __email__ = "post@steffenvogel.de" @@ -25,6 +21,8 @@ __email__ = "post@steffenvogel.de" along with transWhat. If not, see . """ +# use unicode encoding for all literals by default (for python2.x) +from __future__ import unicode_literals from Spectrum2.backend import SpectrumBackend from Spectrum2 import protocol_pb2 diff --git a/yowsupwrapper.py b/yowsupwrapper.py index 830211a..bebbb87 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -1,3 +1,26 @@ +__author__ = "Steffen Vogel" +__copyright__ = "Copyright 2015-2017, Steffen Vogel" +__license__ = "GPLv3" +__maintainer__ = "Steffen Vogel" +__email__ = "post@steffenvogel.de" + +""" + This file is part of transWhat + + transWhat is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + any later version. + + transwhat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with transWhat. If not, see . +""" + # use unicode encoding for all literals by default (for python2.x) from __future__ import unicode_literals From 9b0eb9911aade0448e06c57aa3ea9bbacac4ed0e Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 11 Feb 2017 16:08:18 -0300 Subject: [PATCH 38/38] resolve merge mistakes (fixes #69) --- yowsupwrapper.py | 54 ++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/yowsupwrapper.py b/yowsupwrapper.py index bebbb87..d2e8015 100644 --- a/yowsupwrapper.py +++ b/yowsupwrapper.py @@ -218,49 +218,27 @@ class YowsupApp(object): self.logger.error("Request upload for file %s for %s failed" % (path, jid)) def onUploadError(self, filePath, jid, url): - #logger.error("Upload file %s to %s for %s failed!" % (filePath, url, jid)) - self.logger.error("Upload Error!") + self.logger.error("Upload file %s to %s for %s failed!" % (filePath, url, jid)) def onUploadProgress(self, filePath, jid, url, progress): - #sys.stdout.write("%s => %s, %d%% \r" % (os.path.basename(filePath), jid, progress)) - #sys.stdout.flush() + self.logger.info("%s => %s, %d%% \r" % (os.path.basename(filePath), jid, progress)) pass - ownNumber = self.stack.getLayerInterface(YowAuthenticationProtocolLayer).getUsername(full=False) + def doSendImage(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): + entity = ImageDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to, caption = caption) + self.sendEntity(entity) + #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) + if onSuccess is not None: + onSuccess(entity.getId()) + return entity.getId() - mediaUploader = MediaUploader(jid, ownNumber, filePath, - resultRequestUploadIqProtocolEntity.getUrl(), - resultRequestUploadIqProtocolEntity.getResumeOffset(), - successFn, self.onUploadError, self.onUploadProgress, async=False) - - mediaUploader.start() - - def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity): - self.logger.error("Request upload for file %s for %s failed" % (path, jid)) - - def onUploadError(self, filePath, jid, url): - self.logger.error("Upload file %s to %s for %s failed!" % (filePath, url, jid)) - - def onUploadProgress(self, filePath, jid, url, progress): - #sys.stdout.write("%s => %s, %d%% \r" % (os.path.basename(filePath), jid, progress)) - #sys.stdout.flush() - pass - - def doSendImage(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): - entity = ImageDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to, caption = caption) - self.sendEntity(entity) - #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) - if onSuccess is not None: - onSuccess(entity.getId()) - return entity.getId() - - def doSendAudio(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): - entity = AudioDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to) - self.sendEntity(entity) - #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) - if onSuccess is not None: - onSuccess(entity.getId()) - return entity.getId() + def doSendAudio(self, filePath, url, to, ip = None, caption = None, onSuccess = None, onFailure = None): + entity = AudioDownloadableMediaMessageProtocolEntity.fromFilePath(filePath, url, ip, to) + self.sendEntity(entity) + #self.msgIDs[entity.getId()] = MsgIDs(self.imgMsgId, entity.getId()) + if onSuccess is not None: + onSuccess(entity.getId()) + return entity.getId() def sendPresence(self, available): """