Module:Reply to and Module:Reply to/sandbox: Difference between pages

Content deleted Content added

@@ Line 4: / Line 4: @@
 	msg ='Error in [[Template:Reply to]]: ' .. msg
 	return mw.text.tag('strong', {['class']='error'}, msg)
+end
+local function makeLink(u, l)
+	return '[[User:' .. u .. '|' .. (l or u) .. ']]'
 end
 function p.replyto(frame)
+	local outArray, argIndex = {}, {}
-	local origArgs = frame:getParent().args
-	local args = {}
+	local args = frame:getParent().args
+	args.label1 = args.label1 or args.label
-	local maxArg = 1
-	local usernames = 0
-	for k, v in pairs(origArgs) do
+	for k, v in pairs(args) do
-		if type(k) == 'number' then
+		if type(k) == 'number' and string.match(v,'%S') then
+			table.insert(argIndex, k)
-			if mw.ustring.match(v,'%S') then
-				if k > maxArg then maxArg = k end
-				usernames = usernames + 1
-				local title = mw.title.new(v)
-				if not title then return makeError('Input contains forbidden characters.') end
-				args[k] = title.rootText
-			end
-		elseif v == '' and k:sub(0,5) == 'label' then
-			args[k] = '&#x200B;'
-		else
-			args[k] = v
 		end
+	end
+	table.sort(argIndex)
+	for _, k in ipairs(argIndex) do
+		local title = mw.title.new(args[k])
+		if not title then return makeError('Input contains forbidden characters.') end
+		title = title.rootText
+		local label = args['label'..tostring(k)]
+		if label == '' then label = '&#x200B;' end
+		table.insert( outArray, makeLink(title, label) )
 	end
-	if usernames > (tonumber(frame.args.max) or 50) then
+	if #outArray > (tonumber(frame.args.max) or 50) then
-		return makeError(string.format(
+		return makeError('More than ' .. tostring(frame.args.max or 50) .. ' names specified.')
+	end
-			'More than %s names specified.',
+	if #outArray < 1 then
-			tostring(frame.args.max or 50)
+		if frame.args.example then
-		))
+			outArray[1] = makeLink(frame.args.example)
-	else
+		else
-		if usernames < 1 then
-			if frame.args.example then args[1] = frame.args.example else return makeError('Username not given.') end
+			return makeError('Username not given.')
 		end
-		args['label1'] = args['label1'] or args['label']
-		local isfirst = true
-		local outStr = args['prefix'] or '@'
-		for i = 1, maxArg do
-			if args[i] then
-				if isfirst then
-					isfirst = false
-				else
-					if ( (usernames > 2) or ((usernames == 2) and (args['c'] == '')) ) then outStr = outStr..', ' end
-					if i == maxArg then outStr = outStr..' '..(args['c'] or 'and') .. ' ' end
-				end
-				outStr = string.format(
-					'%s[[User:%s|%s]]',
-					outStr,
-					args[i],
-					args['label'..tostring(i)] or args[i]
-				)
-			end
-		end
-		outStr = outStr..(args['p'] or ':')
-		return mw.text.tag('span', {['class']='template-ping'}, outStr)
 	end
+	local conjuction = (#outArray == 2 and ' ' or ', ') .. (args.c or 'and') .. ' '
+	local outStr = (args.c == '') and table.concat(outArray, ', ') or mw.text.listToText(outArray, ', ', conjuction)
+	return mw.text.tag('span', {['class']='template-ping'}, (args.prefix or '@') .. outStr .. (args.p or ':'))
 end