MUC: Reuse the same dataform for voice requests

1 files changed, 7 insertions, 36 deletions

diff --git a/plugins/muc/moderated.lib.lua b/plugins/muc/moderated.lib.lua
index 4d060a9d..c6ccc771 100644
--- a/plugins/muc/moderated.lib.lua
+++ b/plugins/muc/moderated.lib.lua
@@ -8,8 +8,6 @@
 --
 
 local st = require "util.stanza";
-local dataform = require "util.dataforms";
-
 
 local function get_moderated(room)
 	return room._data.moderated;
@@ -51,40 +49,13 @@ end, 1);
 
 module:hook("muc-voice-request", function(event)
 	if event.occupant.role == "visitor" then
-		local form = dataform.new({
-			title = "Voice Request";
-			{
-				name = "FORM_TYPE";
-				type = "hidden";
-				value = "http://jabber.org/protocol/muc#request";
-			},
-			{
-				name = "muc#role";
-				type = "text-single";
-				label = "Requested Role";
-				value = "participant";
-			},
-			{
-				name = "muc#jid";
-				type = "jid-single";
-				label = "User ID";
-				value = event.stanza.attr.from;
-			},
-			{
-				name = "muc#roomnick";
-				type = "text-single";
-				label = "Room Nickname";
-				value = event.occupant.nick;
-			},
-			{
-				name = "muc#request_allow";
-				type = "boolean";
-				label = "Grant voice to this person?";
-				value = false;
-			}
-		});
-
-		local message = st.message({ type = "normal"; from = event.room.jid }):add_child(form:form()):up();
+		local form = event.room:get_voice_form_layout()
+		local formdata = {
+			["muc#jid"] = event.stanza.attr.from;
+			["muc#roomnick"] = event.occupant.nick;
+		};
+
+		local message = st.message({ type = "normal"; from = event.room.jid }):add_child(form:form(formdata)):up();
 
 		event.room:broadcast(message, function (_, occupant)
 			return occupant.role == "moderator";