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

fix presence

This commit is contained in:
DaZZZl 2015-11-10 17:04:20 +01:00
parent bcd5e7e541
commit f269bf5be7
3 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bot.py
View File

@ -72,7 +72,7 @@ class Bot():
spec = inspect.getargspec(func) spec = inspect.getargspec(func)
maxs = len(spec.args) - 1 maxs = len(spec.args) - 1
reqs = maxs - len(spec.defaults or []) reqs = maxs - len(spec.defaults or [])
if reqs > len(args) > maxs: if (reqs > len(args)) or (len(args) > maxs):
raise TypeError() raise TypeError()
thread = threading.Thread(target=func, args=tuple(args)) thread = threading.Thread(target=func, args=tuple(args))
@ -205,7 +205,7 @@ following user commands are available:
except KeyError: except KeyError:
nick = buddy nick = buddy
self.send(self.session.groups[group].id + self.session.backend.spectrum_jid + " " + self.session.groups[group].subject + " Owner: " + nick ) self.send(self.session.groups[group].id + "@" + self.session.backend.spectrum_jid + " " + self.session.groups[group].subject + " Owner: " + nick )
def _getgroups(self): def _getgroups(self):
#self.session.call("group_getGroups", ("participating",)) #self.session.call("group_getGroups", ("participating",))
self.session.requestGroupsList(self.session._updateGroups) self.session.requestGroupsList(self.session._updateGroups)

2
buddy.py
View File

@ -59,6 +59,8 @@ class Buddy():
self.groups = groups self.groups = groups
self.image_hash = image_hash self.image_hash = image_hash
self.statusMsg = "" self.statusMsg = ""
self.lastseen = 0
self.presence = 0
def update(self, nick, groups, image_hash): def update(self, nick, groups, image_hash):

87
session.py
View File

@ -484,47 +484,41 @@ class Session(YowsupApp):
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]
# seems to be causing an error try:
# self.logger.info("Lastseen: %s %s", buddy, utils.ago(lastseen)) buddy = self.buddies[buddy]
if lastseen != None and lastseen != "deny": except KeyError:
#lastseen = int(TimeTools.utcTimestamp()) - int(lastseen) self.logger.error("Buddy not found: %s", buddy)
try: return
lastseen=time.time() - int(lastseen) if (lastseen == str(buddy.lastseen)) and (_type == buddy.presence):
except ValueError: return
lastseen = -1
else: if ((lastseen != "deny") and (lastseen != None) and (lastseen != "none")):
lastseen = -1 buddy.lastseen = int(lastseen)
if (_type == None):
buddy.lastseen = time.time()
if buddy in self.presenceRequested: buddy.presence = _type
timestamp = time.localtime(time.time() - lastseen)
timestring = time.strftime("%a, %d %b %Y %H:%M:%S", timestamp)
self.sendMessageToXMPP(buddy, "%s (%s)" % (timestring, utils.ago(lastseen)))
self.presenceRequested.remove(buddy)
if (lastseen < 60) and (lastseen >= 0): timestamp = time.localtime(buddy.lastseen)
self.onPresenceAvailable(buddy) statusmsg = buddy.statusMsg + time.strftime("\n Last seen: %a, %d %b %Y %H:%M:%S", timestamp)
if _type == "unavailable":
self.onPresenceUnavailable(buddy, statusmsg)
else: else:
self.onPresenceUnavailable(buddy, lastseen) self.onPresenceAvailable(buddy, statusmsg)
def onPresenceAvailable(self, buddy):
try:
buddy = self.buddies[buddy]
self.logger.info("Is available: %s", buddy)
self.backend.handleBuddyChanged(self.user, buddy.number.number,
buddy.nick, buddy.groups, protocol_pb2.STATUS_ONLINE, buddy.statusMsg, buddy.image_hash)
except KeyError:
self.logger.error("Buddy not found: %s", buddy)
def onPresenceUnavailable(self, buddy, lastseen):
try: def onPresenceAvailable(self, buddy, statusmsg):
buddy = self.buddies[buddy] self.logger.info("Is available: %s", buddy)
self.logger.info("Is unavailable: %s", buddy) self.backend.handleBuddyChanged(self.user, buddy.number.number,
statusmsg = buddy.statusMsg + "\n Last seen: " + utils.ago(lastseen) buddy.nick, buddy.groups, protocol_pb2.STATUS_ONLINE, statusmsg, buddy.image_hash)
self.backend.handleBuddyChanged(self.user, buddy.number.number,
def onPresenceUnavailable(self, buddy, statusmsg):
self.logger.info("Is unavailable: %s", buddy)
self.backend.handleBuddyChanged(self.user, buddy.number.number,
buddy.nick, buddy.groups, protocol_pb2.STATUS_AWAY, statusmsg, buddy.image_hash) buddy.nick, buddy.groups, protocol_pb2.STATUS_AWAY, statusmsg, buddy.image_hash)
except KeyError:
self.logger.error("Buddy not found: %s", buddy)
# spectrum RequestMethods # spectrum RequestMethods
def sendTypingStarted(self, buddy): def sendTypingStarted(self, buddy):
@ -557,7 +551,8 @@ class Session(YowsupApp):
buddy3.nick) buddy3.nick)
if buddy3.nick == nick: if buddy3.nick == nick:
nick = buddy nick = buddy
self.sendTextMessage(nick + '@s.whatsapp.net', message) waId = self.sendTextMessage(nick + '@s.whatsapp.net', message)
self.msgIDs[waId] = MsgIDs( ID, waId)
else: else:
room = sender room = sender
try: try:
@ -570,10 +565,10 @@ class Session(YowsupApp):
except KeyError: except KeyError:
self.logger.error('Group not found: %s', room) self.logger.error('Group not found: %s', room)
if (".jpg" in message) or (".webp" in message): if (".jpg" in message.lower()) or (".webp" in message.lower()):
if (".jpg" in message): if (".jpg" in message.lower()):
self.imgType = "jpg" self.imgType = "jpg"
if (".webp" in message): if (".webp" in message.lower()):
self.imgType = "webp" self.imgType = "webp"
self.imgMsgId = ID self.imgMsgId = ID
self.imgBuddy = room + "@g.us" self.imgBuddy = room + "@g.us"
@ -582,7 +577,7 @@ class Session(YowsupApp):
downloader.download(message) downloader.download(message)
#self.imgMsgId = ID #self.imgMsgId = ID
#self.imgBuddy = room + "@g.us" #self.imgBuddy = room + "@g.us"
elif "geo:" in message: elif "geo:" in message.lower():
self._sendLocation(room + "@g.us", message, ID) self._sendLocation(room + "@g.us", message, ID)
else: else:
@ -593,22 +588,22 @@ class Session(YowsupApp):
# if message == "\\lastseen": # if message == "\\lastseen":
# self.call("presence_request", buddy = (buddy + "@s.whatsapp.net",)) # self.call("presence_request", buddy = (buddy + "@s.whatsapp.net",))
# else: # else:
if message == "\\lastseen": if message.split(" ").pop(0) == "\\lastseen":
self.presenceRequested.append(buddy) self.presenceRequested.append(buddy)
#self.call("presence_request", (buddy + "@s.whatsapp.net",)) #self.call("presence_request", (buddy + "@s.whatsapp.net",))
self._requestLastSeen(buddy) self._requestLastSeen(buddy)
elif message == "\\gpp": elif message.split(" ").pop(0) == "\\gpp":
self.logger.info("Get Profile Picture! ") self.logger.info("Get Profile Picture! ")
self.sendMessageToXMPP(buddy, "Fetching Profile Picture") self.sendMessageToXMPP(buddy, "Fetching Profile Picture")
#self.call("contact_getProfilePicture", (buddy + "@s.whatsapp.net",)) #self.call("contact_getProfilePicture", (buddy + "@s.whatsapp.net",))
self.requestVCard(buddy) self.requestVCard(buddy)
else: else:
if (".jpg" in message) or (".webp" in message): if (".jpg" in message.lower()) or (".webp" in message.lower()):
#waId = self.call("message_imageSend", (buddy + "@s.whatsapp.net", message, None, 0, None)) #waId = self.call("message_imageSend", (buddy + "@s.whatsapp.net", message, None, 0, None))
#waId = self.call("message_send", (buddy + "@s.whatsapp.net", message)) #waId = self.call("message_send", (buddy + "@s.whatsapp.net", message))
if (".jpg" in message): if (".jpg" in message.lower()):
self.imgType = "jpg" self.imgType = "jpg"
if (".webp" in message): if (".webp" in message.lower()):
self.imgType = "webp" self.imgType = "webp"
self.imgMsgId = ID self.imgMsgId = ID
self.imgBuddy = buddy + "@s.whatsapp.net" self.imgBuddy = buddy + "@s.whatsapp.net"
@ -617,7 +612,7 @@ class Session(YowsupApp):
downloader.download(message) downloader.download(message)
#self.imgMsgId = ID #self.imgMsgId = ID
#self.imgBuddy = buddy + "@s.whatsapp.net" #self.imgBuddy = buddy + "@s.whatsapp.net"
elif "geo:" in message: elif "geo:" in message.lower():
self._sendLocation(buddy + "@s.whatsapp.net", message, ID) self._sendLocation(buddy + "@s.whatsapp.net", message, ID)
else: else:
waId = self.sendTextMessage(sender + '@s.whatsapp.net', message) waId = self.sendTextMessage(sender + '@s.whatsapp.net', message)
@ -629,7 +624,7 @@ class Session(YowsupApp):
def _requestLastSeen(self, buddy): def _requestLastSeen(self, buddy):
def onSuccess(buddy, lastseen): def onSuccess(buddy, lastseen):
timestamp = time.localtime(time.time()-(lastseen/60)) timestamp = time.localtime(time.localtime()-lastseen)
timestring = time.strftime("%a, %d %b %Y %H:%M:%S", timestamp) 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),str(lastseen)))
def onError(errorIqEntity, originalIqEntity): def onError(errorIqEntity, originalIqEntity):