diff options
author | John Smith <mrdoctorwho@gmail.com> | 2015-12-25 21:35:23 +0300 |
---|---|---|
committer | John Smith <mrdoctorwho@gmail.com> | 2015-12-25 21:35:23 +0300 |
commit | fbd3609e174b6fa617727466c55be1540646aab0 (patch) | |
tree | 3fe91ba1d60ff38d300189d9225333bcb1e61f96 /modules/mod_msg_main.py | |
parent | 29c7f04b35330799c28958c0e91189085f4c3694 (diff) |
Add wall name to the wall parser
Add hash attribute to caps (sha-1), plus mod_iq_disco was modified to answer disco requests which are asked with it's node
Move setConfig out of the Chat class
Prevent the user copy (vk ghost) from joining the chat
Prevent inviting the user to the chat if they're already in
Use http://jabber.org/protocol/muc instead of gc-1.0
Fix re-registration without removing the old one
Remove I am a ghost option to not confuse users
Change http links to https ones
Use message type normal when answering to the captcha command
Diffstat (limited to 'modules/mod_msg_main.py')
-rw-r--r-- | modules/mod_msg_main.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/mod_msg_main.py b/modules/mod_msg_main.py index d1c652d..263acd8 100644 --- a/modules/mod_msg_main.py +++ b/modules/mod_msg_main.py @@ -10,6 +10,7 @@ from __main__ import * from __main__ import _ import utils + def reportReceived(msg, jidFrom, jidTo): """ Reports if message is received @@ -42,7 +43,7 @@ def acceptCaptcha(key, source, destination): answer = _("Captcha valid.") sendPresence(source, TransportID, caps=True) - sendMessage(source, destination, answer) + sendMessage(source, destination, answer, mtype="normal") if not valid: executeHandlers("evt04", (user, user.vk.engine.captcha["img"])) @@ -54,7 +55,7 @@ def message_handler(cl, msg): destination = jidTo.getStripped() jidFrom = msg.getFrom() source = jidFrom.getStripped() - + if msg.getType() == "chat" and source in Transport: user = Transport[source] if msg.getTag("composing"): @@ -86,4 +87,5 @@ def message_handler(cl, msg): MOD_TYPE = "message" MOD_FEATURES = [xmpp.NS_RECEIPTS] -MOD_HANDLERS = ((message_handler, "", "", False),)
\ No newline at end of file +MOD_FEATURES_USER = MOD_FEATURES +MOD_HANDLERS = ((message_handler, "", "", False),) |