diff mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua @ 6357:f24ff3e6e180

mod_pubsub_serverinfo: Some minor style/code tidying
author Matthew Wild <mwild1@gmail.com>
date Wed, 14 Jan 2026 13:55:36 +0000
parents a115f6a68d33
children de2651ba8bae
line wrap: on
line diff
--- a/mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua	Wed Jan 14 13:54:26 2026 +0000
+++ b/mod_pubsub_serverinfo/mod_pubsub_serverinfo.lua	Wed Jan 14 13:55:36 2026 +0000
@@ -39,7 +39,7 @@
 		end
 	):catch(
 		function(error)
-			module:log("warn", "Error prevented discovery or creation of pub/sub node at %s: %s", service, error)
+			module:log("warn", "Error prevented discovery or creation of pubsub node at %s: %s", service, error)
 		end
 	)
 
@@ -69,7 +69,7 @@
 	local request = st.iq({ type = "get", to = service, from = actor, id = new_id() })
 		:tag("query", { xmlns = "http://jabber.org/protocol/disco#items" })
 
-	module:log("debug", "Sending request to discover existence of pub/sub node '%s' at %s", node, service)
+	module:log("debug", "Sending request to discover existence of pubsub node '%s' at %s", node, service)
 	return module:send_iq(request):next(
 		function(response)
 			if response.stanza == nil or response.stanza.attr.type ~= "result" then
@@ -81,12 +81,12 @@
 			if query ~= nil then
 				for item in query:childtags("item") do
 					if item.attr.jid == service and item.attr.node == node then
-						module:log("debug", "pub/sub node '%s' at %s does exist.", node, service)
+						module:log("debug", "pubsub node '%s' at %s does exist.", node, service)
 						return true
 					end
 				end
 			end
-			module:log("debug", "pub/sub node '%s' at %s does not exist.", node, service)
+			module:log("debug", "pubsub node '%s' at %s does not exist.", node, service)
 			return false;
 		end
 	);
@@ -108,14 +108,14 @@
 					:tag("field", { var = "pubsub#persist_items" })
 						:text_tag("value", persist_items and "1" or "0")
 
-	module:log("debug", "Sending request to create pub/sub node '%s' at %s", node, service)
+	module:log("debug", "Sending request to create pubsub node '%s' at %s", node, service)
 	return module:send_iq(request):next(
 		function(response)
 			if response.stanza == nil or response.stanza.attr.type ~= "result" then
-				module:log("warn", "Unexpected response to pub/sub node '%s' creation request at %s: %s", node, service, response.stanza)
+				module:log("warn", "Unexpected response to pubsub node '%s' creation request at %s: %s", node, service, response.stanza)
 				return false
 			else
-				module:log("debug", "Successfully created pub/sub node '%s' at %s", node, service)
+				module:log("debug", "Successfully created pubsub node '%s' at %s", node, service)
 				return true
 			end
 		end
@@ -128,14 +128,14 @@
 		:tag("pubsub", { xmlns = xmlns_pubsub })
 			:tag("delete", { node = node, xmlns = xmlns_pubsub });
 
-	module:log("debug", "Sending request to delete pub/sub node '%s' at %s", node, service)
+	module:log("debug", "Sending request to delete pubsub node '%s' at %s", node, service)
 	return module:send_iq(request):next(
 		function(response)
 			if response.stanza == nil or response.stanza.attr.type ~= "result" then
-				module:log("warn", "Unexpected response to pub/sub node '%s' deletion request at %s: %s", node, service, response.stanza)
+				module:log("warn", "Unexpected response to pubsub node '%s' deletion request at %s: %s", node, service, response.stanza)
 				return false
 			else
-				module:log("debug", "Successfully deleted pub/sub node '%s' at %s", node, service)
+				module:log("debug", "Successfully deleted pubsub node '%s' at %s", node, service)
 				return true
 			end
 		end
@@ -157,10 +157,9 @@
 	end
 
 	-- At an earlier stage, the code iterated over all prosody.hosts, trying to generate one pubsub item for all local hosts. That turned out to be
-	-- to noisy. Instead, this code now creates an item that includes the local vhost only. It is assumed that this module will also be loaded for
-	-- other vhosts. Their data should then be published to distinct pub/sub services and nodes.
+	-- too noisy. Instead, this code now creates an item that includes the local vhost only. It is assumed that this module will also be loaded for
+	-- other vhosts. Their data should then be published to distinct pubsub services and nodes.
 
-	-- for host, data in pairs(prosody.hosts) do
 	local host = local_domain
 	local data = prosody.hosts[host]
 	if data ~= nil then
@@ -242,7 +241,7 @@
 			end
 		end,
 		function(error)
-			module:log("warn", "Error prevented publication of item on pub/sub node at %s: %s", service, error)
+			module:log("warn", "Error prevented publication of item on pubsub node at %s: %s", service, error)
 		end
 	)