verse
96efa9ee8f18%3A386920f05808
Software / code / verse
Changeset
148:386920f05808
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 11 Oct 2010 02:03:32 +0100 |
| parents | 147:c95b84ed366b (diff) 145:96efa9ee8f18 (current diff) |
| children | 149:f5c524412939 |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/disco.lua Tue Sep 21 14:06:56 2010 +0100 +++ b/plugins/disco.lua Mon Oct 11 02:03:32 2010 +0100 @@ -356,11 +356,14 @@ initial_disco_started = true; stream:disco_local_services(function (services) for _, service in ipairs(services) do - for identity in pairs(stream.disco.cache[service.jid].identities) do - local category, type = identity:match("^(.*)/(.*)$"); - stream:event("disco/service-discovered/"..category, { - type = type, jid = service.jid; - }); + local service_disco_info = stream.disco.cache[service.jid]; + if service_disco_info then + for identity in pairs(service_disco_info.identities) do + local category, type = identity:match("^(.*)/(.*)$"); + stream:event("disco/service-discovered/"..category, { + type = type, jid = service.jid; + }); + end end end stream:event("ready");
--- a/plugins/ping.lua Tue Sep 21 14:06:56 2010 +0100 +++ b/plugins/ping.lua Mon Oct 11 02:03:32 2010 +0100 @@ -1,5 +1,3 @@ -require "util.xstanza"; - local xmlns_ping = "urn:xmpp:ping"; function verse.plugins.ping(stream)
--- a/plugins/sasl.lua Tue Sep 21 14:06:56 2010 +0100 +++ b/plugins/sasl.lua Mon Oct 11 02:03:32 2010 +0100 @@ -1,5 +1,4 @@ local st = require "util.stanza"; -local stx = require "util.xstanza"; local base64 = require "mime".b64; local xmlns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";
--- a/squishy Tue Sep 21 14:06:56 2010 +0100 +++ b/squishy Mon Oct 11 02:03:32 2010 +0100 @@ -4,7 +4,6 @@ Module "util.encodings" "libs/encodings.lua" Module "util.hashes" "libs/hashes.lua" Module "util.logger" "libs/logger.lua" -Module "util.xstanza" "libs/xstanza.lua" Module "util.sha1" "util/sha1.lua" Module "lib.adhoc" "libs/adhoc.lib.lua"
