Stefan-Sanger
26e7512b24
Bump Dockerfile to prosody-13.0.6; all 8 patches re-ported against 13.0.6. Re-ported patches (3 changed, 5 applied with offset): - hidden.lib.patch: 13.0 uses module:may() instead of um_is_admin; changed to 'if restrict_public then' (same intent: hide option for everyone) - mod_muc.patch: 13.0 added restrict_pm between register and presence_broadcast; updated hunk 1 context - mod_muc_unique.patch: 13.0 uses 'require "prosody.util.stanza"' (namespaced); updated context - muc.lib, mod_carbons, mod_mam, mod_muc_mam, register.lib: applied with line offsets, no re-port needed Config changes: - Remove mod_posix from modules_enabled (13.0 absorbed signal handling, pidfile, and run_as_root check into core util/startup.lua) - Move pubsub from modules_enabled to Component (13.0 requires pubsub to be loaded as a component, not a module) Test fix: - test_muc_fcm_push_to_offline_member: wait for count=2 captures instead of 1 — mod_vnc_muc_fcm pushes to ALL affiliated members (including sender, because it can't see main-host sessions from the MUC component); the test was racing on which push arrived first Verified: prosodyctl check config passes; compose-harness testsuite green (80 passed, 6 skipped, 0 failed). Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
19 lines
891 B
Diff
19 lines
891 B
Diff
--- a/plugins/muc/mod_muc.lua
|
|
+++ b/plugins/muc/mod_muc.lua
|
|
@@ -87,6 +87,7 @@
|
|
room_mt.get_registered_nick = register.get_registered_nick;
|
|
room_mt.get_registered_jid = register.get_registered_jid;
|
|
room_mt.handle_register_iq = register.handle_register_iq;
|
|
+room_mt.handle_unregister_iq = register.handle_unregister_iq;
|
|
|
|
local restrict_pm = module:require "muc/restrict_pm";
|
|
room_mt.get_allow_pm = restrict_pm.get_allow_pm;
|
|
@@ -461,6 +462,7 @@
|
|
["message/bare"] = "handle_message_to_room" ;
|
|
["presence/bare"] = "handle_presence_to_room" ;
|
|
["iq/bare/jabber:iq:register:query"] = "handle_register_iq";
|
|
+ ["iq-set/bare/xmpp:vnctalk:unregister:query"] = "handle_unregister_iq";
|
|
-- Host room
|
|
["iq-get/host/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
|
|
["iq-get/host/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
|