Mercurial > prosody-modules
comparison mod_conversejs/mod_conversejs.lua @ 2702:caabb980d1d8
Merge commit
author | tmolitor <thilo@eightysoft.de> |
---|---|
date | Mon, 24 Apr 2017 20:57:23 +0200 |
parents | 38c66b58b470 |
children | 0ea93da47db9 |
comparison
equal
deleted
inserted
replaced
2701:d96831e46b64 | 2702:caabb980d1d8 |
---|---|
24 return template:format(json_encode({ | 24 return template:format(json_encode({ |
25 -- debug = true, | 25 -- debug = true, |
26 bosh_service_url = module:http_url("bosh","/http-bind"); | 26 bosh_service_url = module:http_url("bosh","/http-bind"); |
27 websocket_url = has_ws and module:http_url("websocket","xmpp-websocket"):gsub("^http", "ws") or nil; | 27 websocket_url = has_ws and module:http_url("websocket","xmpp-websocket"):gsub("^http", "ws") or nil; |
28 authentication = module:get_option_string("authentication") == "anonymous" and "anonymous" or "login"; | 28 authentication = module:get_option_string("authentication") == "anonymous" and "anonymous" or "login"; |
29 jid = module.host; | |
29 })); | 30 })); |
30 end; | 31 end; |
31 } | 32 } |
32 }); | 33 }); |
33 | 34 |