prosody-modules: mod_http_admin_api/mod_http_admin

mod_http_admin_api: do not report OMEMO as ok if no devices exist

author	Jonas Schäfer <jonas@wielicki.name>
date	Thu, 21 Jan 2021 16:18:14 +0100
parents	f975a4d31f35
children	e0c8d866d58c

comparison

equal deleted inserted replaced

-:f975a4d31f35
+:83370df0ce4a
 	return info;
 end
 local function get_user_omemo_info(username)
 	local everything_valid = true;
+	local any_device = false;
 	local omemo_status = {};
 	local omemo_devices;
 	local pep_service = mod_pep.get_pep_service(username);
 	if pep_service and pep_service.nodes then
 		local ok, _, device_list = pep_service:get_last_item("eu.siacs.conversations.axolotl.devicelist", true);
 			device_list = device_list:get_child("list", "eu.siacs.conversations.axolotl");
 		end
 		if device_list then
 			omemo_devices = {};
 			for device_entry in device_list:childtags("device") do
+				any_device = true;
 				local device_info = {};
 				local device_id = tonumber(device_entry.attr.id or "");
 				if device_id then
 					device_info.id = device_id;
 					local bundle_id = ("eu.siacs.conversations.axolotl.bundles:%d"):format(device_id);
 				omemo_status.config_valid = false;
 				everything_valid = false;
 			end
 		end
 	end
-	omemo_status.valid = everything_valid;
+	omemo_status.valid = everything_valid and any_device;
 	return {
 		status = omemo_status;
 		devices = omemo_devices;
 	};
 end

Mercurial > prosody-modules