diff options
| author | mrDoctorWho <mrdoctorwho@gmail.com> | 2015-03-25 12:41:04 +0300 |
|---|---|---|
| committer | mrDoctorWho <mrdoctorwho@gmail.com> | 2015-03-25 12:41:04 +0300 |
| commit | 911b643cad2168e60d3e88056910a363dfb8a900 (patch) | |
| tree | 01fa6b8e72c562df68471eb191dcf5559f70bcb9 /modules/mod_msg_main.py | |
| parent | 3eddda3cef4d2a95a149a11bb1933c96065f403d (diff) | |
Fixed order in groupchat and personal messages
Fixed user deletion in user_activity
Fixed a typo in groupchats.py
Diffstat (limited to 'modules/mod_msg_main.py')
| -rw-r--r-- | modules/mod_msg_main.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/mod_msg_main.py b/modules/mod_msg_main.py index 335ccd2..e844951 100644 --- a/modules/mod_msg_main.py +++ b/modules/mod_msg_main.py @@ -68,7 +68,8 @@ def message_handler_threaded(cl, msg): if msg.getTag("composing"): target = vk2xmpp(destination) if target != TransportID: - user.vk.method("messages.setActivity", {"user_id": target, "type": "typing"}, True) + with user.sync: + user.vk.method("messages.setActivity", {"user_id": target, "type": "typing"}, True) if body: answer = None @@ -83,9 +84,9 @@ def message_handler_threaded(cl, msg): else: uID = jidTo.getNode() - vkMessage = user.vk.sendMessage(body, uID) - if vkMessage: - answer = reportReceived(msg, jidFrom, jidTo) + with user.sync: + if user.vk.sendMessage(body, uID): + answer = reportReceived(msg, jidFrom, jidTo) if answer: sender(cl, answer) executeHandlers("msg02", (msg,)) |