Module:Reply to - Revision history

Ahecht: cleanup code

2018-07-04T01:38:15Z

cleanup code

← Previous revision		Revision as of 01:38, 4 July 2018
Line 1:		Line 1:
	local p = {}		local p = {}

			local function makeError(msg)
			msg ='Error in [[Template:Reply to]]: ' .. msg
			return mw.text.tag('strong', {['class']='error'}, msg)
			end

	function p.replyto(frame)		function p.replyto(frame)
Line 12:		Line 17:
	usernames = usernames + 1		usernames = usernames + 1
	local title = mw.title.new(v)		local title = mw.title.new(v)
	if not title then return '~~<strong class="error">Error in [[Template:Reply to]]:~~ Input contains forbidden characters.~~</strong>~~' end		if not title then return makeError('Input contains forbidden characters.') end
	args[k] = title.rootText		args[k] = title.rootText
	end		end
Line 23:		Line 28:

	if usernames > (tonumber(frame.args.max) or 50) then		if usernames > (tonumber(frame.args.max) or 50) then
	return string.format(		return makeError(string.format(
	'~~<strong class="error">Error in [[Template:Reply to]]:~~ More than %s names specified.~~</strong>~~',		'More than %s names specified.',
	tostring(frame.args.max or 50)		tostring(frame.args.max or 50)
	)		))
	else		else
	if usernames < 1 then		if usernames < 1 then
	if frame.args.example then args[1] = frame.args.example else return '~~<strong class="error">Error in [[Template:Reply to]]:~~ Username not given.~~</strong>~~' end		if frame.args.example then args[1] = frame.args.example else return makeError('Username not given.') end
	end		end
		⚫	args['label1'] = args['label1'] or args['label']
	local isfirst = true		local isfirst = true
	local outStr = ''		local outStr = args['prefix'] or '@'
	for i = 1, maxArg do		for i = 1, maxArg do
	if args[i] then		if args[i] then
	if isfirst then		if isfirst then
	~~outStr~~ = ~~string.format(~~		isfirst = false
⚫	'~~<span class="template-ping">~~%s[[User:%s\|%s]]',
⚫	args[~~'prefix'~~] ~~or '@'~~,
⚫	~~args[i]~~,
⚫	(args['label1'] or args['~~label~~']) or args[i]
⚫	)
	isfirst = false
	else		else
	if ( (usernames > 2) or ((usernames == 2) and (args['c'] == '')) ) then outStr = outStr..',' end		if ( (usernames > 2) or ((usernames == 2) and (args['c'] == '')) ) then outStr = outStr..', ' end
	if i == maxArg then outStr = outStr..' '..(args['c'] or 'and') end		if i == maxArg then outStr = outStr..' '..(args['c'] or 'and') .. ' ' end
⚫	outStr = string.format(
	'%s [[User:%s\|%s]]',
	outStr,
	args[i],
⚫	args['label'..tostring(i)] or args[i]
	)
	end		end
		⚫	outStr = string.format(
		⚫	'%s[[User:%s\|%s]]',
		⚫	outStr,
		⚫	args[i],
		⚫	args['label'..tostring(i)] or args[i]
		⚫	)
	end		end
	end		end
	outStr = outStr..(args['p'] or ':')~~..'</span>'~~		outStr = outStr..(args['p'] or ':')
	return outStr		return mw.text.tag('span', {['class']='template-ping'}, outStr)
	end		end
	end		end

Ahecht: user string.format for better readability, use consistent single vs double quotes, simplify error messages

2017-07-21T16:31:05Z

user string.format for better readability, use consistent single vs double quotes, simplify error messages

← Previous revision		Revision as of 16:31, 21 July 2017
Line 1:		Line 1:
	local p = {}		local p = {}
	local htmlerror = require('Module:Error').error

	function p.replyto(frame)		function p.replyto(frame)
Line 13:		Line 12:
	usernames = usernames + 1		usernames = usernames + 1
	local title = mw.title.new(v)		local title = mw.title.new(v)
		⚫	if not title then return '<strong class="error">Error in [[Template:Reply to]]: Input contains forbidden characters.</strong>' end
	if not title then
⚫	return ~~htmlerror{~~'Error in [[Template:Reply to]]: Input contains forbidden characters.'}
⚫	~~end~~
	args[k] = title.rootText		args[k] = title.rootText
	end		end
Line 26:		Line 23:

	if usernames > (tonumber(frame.args.max) or 50) then		if usernames > (tonumber(frame.args.max) or 50) then
			return string.format(
	~~return htmlerror{~~'Error in [[Template:Reply to]]: More than ~~'..tostring(frame.args.max or 50)..'~~ names specified.'}		'<strong class="error">Error in [[Template:Reply to]]: More than %s names specified.</strong>',
			tostring(frame.args.max or 50)
			)
	else		else
	if usernames < 1 then		if usernames < 1 then
	if frame.args.example then args[1] = frame.args.example else return ~~htmlerror{~~'Error in [[Template:Reply to]]: Username not given.'} end		if frame.args.example then args[1] = frame.args.example else return '<strong class="error">Error in [[Template:Reply to]]: Username not given.</strong>' end
	end		end
	local isfirst = true		local isfirst = true
	local outStr = '~~<span class="template-ping">~~'		local outStr = ''
	for i = 1, maxArg do		for i = 1, maxArg do
	if args[i] then		if args[i] then
	if isfirst then		if isfirst then
			outStr = string.format(
	outStr = outStr..(args['prefix'] or '@')..'[[:User:'..args[i]..'\|'..((args['label1'] or args['label']) or args[i])..']]'
			'<span class="template-ping">%s[[User:%s\|%s]]',
⚫	isfirst = false
			args['prefix'] or '@',
			args[i],
			(args['label1'] or args['label']) or args[i]
		⚫	)
		⚫	isfirst = false
	else		else
	if ( (usernames > 2) or ((usernames == 2) and (args['c'] == '')) ) then outStr = outStr.."," end		if ( (usernames > 2) or ((usernames == 2) and (args['c'] == '')) ) then outStr = outStr..',' end
	if i == maxArg then outStr = outStr.." "..(args['c'] or "and") end		if i == maxArg then outStr = outStr..' '..(args['c'] or 'and') end
			outStr = string.format(
⚫	~~outStr = outStr.." [[:User:"..args[i].."\|"..(~~args['label'..tostring(i)] or args[i]~~).."]]"~~
			'%s [[User:%s\|%s]]',
			outStr,
			args[i],
		⚫	args['label'..tostring(i)] or args[i]
			)
	end		end
	end		end
	end		end
	outStr = outStr..(args['p'] or ":").."</span>"		outStr = outStr..(args['p'] or ':')..'</span>'
	return outStr		return outStr
	end		end

Ahecht: baseText→rootText

2017-07-19T16:00:03Z

baseText→rootText

← Previous revision		Revision as of 16:00, 19 July 2017
Line 16:		Line 16:
	return htmlerror{'Error in [[Template:Reply to]]: Input contains forbidden characters.'}		return htmlerror{'Error in [[Template:Reply to]]: Input contains forbidden characters.'}
	end		end
	args[k] = title.~~baseText~~		args[k] = title.rootText
	end		end
	elseif v == '' and k:sub(0,5) == 'label' then		elseif v == '' and k:sub(0,5) == 'label' then

Ahecht: fix example

2017-07-19T15:18:54Z

fix example

← Previous revision		Revision as of 15:18, 19 July 2017
Line 5:		Line 5:
	local origArgs = frame:getParent().args		local origArgs = frame:getParent().args
	local args = {}		local args = {}
	local maxArg = 0		local maxArg = 1
	local usernames = 0		local usernames = 0
	for k, v in pairs(origArgs) do		for k, v in pairs(origArgs) do
Line 23:		Line 23:
	args[k] = v		args[k] = v
	end		end
⚫	end

⚫	if usernames < 1 then
⚫	if frame.args.example then args[1] = frame.args.example else return htmlerror{'Error in [[Template:Reply to]]: Username not given.'} end
	end		end

Line 32:		Line 28:
	return htmlerror{'Error in [[Template:Reply to]]: More than '..tostring(frame.args.max or 50)..' names specified.'}		return htmlerror{'Error in [[Template:Reply to]]: More than '..tostring(frame.args.max or 50)..' names specified.'}
	else		else
		⚫	if usernames < 1 then
		⚫	if frame.args.example then args[1] = frame.args.example else return htmlerror{'Error in [[Template:Reply to]]: Username not given.'} end
		⚫	end
	local isfirst = true		local isfirst = true
	local outStr = '<span class="template-ping">'		local outStr = '<span class="template-ping">'

Ahecht: support blank label

2017-07-19T01:38:45Z

support blank label

← Previous revision		Revision as of 01:38, 19 July 2017
Line 18:		Line 18:
	args[k] = title.baseText		args[k] = title.baseText
	end		end
			elseif v == '' and k:sub(0,5) == 'label' then
			args[k] = ''
	else		else
	args[k] = v		args[k] = v

Ahecht: Unicode match

2017-07-18T22:20:49Z

Unicode match

← Previous revision		Revision as of 22:20, 18 July 2017
Line 9:		Line 9:
	for k, v in pairs(origArgs) do		for k, v in pairs(origArgs) do
	if type(k) == 'number' then		if type(k) == 'number' then
	if v:match('%S') then		if mw.ustring.match(v,'%S') then
	if k > maxArg then maxArg = k end		if k > maxArg then maxArg = k end
	usernames = usernames + 1		usernames = usernames + 1

Ahecht: handle blank inputs

2017-07-18T22:15:19Z

handle blank inputs

← Previous revision		Revision as of 22:15, 18 July 2017
Line 6:		Line 6:
	local args = {}		local args = {}
	local maxArg = 0		local maxArg = 0
			local usernames = 0
	for k, v in pairs(origArgs) do		for k, v in pairs(origArgs) do
	if type(k) == 'number' then		if type(k) == 'number' then
	if v:match('%S') then		if v:match('%S') then
	if k > maxArg then maxArg = k end		if k > maxArg then maxArg = k end
			usernames = usernames + 1
	local title = mw.title.new(v)		local title = mw.title.new(v)
	if not title then		if not title then
Line 21:		Line 23:
	end		end

	if ~~maxArg~~ == 0 then		if usernames < 1 then
	if frame.args.example then args[1] = frame.args.example else return htmlerror{'Error in [[Template:Reply to]]: Username not given.'} end		if frame.args.example then args[1] = frame.args.example else return htmlerror{'Error in [[Template:Reply to]]: Username not given.'} end
	end		end

	if ~~maxArg~~ > (tonumber(frame.args.max) or 50) then		if usernames > (tonumber(frame.args.max) or 50) then
	return htmlerror{'Error in [[Template:Reply to]]: More than '..tostring(frame.args.max or 50)..' names specified.'}		return htmlerror{'Error in [[Template:Reply to]]: More than '..tostring(frame.args.max or 50)..' names specified.'}
	else		else
			local isfirst = true
⚫	~~local~~ outStr = ~~'<span class="template-ping">'~~..(args['prefix'] or '@')..'[[:User:'..args[1]..'\|'..((args['label1'] or args['label']) or args[1])..']]'
			local outStr = '<span class="template-ping">'
	for i = 2, maxArg do		for i = 1, maxArg do
⚫	if ( (~~maxArg~~ > 2) or ((~~maxArg~~ == 2) and (args['c'] == '')) ) then outStr = outStr.."," end
			if args[i] then
⚫	if i == maxArg then outStr = outStr.." "..(args['c'] or "and") end
			if isfirst then
⚫	outStr = outStr.." [[:User:"..args[i].."\|"..(args['label'..tostring(i)] or args[i]).."]]"
		⚫	outStr = outStr..(args['prefix'] or '@')..'[[:User:'..args[i]..'\|'..((args['label1'] or args['label']) or args[i])..']]'
			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
		⚫	outStr = outStr.." [[:User:"..args[i].."\|"..(args['label'..tostring(i)] or args[i]).."]]"
			end
			end
	end		end
	outStr = outStr..(args['p'] or ":").."</span>"		outStr = outStr..(args['p'] or ":").."</span>"

Ahecht: error message for too many names should default to 50, not 20 (not that this is ever likely to be a problem)

2016-07-20T15:36:21Z

error message for too many names should default to 50, not 20 (not that this is ever likely to be a problem)

← Previous revision		Revision as of 15:36, 20 July 2016
Line 26:		Line 26:

	if maxArg > (tonumber(frame.args.max) or 50) then		if maxArg > (tonumber(frame.args.max) or 50) then
	return htmlerror{'Error in [[Template:Reply to]]: More than '..tostring(frame.args.max or 20)..' names specified.'}		return htmlerror{'Error in [[Template:Reply to]]: More than '..tostring(frame.args.max or 50)..' names specified.'}
	else		else
	local outStr = '<span class="template-ping">'..(args['prefix'] or '@')..'[[:User:'..args[1]..'\|'..((args['label1'] or args['label']) or args[1])..']]'		local outStr = '<span class="template-ping">'..(args['prefix'] or '@')..'[[:User:'..args[1]..'\|'..((args['label1'] or args['label']) or args[1])..']]'

Johnuniq: update from Module:Reply to/sandbox per discussion at Template talk:Reply to#Module should detect broken input: it's better to test the result from mw.title.new; this can ping "@" users

2016-07-05T04:03:17Z

update from Module:Reply to/sandbox per discussion at Template talk:Reply to#Module should detect broken input: it's better to test the result from mw.title.new; this can ping "@" users

← Previous revision		Revision as of 04:03, 5 July 2016
Line 8:		Line 8:
	for k, v in pairs(origArgs) do		for k, v in pairs(origArgs) do
	if type(k) == 'number' then		if type(k) == 'number' then
	if v:match('^%~~s(.-)%s$') ~= '' and v:match('^%s(.-)%s$~~') ~~~= nil~~ then		if v:match('%S') then
		⚫	if k > maxArg then maxArg = k end
	if v:match('([#<>%[%]\|{}/@])') == nil then
			local title = mw.title.new(v)
⚫	if k > maxArg then maxArg = k end
	~~args[k]~~ = ~~mw.~~title~~.new(v).baseText~~		if not title then
	else
	return htmlerror{'Error in [[Template:Reply to]]: Input contains forbidden characters.'}		return htmlerror{'Error in [[Template:Reply to]]: Input contains forbidden characters.'}
	end		end
			args[k] = title.baseText
	end		end
	else		else

Ahecht: username→input

2016-06-30T19:19:01Z

username→input

← Previous revision		Revision as of 19:19, 30 June 2016
Line 13:		Line 13:
	args[k] = mw.title.new(v).baseText		args[k] = mw.title.new(v).baseText
	else		else
	return htmlerror{'Error in [[Template:Reply to]]: ~~Username~~ contains forbidden characters.'}		return htmlerror{'Error in [[Template:Reply to]]: Input contains forbidden characters.'}
	end		end
	end		end