# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1739544889 0
# Node ID 758818e21e0159e06f4b6d93be9230c6c1142aa5
# Parent  8c0db1524dd9815d7f0e55d70ff045fe5dd1a659# Parent  a727ea7a68ebbb6052ff3434664d591dc844d7f4
Merge 13.0->trunk

diff -r 8c0db1524dd9 -r 758818e21e01 CHANGES
--- a/CHANGES	Thu Feb 13 18:01:43 2025 +0000
+++ b/CHANGES	Fri Feb 14 14:54:49 2025 +0000
@@ -82,6 +82,7 @@
 - Support for the roster *group* access_model in mod_pep
 - Support for systemd socket activation in server_epoll
 - mod_invites_adhoc gained a command for creating password resets
+- mod_cloud_notify imported from community modules for push notification support
 
 ## Removed
 
diff -r 8c0db1524dd9 -r 758818e21e01 net/httpserver.lua
--- a/net/httpserver.lua	Thu Feb 13 18:01:43 2025 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
--- COMPAT w/pre-0.9
-local log = require "prosody.util.logger".init("net.httpserver");
-local traceback = debug.traceback;
-
-local _ENV = nil;
--- luacheck: std none
-
-local function fail()
-	log("error", "Attempt to use legacy HTTP API. For more info see https://prosody.im/doc/developers/legacy_http");
-	log("error", "Legacy HTTP API usage, %s", traceback("", 2));
-end
-
-return {
-	new = fail;
-	new_from_config = fail;
-	set_default_handler = fail;
-};
diff -r 8c0db1524dd9 -r 758818e21e01 plugins/muc/hats.lib.lua
--- a/plugins/muc/hats.lib.lua	Thu Feb 13 18:01:43 2025 +0000
+++ b/plugins/muc/hats.lib.lua	Fri Feb 14 14:54:49 2025 +0000
@@ -1,7 +1,7 @@
 local st = require "prosody.util.stanza";
 local muc_util = module:require "muc/util";
 
-local hats_compat = module:get_option_boolean("muc_hats_compat", true); -- COMPAT for pre-XEP namespace, TODO reconsider default for next release
+local hats_compat = module:get_option_boolean("muc_hats_compat", false); -- COMPAT for pre-XEP namespace
 
 local xmlns_hats_legacy = "xmpp:prosody.im/protocol/hats:1";
 local xmlns_hats = "urn:xmpp:hats:0";
diff -r 8c0db1524dd9 -r 758818e21e01 prosody.cfg.lua.dist
--- a/prosody.cfg.lua.dist	Thu Feb 13 18:01:43 2025 +0000
+++ b/prosody.cfg.lua.dist	Fri Feb 14 14:54:49 2025 +0000
@@ -9,6 +9,8 @@
 -- If there are any errors, it will let you know what and where
 -- they are, otherwise it will keep quiet.
 --
+-- Upgrading from a previous release? Check https://prosody.im/doc/upgrading
+--
 -- The only thing left to do is rename this file to remove the .dist ending, and fill in the
 -- blanks. Good luck, and happy Jabbering!
 
@@ -51,6 +53,8 @@
 		"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
 
 	-- Nice to have
+		"account_activity"; -- Record time when an account was last used
+		"cloud_notify"; -- Push notifications for mobile devices
 		"csi_simple"; -- Simple but effective traffic optimizations for mobile devices
 		"invites"; -- Create and manage invites
 		"invites_adhoc"; -- Allow admins/users to create invitations via their client
@@ -75,7 +79,6 @@
 	-- Other specific functionality
 		--"announce"; -- Send announcement to all online users
 		--"groups"; -- Shared roster support
-		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 		--"mimicking"; -- Prevent address spoofing
 		--"motd"; -- Send a message to users when they log in
 		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
@@ -92,7 +95,6 @@
 	-- "offline"; -- Store offline messages
 	-- "c2s"; -- Handle client connections
 	-- "s2s"; -- Handle server-to-server connections
-	-- "posix"; -- POSIX functionality, sends server to background, etc.
 }