From 1a0df81387903d1c731d29e802ac52d1ad29f1ad Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 4 Oct 2020 18:00:32 +0200 Subject: MUC: Correct advertising of subject write access (really fixes #1155) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks pep. and lovetox XEP-0045 ยง6.4: > any field defined for the muc\#roomconfig FORM_TYPE can be included in > the extended service discovery fields Probably happened because the same mistake is in #1155 --- plugins/muc/subject.lib.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua index 938abf61..14256bbc 100644 --- a/plugins/muc/subject.lib.lua +++ b/plugins/muc/subject.lib.lua @@ -31,10 +31,10 @@ end module:hook("muc-disco#info", function (event) table.insert(event.form, { - name = "muc#roominfo_changesubject"; + name = "muc#roomconfig_changesubject"; type = "boolean"; }); - event.formdata["muc#roominfo_changesubject"] = get_changesubject(event.room); + event.formdata["muc#roomconfig_changesubject"] = get_changesubject(event.room); end); module:hook("muc-config-form", function(event) -- cgit v1.2.3 From c91cc915b61f11526e99bf16910d3ecba923c1a8 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 5 Oct 2020 22:12:29 +0200 Subject: util.dependencies: Check for bitop library same way as net.websocket.frames (fixes #1594) --- util/dependencies.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/dependencies.lua b/util/dependencies.lua index 7c7b938e..24975567 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -90,7 +90,7 @@ local function check_dependencies() }, "SSL/TLS support will not be available"); end - local bit = _G.bit32 or softreq"bit"; + local bit = softreq"bit" or softreq"bit32"; if not bit then missingdep("lua-bitops", { -- cgit v1.2.3