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

Revert "catch exception if message was not delivered to XMPP"

Browse source 
This reverts commit 0c199a8231.
This commit is contained in:
Nicolas 2017-10-18 23:51:33 +02:00
parent d88d13d1e3
commit 42f8c079c3
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
transWhat/session.py
View file

@ -285,21 +285,18 @@ class Session(YowsupApp):
self.logger.info("Message received from %s to %s: %s (at ts=%s)" %
(buddy, self.legacyName, messageContent, timestamp))
try:
if participant is not None: # Group message or broadcast
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 = ""
self.sendGroupMessageToXMPP(buddy, partname, messageContent,
timestamp, notify)
else:
self.sendMessageToXMPP(buddy, messageContent, timestamp)
except Exception as ex:
self.logger.error("textMessage not delivered to XMPP: %s" % ex)
if participant is not None: # Group message or broadcast
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 = ""
self.sendGroupMessageToXMPP(buddy, partname, messageContent,
timestamp, notify)
else:
self.sendMessageToXMPP(buddy, messageContent, timestamp)
# Called by superclass
def onImage(self, image):