Attempt to fix groupchats
This commit is contained in:
parent
f1a6b109f7
commit
ecfa2d7f85
|
@ -27,7 +27,7 @@ class SpectrumBackend:
|
||||||
self.m_init_res = 0
|
self.m_init_res = 0
|
||||||
self.logger = logging.getLogger(self.__class__.__name__)
|
self.logger = logging.getLogger(self.__class__.__name__)
|
||||||
|
|
||||||
def handleMessage(self, user, legacyName, msg, nickname = "", xhtml = "", timestamp = ""):
|
def handleMessage(self, user, legacyName, msg, nickname = "", xhtml = "", timestamp = "", pm = True):
|
||||||
m = protocol_pb2.ConversationMessage()
|
m = protocol_pb2.ConversationMessage()
|
||||||
m.userName = user
|
m.userName = user
|
||||||
m.buddyName = legacyName
|
m.buddyName = legacyName
|
||||||
|
@ -35,6 +35,7 @@ class SpectrumBackend:
|
||||||
m.nickname = nickname
|
m.nickname = nickname
|
||||||
m.xhtml = xhtml
|
m.xhtml = xhtml
|
||||||
m.timestamp = str(timestamp)
|
m.timestamp = str(timestamp)
|
||||||
|
m.pm = pm
|
||||||
|
|
||||||
message = WRAP(m.SerializeToString(), protocol_pb2.WrapperMessage.TYPE_CONV_MESSAGE)
|
message = WRAP(m.SerializeToString(), protocol_pb2.WrapperMessage.TYPE_CONV_MESSAGE)
|
||||||
self.send(message)
|
self.send(message)
|
||||||
|
|
238
session.py
238
session.py
|
@ -47,8 +47,6 @@ class Session(YowsupApp):
|
||||||
self.backend = backend
|
self.backend = backend
|
||||||
self.user = user
|
self.user = user
|
||||||
self.legacyName = legacyName
|
self.legacyName = legacyName
|
||||||
self.buddies = BuddyList(self.legacyName, self.db)
|
|
||||||
self.bot = Bot(self)
|
|
||||||
|
|
||||||
self.status = protocol_pb2.STATUS_NONE
|
self.status = protocol_pb2.STATUS_NONE
|
||||||
self.statusMessage = ''
|
self.statusMessage = ''
|
||||||
|
@ -56,36 +54,36 @@ class Session(YowsupApp):
|
||||||
self.groups = {}
|
self.groups = {}
|
||||||
self.presenceRequested = []
|
self.presenceRequested = []
|
||||||
self.offlineQueue = []
|
self.offlineQueue = []
|
||||||
|
self.msgIDs = { }
|
||||||
self.groupOfflineQueue = { }
|
self.groupOfflineQueue = { }
|
||||||
|
self.shouldBeConnected = False
|
||||||
|
|
||||||
self.timer = None
|
self.timer = None
|
||||||
self.password = None
|
self.password = None
|
||||||
self.initialized = False
|
self.initialized = False
|
||||||
self.loggedin = False
|
self.synced = False
|
||||||
|
|
||||||
|
self.buddies = BuddyList(self.legacyName, self.db)
|
||||||
self.bot = Bot(self)
|
self.bot = Bot(self)
|
||||||
|
|
||||||
def __del__(self): # handleLogoutRequest
|
def __del__(self): # handleLogoutRequest
|
||||||
self.logout()
|
self.logout()
|
||||||
|
|
||||||
def call(self, method, **kwargs):
|
|
||||||
self.logger.debug("%s(%s)", method,
|
|
||||||
", ".join(str(k) + ': ' + str(v) for k, v in kwargs.items()))
|
|
||||||
##self.stack.broadcastEvent(YowLayerEvent(method, **kwargs))
|
|
||||||
|
|
||||||
def logout(self):
|
def logout(self):
|
||||||
self.loggedin = False
|
self.logger.info("%s logged out", self.user)
|
||||||
super(Session, self).logout()
|
super(Session, self).logout()
|
||||||
|
|
||||||
def login(self, password):
|
def login(self, password):
|
||||||
self.loggedin = True
|
self.logger.info("%s attempting login", self.user)
|
||||||
self.password = password
|
self.password = password
|
||||||
|
self.shouldBeConncted = True
|
||||||
super(Session, self).login(self.legacyName, self.password)
|
super(Session, self).login(self.legacyName, self.password)
|
||||||
|
|
||||||
def updateRoomList(self):
|
def updateRoomList(self):
|
||||||
rooms = []
|
rooms = []
|
||||||
for room, group in self.groups.iteritems():
|
for room, group in self.groups.iteritems():
|
||||||
rooms.append([room, group.subject])
|
rooms.append([room, group.subject])
|
||||||
|
|
||||||
self.logger.debug("Got rooms: %s", rooms)
|
self.logger.debug("Got rooms: %s", rooms)
|
||||||
self.backend.handleRoomList(rooms)
|
self.backend.handleRoomList(rooms)
|
||||||
|
|
||||||
|
@ -95,6 +93,11 @@ class Session(YowsupApp):
|
||||||
old = self.buddies.keys()
|
old = self.buddies.keys()
|
||||||
self.buddies.load()
|
self.buddies.load()
|
||||||
new = self.buddies.keys()
|
new = self.buddies.keys()
|
||||||
|
contacts = new
|
||||||
|
|
||||||
|
if self.synced == False:
|
||||||
|
self.sendSync(contacts, delta = False, interactive = True)
|
||||||
|
self.synced = True
|
||||||
|
|
||||||
add = set(new) - set(old)
|
add = set(new) - set(old)
|
||||||
remove = set(old) - set(new)
|
remove = set(old) - set(new)
|
||||||
|
@ -103,27 +106,28 @@ class Session(YowsupApp):
|
||||||
self.logger.debug("Roster add: %s", str(list(add)))
|
self.logger.debug("Roster add: %s", str(list(add)))
|
||||||
|
|
||||||
for number in remove:
|
for number in remove:
|
||||||
self.backend.handleBuddyChanged(self.user, number, "", [], protocol_pb2.STATUS_NONE)
|
self.backend.handleBuddyChanged(self.user, number, "", [],
|
||||||
|
protocol_pb2.STATUS_NONE)
|
||||||
self.backend.handleBuddyRemoved(self.user, number)
|
self.backend.handleBuddyRemoved(self.user, number)
|
||||||
self.unsubscribePresence(number)
|
self.unsubscribePresence(number)
|
||||||
|
|
||||||
for number in add:
|
for number in add:
|
||||||
buddy = self.buddies[number]
|
buddy = self.buddies[number]
|
||||||
self.subscribePresence(number)
|
self.subscribePresence(number)
|
||||||
self.backend.handleBuddyChanged(self.user, number, buddy.nick, buddy.groups, protocol_pb2.STATUS_NONE, iconHash = buddy.image_hash if buddy.image_hash is not None else "")
|
self.backend.handleBuddyChanged(self.user, number, buddy.nick,
|
||||||
|
buddy.groups, protocol_pb2.STATUS_NONE,
|
||||||
|
iconHash = buddy.image_hash if buddy.image_hash is not None else "")
|
||||||
|
|
||||||
#self.requestLastSeen(number, self._lastSeen)
|
#self.requestLastSeen(number, self._lastSeen)
|
||||||
self.logger.debug('Requesting groups list')
|
|
||||||
self.requestGroupsList(self._updateGroups)
|
|
||||||
|
|
||||||
def _updateGroups(self, response, request):
|
def _updateGroups(self, response, request):
|
||||||
self.logger.debug('Received groups list %s', response)
|
self.logger.debug('Received groups list %s', response)
|
||||||
# This XMPP client is not receiving this for some reason.
|
|
||||||
groups = response.getGroups()
|
groups = response.getGroups()
|
||||||
for group in groups:
|
for group in groups:
|
||||||
room = group.getId()
|
room = group.getId()
|
||||||
owner = group.getOwner()
|
owner = group.getOwner().split('@')[0]
|
||||||
subjectOwner = group.getSubjectOwner()
|
subjectOwner = group.getSubjectOwner().split('@')[0]
|
||||||
subject = group.getSubject()
|
subject = utils.softToUni(group.getSubject())
|
||||||
|
|
||||||
if room in self.groups:
|
if room in self.groups:
|
||||||
oroom = self.groups[room]
|
oroom = self.groups[room]
|
||||||
|
@ -132,22 +136,61 @@ class Session(YowsupApp):
|
||||||
oroom.subject = subject
|
oroom.subject = subject
|
||||||
else:
|
else:
|
||||||
self.groups[room] = Group(room, owner, subject, subjectOwner)
|
self.groups[room] = Group(room, owner, subject, subjectOwner)
|
||||||
# A crude implemtation of groups that act like buddies
|
self.joinRoom(room, self.user.split("@")[0])
|
||||||
|
|
||||||
self.backend.handleBuddyChanged(self.user, room, subject, [], protocol_pb2.STATUS_NONE)
|
self._addParticipantsToRoom(room, group.getParticipants())
|
||||||
# This XMPP client is not receiving this for some reason.
|
|
||||||
# self.updateRoomList()
|
|
||||||
# for group in groups:
|
|
||||||
# room = group.getId()
|
|
||||||
# subjectOwner = group.getSubjectOwner()
|
|
||||||
# subject = group.getSubject()
|
|
||||||
# self.backend.handleSubject(self.user, room, subject, subjectOwner)
|
|
||||||
# for participant in group.getParticipants():
|
|
||||||
# buddy = participant.split('@')[0]
|
|
||||||
# self.logger.debug("Added %s to room %s", buddy, room)
|
|
||||||
# self.backend.handleParticipantChanged(self.user, buddy, room,
|
|
||||||
# protocol_pb2.PARTICIPANT_FLAG_NONE, protocol_pb2.STATUS_ONLINE)
|
|
||||||
|
|
||||||
|
if room in self.groupOfflineQueue:
|
||||||
|
while self.groupOfflineQueue[room]:
|
||||||
|
msg = self.groupOfflineQueue[room].pop(0)
|
||||||
|
self.backend.handleMessage(self.user, room, msg[1],
|
||||||
|
msg[0], "", msg[2])
|
||||||
|
self.logger.debug("Send queued group message to: %s %s %s",
|
||||||
|
msg[0],msg[1], msg[2])
|
||||||
|
self.updateRoomList()
|
||||||
|
|
||||||
|
def joinRoom(self, room, nick):
|
||||||
|
if room in self.groups:
|
||||||
|
self.logger.info("Joining room: %s room=%s, nick=%s",
|
||||||
|
self.legacyName, room, nick)
|
||||||
|
|
||||||
|
group = self.groups[room]
|
||||||
|
group.nick = nick
|
||||||
|
try:
|
||||||
|
ownerNick = self.buddies[group.subjectOwner].nick
|
||||||
|
except KeyError:
|
||||||
|
ownerNick = group.subjectOwner
|
||||||
|
|
||||||
|
self.backend.handleSubject(self.user, room, group.subject,
|
||||||
|
ownerNick)
|
||||||
|
self.backend.handleRoomNicknameChanged(self.user, room,
|
||||||
|
group.subject)
|
||||||
|
else:
|
||||||
|
self.logger.warn("Room doesn't exist: %s", room)
|
||||||
|
|
||||||
|
def _addParticipantsToRoom(self, room, participants):
|
||||||
|
group = self.groups[room]
|
||||||
|
|
||||||
|
for jid, _type in participants.iteritems():
|
||||||
|
buddy = jid.split("@")[0]
|
||||||
|
buddyFull = buddy
|
||||||
|
self.logger.info("Added %s to room %s", buddy, room)
|
||||||
|
try:
|
||||||
|
nick = self.buddies[buddy].nick
|
||||||
|
except KeyError:
|
||||||
|
nick = buddy
|
||||||
|
buddyFull = buddy
|
||||||
|
if _type == 'admin':
|
||||||
|
flags = protocol_pb2.PARTICIPANT_FLAG_MODERATOR
|
||||||
|
else:
|
||||||
|
flags = protocol_pb2.PARTICIPANT_FLAG_NONE
|
||||||
|
if buddy == self.legacyName:
|
||||||
|
nick = group.nick
|
||||||
|
flags = protocol_pb2.PARTICIPANT_FLAG_ME
|
||||||
|
buddyFull = self.user
|
||||||
|
|
||||||
|
self.backend.handleParticipantChanged(self.user, buddyFull,
|
||||||
|
room, flags, protocol_pb2.STATUS_ONLINE, buddy, nick)
|
||||||
|
|
||||||
|
|
||||||
def _lastSeen(self, number, seconds):
|
def _lastSeen(self, number, seconds):
|
||||||
|
@ -163,23 +206,29 @@ class Session(YowsupApp):
|
||||||
self.logger.info("Auth success: %s", self.user)
|
self.logger.info("Auth success: %s", self.user)
|
||||||
|
|
||||||
self.backend.handleConnected(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, "bot", self.bot.name,
|
||||||
|
["Admin"], protocol_pb2.STATUS_ONLINE)
|
||||||
|
if self.initialized == False:
|
||||||
|
self.sendOfflineMessages()
|
||||||
|
self.bot.call("welcome")
|
||||||
self.initialized = True
|
self.initialized = True
|
||||||
self.sendPresence(True)
|
self.sendPresence(True)
|
||||||
|
|
||||||
self.updateRoster()
|
self.updateRoster()
|
||||||
|
|
||||||
|
self.logger.debug('Requesting groups list')
|
||||||
|
self.requestGroupsList(self._updateGroups)
|
||||||
|
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onAuthFailed(self, reason):
|
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.backend.handleDisconnected(self.user, 0, reason)
|
||||||
self.password = None
|
self.password = None
|
||||||
|
self.shouldBeConnected = False
|
||||||
|
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onDisconnect(self):
|
def onDisconnect(self):
|
||||||
self.logger.debug('Disconnected')
|
self.logger.debug('Disconnected')
|
||||||
self.backend.handleDisconnected(self.user, 0, 'Disconnected for unknown reasons')
|
self.backend.handleDisconnected(self.user, 0, 'Disconnected for unknown reasons')
|
||||||
self.loggedin = False
|
|
||||||
|
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onReceipt(self, _id, _from, timestamp, type, participant, offline, items):
|
def onReceipt(self, _id, _from, timestamp, type, participant, offline, items):
|
||||||
|
@ -198,7 +247,8 @@ class Session(YowsupApp):
|
||||||
)
|
)
|
||||||
|
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body):
|
def onTextMessage(self, _id, _from, to, notify, timestamp, participant,
|
||||||
|
offline, retry, body):
|
||||||
self.logger.debug('received TextMessage' +
|
self.logger.debug('received TextMessage' +
|
||||||
' '.join(map(str, [
|
' '.join(map(str, [
|
||||||
_id, _from, to, notify, timestamp,
|
_id, _from, to, notify, timestamp,
|
||||||
|
@ -210,10 +260,10 @@ class Session(YowsupApp):
|
||||||
self.sendReceipt(_id, _from, None, participant)
|
self.sendReceipt(_id, _from, None, participant)
|
||||||
self.logger.info("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)
|
buddy, self.legacyName, messageContent, timestamp)
|
||||||
if participant is not None:
|
if participant is not None: # Group message
|
||||||
partname = participant.split('@')[0]
|
partname = participant.split('@')[0]
|
||||||
message = partname + ': ' + messageContent
|
self.sendGroupMessageToXMPP(buddy, partname, messageContent,
|
||||||
self.sendMessageToXMPP(buddy, message, timestamp)
|
timestamp)
|
||||||
else:
|
else:
|
||||||
self.sendMessageToXMPP(buddy, messageContent, timestamp)
|
self.sendMessageToXMPP(buddy, messageContent, timestamp)
|
||||||
# isBroadcast always returns false, I'm not sure how to get a broadcast
|
# isBroadcast always returns false, I'm not sure how to get a broadcast
|
||||||
|
@ -247,6 +297,20 @@ class Session(YowsupApp):
|
||||||
self.sendMessageToXMPP(buddy, message, video.timestamp)
|
self.sendMessageToXMPP(buddy, message, video.timestamp)
|
||||||
self.sendReceipt(video._id, video._from, None, video.participant)
|
self.sendReceipt(video._id, video._from, None, video.participant)
|
||||||
|
|
||||||
|
def onLocation(self, location):
|
||||||
|
buddy = location._from.split('@')[0]
|
||||||
|
latitude = location.getLatitude()
|
||||||
|
longitude = location.getLongitude()
|
||||||
|
url = location.getLocationUrl()
|
||||||
|
|
||||||
|
self.logger.debug("Location received from %s: %s, %s",
|
||||||
|
buddy, latitude, longitude)
|
||||||
|
|
||||||
|
self.sendMessageToXMPP(buddy, url, location.timestamp)
|
||||||
|
self.sendMessageToXMPP(buddy, 'geo:' + latitude + ',' + longitude,
|
||||||
|
location.timestamp)
|
||||||
|
|
||||||
|
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant):
|
def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant):
|
||||||
self.logger.debug('received VCard' +
|
self.logger.debug('received VCard' +
|
||||||
|
@ -256,7 +320,7 @@ class Session(YowsupApp):
|
||||||
)
|
)
|
||||||
buddy = _from.split("@")[0]
|
buddy = _from.split("@")[0]
|
||||||
self.sendMessageToXMPP(buddy, "Received VCard (not implemented yet)")
|
self.sendMessageToXMPP(buddy, "Received VCard (not implemented yet)")
|
||||||
self.sendMessageToXMPP(buddy, card_data)
|
# self.sendMessageToXMPP(buddy, card_data)
|
||||||
self.transferFile(buddy, str(name), card_data)
|
self.transferFile(buddy, str(name), card_data)
|
||||||
self.sendReceipt(_id, _from, None, participant)
|
self.sendReceipt(_id, _from, None, participant)
|
||||||
|
|
||||||
|
@ -270,6 +334,7 @@ class Session(YowsupApp):
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onContactTyping(self, buddy):
|
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.sendPresence(True)
|
||||||
self.backend.handleBuddyTyping(self.user, buddy)
|
self.backend.handleBuddyTyping(self.user, buddy)
|
||||||
|
|
||||||
|
@ -279,8 +344,11 @@ class Session(YowsupApp):
|
||||||
# Called by superclass
|
# Called by superclass
|
||||||
def onContactPaused(self, buddy):
|
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.backend.handleBuddyTyped(self.user, buddy)
|
||||||
self.timer = Timer(3, self.backend.handleBuddyStoppedTyping, (self.user, buddy)).start()
|
self.timer = Timer(3, self.backend.handleBuddyStoppedTyping,
|
||||||
|
(self.user, buddy)).start()
|
||||||
|
|
||||||
def onPresenceReceived(self, _type, name, jid, lastseen):
|
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]
|
buddy = jid.split("@")[0]
|
||||||
|
@ -302,7 +370,8 @@ class Session(YowsupApp):
|
||||||
try:
|
try:
|
||||||
buddy = self.buddies[buddy]
|
buddy = self.buddies[buddy]
|
||||||
self.logger.info("Is available: %s", buddy)
|
self.logger.info("Is available: %s", buddy)
|
||||||
self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, buddy.groups, protocol_pb2.STATUS_ONLINE)
|
self.backend.handleBuddyChanged(self.user, buddy.number.number,
|
||||||
|
buddy.nick, buddy.groups, protocol_pb2.STATUS_ONLINE)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
self.logger.error("Buddy not found: %s", buddy)
|
self.logger.error("Buddy not found: %s", buddy)
|
||||||
|
|
||||||
|
@ -310,7 +379,8 @@ class Session(YowsupApp):
|
||||||
try:
|
try:
|
||||||
buddy = self.buddies[buddy]
|
buddy = self.buddies[buddy]
|
||||||
self.logger.info("Is unavailable: %s", buddy)
|
self.logger.info("Is unavailable: %s", buddy)
|
||||||
self.backend.handleBuddyChanged(self.user, buddy.number.number, buddy.nick, buddy.groups, protocol_pb2.STATUS_XA)
|
self.backend.handleBuddyChanged(self.user, buddy.number.number,
|
||||||
|
buddy.nick, buddy.groups, protocol_pb2.STATUS_XA)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
self.logger.error("Buddy not found: %s", buddy)
|
self.logger.error("Buddy not found: %s", buddy)
|
||||||
|
|
||||||
|
@ -330,20 +400,33 @@ class Session(YowsupApp):
|
||||||
self.sendTyping(buddy, False)
|
self.sendTyping(buddy, False)
|
||||||
|
|
||||||
def sendMessageToWA(self, sender, message):
|
def sendMessageToWA(self, sender, message):
|
||||||
self.logger.info("Message sent from %s to %s: %s", self.legacyName, sender, message)
|
self.logger.info("Message sent from %s to %s: %s",
|
||||||
|
self.legacyName, sender, message)
|
||||||
|
|
||||||
message = message.encode("utf-8")
|
message = message.encode("utf-8")
|
||||||
|
|
||||||
if sender == "bot":
|
if sender == "bot":
|
||||||
self.bot.parse(message)
|
self.bot.parse(message)
|
||||||
elif "-" in sender: # group msg
|
elif "-" in sender: # group msg
|
||||||
if "/" in sender:
|
if "/" in sender: # directed at single user
|
||||||
room, buddy = sender.split("/")
|
room, nick = sender.split("/")
|
||||||
self.sendTextMessage(buddy + '@s.whatsapp.net', message)
|
for buddy, buddy3 in self.buddies.iteritems():
|
||||||
|
self.logger.info("Group buddy=%s nick=%s", buddy,
|
||||||
|
buddy3.nick)
|
||||||
|
if buddy3.nick == nick:
|
||||||
|
nick = buddy
|
||||||
|
self.sendTextMessage(nick + '@s.whatsapp.net', message)
|
||||||
else:
|
else:
|
||||||
room = sender
|
room = sender
|
||||||
# group = self.groups[room]
|
try:
|
||||||
|
group = self.groups[room]
|
||||||
# self.backend.handleMessage(self.user, room, message, group.nick)
|
self.logger.info("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
|
||||||
|
)
|
||||||
|
except KeyError:
|
||||||
|
self.logger.error('Group not found: %s', room)
|
||||||
self.sendTextMessage(room + '@g.us', message)
|
self.sendTextMessage(room + '@g.us', message)
|
||||||
|
|
||||||
else: # private msg
|
else: # private msg
|
||||||
|
@ -368,26 +451,37 @@ class Session(YowsupApp):
|
||||||
"", timestamp)
|
"", timestamp)
|
||||||
|
|
||||||
def sendGroupMessageToXMPP(self, room, buddy, messageContent, timestamp = ""):
|
def sendGroupMessageToXMPP(self, room, buddy, messageContent, timestamp = ""):
|
||||||
|
try:
|
||||||
|
nick = self.buddies[buddy].nick
|
||||||
|
except KeyError:
|
||||||
|
nick = buddy
|
||||||
|
|
||||||
if timestamp:
|
if timestamp:
|
||||||
timestamp = time.strftime("%Y%m%dT%H%M%S", time.gmtime(timestamp))
|
timestamp = time.strftime("%Y%m%dT%H%M%S", time.gmtime(timestamp))
|
||||||
|
|
||||||
if self.initialized == False:
|
if self.initialized == False:
|
||||||
self.logger.debug("Group message queued from %s to %s: %s", buddy, room, messageContent)
|
self.logger.debug("Group message queued from %s to %s: %s",
|
||||||
|
buddy, room, messageContent)
|
||||||
|
|
||||||
if room not in self.groupOfflineQueue:
|
if room not in self.groupOfflineQueue:
|
||||||
self.groupOfflineQueue[room] = [ ]
|
self.groupOfflineQueue[room] = [ ]
|
||||||
|
|
||||||
self.groupOfflineQueue[room].append((buddy, messageContent, timestamp))
|
self.groupOfflineQueue[room].append(
|
||||||
|
(buddy, messageContent, timestamp)
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
self.logger.debug("Group message sent from %s to %s: %s", buddy, room, messageContent)
|
self.logger.debug("Group message sent from %s to %s: %s", buddy,
|
||||||
self.backend.handleMessage(self.user, room, messageContent, buddy, "", timestamp)
|
room, messageContent)
|
||||||
|
self.backend.handleMessage(self.user, room, messageContent, nick,
|
||||||
|
"", timestamp, False)
|
||||||
|
|
||||||
def changeStatus(self, status):
|
def changeStatus(self, status):
|
||||||
if status != self.status:
|
if status != self.status:
|
||||||
self.logger.info("Status changed: %s", status)
|
self.logger.info("Status changed: %s", status)
|
||||||
self.status = status
|
self.status = status
|
||||||
|
|
||||||
if status == protocol_pb2.STATUS_ONLINE or status == protocol_pb2.STATUS_FFC:
|
if status == protocol_pb2.STATUS_ONLINE \
|
||||||
|
or status == protocol_pb2.STATUS_FFC:
|
||||||
self.sendPresence(True)
|
self.sendPresence(True)
|
||||||
else:
|
else:
|
||||||
self.sendPresence(False)
|
self.sendPresence(False)
|
||||||
|
@ -421,21 +515,8 @@ class Session(YowsupApp):
|
||||||
self.buddies.remove(buddy)
|
self.buddies.remove(buddy)
|
||||||
self.updateRoster()
|
self.updateRoster()
|
||||||
|
|
||||||
def joinRoom(self, room, nick):
|
|
||||||
if room in self.groups:
|
|
||||||
group = self.groups[room]
|
|
||||||
|
|
||||||
self.logger.info("Joining room: %s room=%s, nick=%s", self.legacyName, room, nick)
|
|
||||||
|
|
||||||
group.nick = nick
|
|
||||||
|
|
||||||
self.call("group_getParticipants", (room + "@g.us",))
|
|
||||||
self.backend.handleSubject(self.user, room, group.subject, group.subjectOwner)
|
|
||||||
else:
|
|
||||||
self.logger.warn("Room doesn't exist: %s", room)
|
|
||||||
|
|
||||||
def requestVCard(self, buddy, ID):
|
def requestVCard(self, buddy, ID):
|
||||||
|
|
||||||
def onSuccess(response, request):
|
def onSuccess(response, request):
|
||||||
self.logger.debug('Sending VCard (%s) with image id %s',
|
self.logger.debug('Sending VCard (%s) with image id %s',
|
||||||
ID, response.pictureId)
|
ID, response.pictureId)
|
||||||
|
@ -458,27 +539,6 @@ class Session(YowsupApp):
|
||||||
if receiptRequested: self.call("message_ack", (jid, messageId))
|
if receiptRequested: self.call("message_ack", (jid, messageId))
|
||||||
|
|
||||||
|
|
||||||
def onGroupGotParticipants(self, gjid, jids):
|
|
||||||
room = gjid.split("@")[0]
|
|
||||||
group = self.groups[room]
|
|
||||||
|
|
||||||
for jid in jids:
|
|
||||||
buddy = jid.split("@")[0]
|
|
||||||
self.logger.info("Added %s to room %s", buddy, room)
|
|
||||||
|
|
||||||
if buddy == group.owner:
|
|
||||||
flags = protocol_pb2.PARTICIPANT_FLAG_MODERATOR
|
|
||||||
else:
|
|
||||||
flags = protocol_pb2.PARTICIPANT_FLAG_NONE
|
|
||||||
|
|
||||||
self.backend.handleParticipantChanged(self.user, buddy, room, flags, protocol_pb2.STATUS_ONLINE) # TODO check status
|
|
||||||
|
|
||||||
if room in self.groupOfflineQueue:
|
|
||||||
while self.groupOfflineQueue[room]:
|
|
||||||
msg = self.groupOfflineQueue[room].pop(0)
|
|
||||||
self.backend.handleMessage(self.user, room, msg[1], msg[0], "", msg[2])
|
|
||||||
self.logger.debug("Send queued group message to: %s %s %s", msg[0],msg[1], msg[2])
|
|
||||||
|
|
||||||
def onGroupMessageReceived(self, messageId, gjid, jid, messageContent, timestamp, receiptRequested, pushName):
|
def onGroupMessageReceived(self, messageId, gjid, jid, messageContent, timestamp, receiptRequested, pushName):
|
||||||
buddy = jid.split("@")[0]
|
buddy = jid.split("@")[0]
|
||||||
room = gjid.split("@")[0]
|
room = gjid.split("@")[0]
|
||||||
|
|
|
@ -30,6 +30,7 @@ from yowsup.layers.protocol_calls import YowCallsProtocolLayer
|
||||||
|
|
||||||
from yowsup.layers.protocol_acks.protocolentities import *
|
from yowsup.layers.protocol_acks.protocolentities import *
|
||||||
from yowsup.layers.protocol_chatstate.protocolentities import *
|
from yowsup.layers.protocol_chatstate.protocolentities import *
|
||||||
|
from yowsup.layers.protocol_contacts.protocolentities import *
|
||||||
from yowsup.layers.protocol_groups.protocolentities import *
|
from yowsup.layers.protocol_groups.protocolentities import *
|
||||||
from yowsup.layers.protocol_media.protocolentities import *
|
from yowsup.layers.protocol_media.protocolentities import *
|
||||||
from yowsup.layers.protocol_messages.protocolentities import *
|
from yowsup.layers.protocol_messages.protocolentities import *
|
||||||
|
@ -197,6 +198,26 @@ class YowsupApp(object):
|
||||||
)
|
)
|
||||||
self.sendEntity(state)
|
self.sendEntity(state)
|
||||||
|
|
||||||
|
def sendSync(self, contacts, delta = False, interactive = True):
|
||||||
|
"""
|
||||||
|
You need to sync new contacts before you interact with
|
||||||
|
them, failure to do so could result in a temporary ban.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
- contacts: ([str]) a list of phone numbers of the
|
||||||
|
contacts you wish to sync
|
||||||
|
- delta: (bool; default: False) If true only send new
|
||||||
|
contacts to sync, if false you should send your full
|
||||||
|
contact list.
|
||||||
|
- interactive: (bool; default: True) Set to false if you are
|
||||||
|
sure this is the first time registering
|
||||||
|
"""
|
||||||
|
# TODO: Implement callbacks
|
||||||
|
mode = GetSyncIqProtocolEntity.MODE_DELTA if delta else GetSyncIqProtocolEntity.MODE_FULL
|
||||||
|
context = GetSyncIqProtocolEntity.CONTEXT_INTERACTIVE if interactive else GetSyncIqProtocolEntity.CONTEXT_REGISTRATION
|
||||||
|
iq = GetSyncIqProtocolEntity(contacts, mode, context)
|
||||||
|
self.sendIq(iq)
|
||||||
|
|
||||||
def requestLastSeen(self, phoneNumber, success = None, failure = None):
|
def requestLastSeen(self, phoneNumber, success = None, failure = None):
|
||||||
"""
|
"""
|
||||||
Requests when user was last seen.
|
Requests when user was last seen.
|
||||||
|
@ -219,8 +240,8 @@ class YowsupApp(object):
|
||||||
Requests profile picture of whatsapp user
|
Requests profile picture of whatsapp user
|
||||||
Args:
|
Args:
|
||||||
- phoneNumber: (str) the phone number of the user
|
- phoneNumber: (str) the phone number of the user
|
||||||
- success: (func) called when request is successfully processed.
|
- onSuccess: (func) called when request is successfully processed.
|
||||||
- failure: (func) called when request has failed
|
- onFailure: (func) called when request has failed
|
||||||
"""
|
"""
|
||||||
iq = GetPictureIqProtocolEntity(phoneNumber + '@s.whatsapp.net')
|
iq = GetPictureIqProtocolEntity(phoneNumber + '@s.whatsapp.net')
|
||||||
self.sendIq(iq, onSuccess = onSuccess, onError = onFailure)
|
self.sendIq(iq, onSuccess = onSuccess, onError = onFailure)
|
||||||
|
@ -229,6 +250,18 @@ class YowsupApp(object):
|
||||||
iq = ListGroupsIqProtocolEntity()
|
iq = ListGroupsIqProtocolEntity()
|
||||||
self.sendIq(iq, onSuccess = onSuccess, onError = onFailure)
|
self.sendIq(iq, onSuccess = onSuccess, onError = onFailure)
|
||||||
|
|
||||||
|
def requestGroupInfo(self, group, onSuccess = None, onFailure = None):
|
||||||
|
"""
|
||||||
|
Request info on a specific group (includes participants, subject, owner etc.)
|
||||||
|
|
||||||
|
Args:
|
||||||
|
- group: (str) the group id in the form of xxxxxxxxx-xxxxxxxx
|
||||||
|
- onSuccess: (func) called when request is successfully processed.
|
||||||
|
- onFailure: (func) called when request is has failed
|
||||||
|
"""
|
||||||
|
iq = InfoGroupsIqProtocolEntity(group + '@g.us')
|
||||||
|
self.sendIq(iq, onSuccess = onSuccess, onError = onFailure)
|
||||||
|
|
||||||
def onAuthSuccess(self, status, kind, creation, expiration, props, nonce, t):
|
def onAuthSuccess(self, status, kind, creation, expiration, props, nonce, t):
|
||||||
"""
|
"""
|
||||||
Called when login is successful.
|
Called when login is successful.
|
||||||
|
@ -362,6 +395,15 @@ class YowsupApp(object):
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def onLocation(self, entity):
|
||||||
|
"""
|
||||||
|
Called when location message is received
|
||||||
|
|
||||||
|
Args:
|
||||||
|
- entity: LocationMediaMessageProtocolEntity
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant):
|
def onVCard(self, _id, _from, name, card_data, to, notify, timestamp, participant):
|
||||||
"""
|
"""
|
||||||
Called when VCard message is received
|
Called when VCard message is received
|
||||||
|
@ -508,6 +550,8 @@ class YowsupAppLayer(YowInterfaceLayer):
|
||||||
entity.timestamp,
|
entity.timestamp,
|
||||||
entity.participant
|
entity.participant
|
||||||
)
|
)
|
||||||
|
elif isinstance(entity, LocationMediaMessageProtocolEntity):
|
||||||
|
self.caller.onLocation(entity)
|
||||||
|
|
||||||
@ProtocolEntityCallback('presence')
|
@ProtocolEntityCallback('presence')
|
||||||
def onPresenceReceived(self, presence):
|
def onPresenceReceived(self, presence):
|
||||||
|
|
Loading…
Reference in a new issue