# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1603376889 -3600
# Node ID 4300839a28ca4bca5eee7c7eb250eed26ed6ca0e
# Parent  5c77923ec1d980ea2e39c6ab4ac086fb3cfc8886# Parent  bde804b01f28b27da2db8085f9de79866408a101
Merge

diff -r bde804b01f28 -r 4300839a28ca client.lua
--- a/client.lua	Mon Dec 24 17:35:07 2018 +0100
+++ b/client.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -3,7 +3,6 @@
 
 local jid_split = require "util.jid".split;
 local adns = require "net.adns";
-local lxp = require "lxp";
 local st = require "util.stanza";
 
 -- Shortcuts to save having to load util.stanza
diff -r bde804b01f28 -r 4300839a28ca doc/example.lua
--- a/doc/example.lua	Mon Dec 24 17:35:07 2018 +0100
+++ b/doc/example.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -5,7 +5,7 @@
 -- handy if you're hacking on Verse itself
 --os.execute("squish --minify-level=none verse");
 
-require "verse".init("client");
+local verse = require "verse".init("client");
 
 c = verse.new();
 c:add_plugin("version");
diff -r bde804b01f28 -r 4300839a28ca libs/encodings.lua
--- a/libs/encodings.lua	Mon Dec 24 17:35:07 2018 +0100
+++ b/libs/encodings.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -6,7 +6,11 @@
 
 module "encodings"
 
+idna = {};
 stringprep = {};
 base64 = { encode = mime.b64, decode = mime.unb64 };
+utf8 = {
+	valid = (utf8 and utf8.len) and function (s) return not not utf8.len(s); end or function () return true; end;
+};
 
 return _M;
diff -r bde804b01f28 -r 4300839a28ca plugins/disco.lua
--- a/plugins/disco.lua	Mon Dec 24 17:35:07 2018 +0100
+++ b/plugins/disco.lua	Thu Oct 22 15:28:09 2020 +0100
@@ -328,9 +328,8 @@
 	end, 50);
 
 	stream:hook("presence-out", function (presence)
-		if not presence:get_child("c", xmlns_caps) then
-			presence:reset():add_child(stream:caps()):reset();
-		end
+		presence:remove_children("c", xmlns_caps);
+		presence:reset():add_child(stream:caps()):reset();
 	end, 10);
 end
 
diff -r bde804b01f28 -r 4300839a28ca squishy
--- a/squishy	Mon Dec 24 17:35:07 2018 +0100
+++ b/squishy	Thu Oct 22 15:28:09 2020 +0100
@@ -73,6 +73,7 @@
 Module "util.http" "util/http.lua"
 Module "net.http.parser" "net/http/parser.lua"
 Module "net.http" "net/http.lua"
+Module "util.x509" "util/x509.lua"
 
 Module "verse.bosh" "bosh.lua"