Module:Sensitive IP addresses/blocktext - Revision history

Mr. Stradivarius: make all variables local

2018-11-04T06:59:49Z

make all variables local

← Previous revision		Revision as of 06:59, 4 November 2018
Line 67:		Line 67:

	local function renderMessage(rawMessage, messageArgs)		local function renderMessage(rawMessage, messageArgs)
			local message
	if rawMessage then		if rawMessage then
	message = mw.message.newRawMessage(rawMessage)		message = mw.message.newRawMessage(rawMessage)
Line 72:		Line 73:
	message = mw.message.new('sensitive-ip-block-text')		message = mw.message.new('sensitive-ip-block-text')
	end		end
	wikitext = message:params(		local wikitext = message:params(
	messageArgs.type,		messageArgs.type,
	messageArgs.type == 'ip' and messageArgs.ip or messageArgs.range,		messageArgs.type == 'ip' and messageArgs.ip or messageArgs.range,
Line 98:		Line 99:
	return nil		return nil
	end		end
	messageArgs = parseSensitivityData(sensitivityData)		local messageArgs = parseSensitivityData(sensitivityData)
	return renderMessage(args.message, messageArgs)		return renderMessage(args.message, messageArgs)
	end		end

Mr. Stradivarius: render messages as a MediaWiki message instead of as a template - this seems more natural seeing as this module is specifically intended for use in the MediaWiki namespace

2018-11-04T06:56:21Z

render messages as a MediaWiki message instead of as a template - this seems more natural seeing as this module is specifically intended for use in the MediaWiki namespace

← Previous revision		Revision as of 06:56, 4 November 2018
Line 66:		Line 66:
	end		end

	local function ~~renderMessageTemplate~~(~~templateTitle~~, ~~templateArgs~~)		local function renderMessage(rawMessage, messageArgs)
	if ~~not templateTitle~~ then		if rawMessage then
			message = mw.message.newRawMessage(rawMessage)
	templateTitle = 'Sensitive IP addresses/blocktext'
			else
			message = mw.message.new('sensitive-ip-block-text')
	end		end
			wikitext = message:params(
			messageArgs.type,
			messageArgs.type == 'ip' and messageArgs.ip or messageArgs.range,
			messageArgs['matches-range'],
			messageArgs['entity-id'],
			messageArgs['entity-name'],
			messageArgs['entity-description'],
			messageArgs.reason
			):plain()
	local frame = mw.getCurrentFrame()		local frame = mw.getCurrentFrame()
			return frame:preprocess(wikitext)
	return frame:expandTemplate{title = templateTitle, args = templateArgs}
	end		end

Line 77:		Line 88:

	function p._main(args, title)		function p._main(args, title)
			args = args or {}
	if not title then
	title = mw.title.getCurrentTitle()		title = title or mw.title.getCurrentTitle()
	end
	local ipOrSubnet = parseTitle(title)		local ipOrSubnet = parseTitle(title)
	if not ipOrSubnet then		if not ipOrSubnet then
Line 88:		Line 98:
	return nil		return nil
	end		end
	~~templateArgs~~ = parseSensitivityData(sensitivityData)		messageArgs = parseSensitivityData(sensitivityData)
	return ~~renderMessageTemplate~~(args.~~template~~, ~~templateArgs~~)		return renderMessage(args.message, messageArgs)
	end		end

Line 102:		Line 112:
	fetchSensitivityData = fetchSensitivityData,		fetchSensitivityData = fetchSensitivityData,
	parseSensitivityData = parseSensitivityData,		parseSensitivityData = parseSensitivityData,
			renderMessage = renderMessage,
	renderMessageTemplate = renderMessageTemplate,
	}		}
	end		end

Mr. Stradivarius: implement renderMessageTemplate

2018-10-08T14:45:05Z

implement renderMessageTemplate

← Previous revision		Revision as of 14:45, 8 October 2018
Line 66:		Line 66:
	end		end

	local function ~~generateMessage~~(~~sensitivityData~~)		local function renderMessageTemplate(templateTitle, templateArgs)
			if not templateTitle then
			templateTitle = 'Sensitive IP addresses/blocktext'
			end
			local frame = mw.getCurrentFrame()
			return frame:expandTemplate{title = templateTitle, args = templateArgs}
	end		end

Line 79:		Line 84:
	return nil		return nil
	end		end
	~~return~~ ~~generateMessage(~~fetchSensitivityData(ipOrSubnet))		local sensitivityData = fetchSensitivityData(ipOrSubnet)
			if not sensitivityData then
			return nil
			end
			templateArgs = parseSensitivityData(sensitivityData)
			return renderMessageTemplate(args.template, templateArgs)
	end		end

Line 92:		Line 102:
	fetchSensitivityData = fetchSensitivityData,		fetchSensitivityData = fetchSensitivityData,
	parseSensitivityData = parseSensitivityData,		parseSensitivityData = parseSensitivityData,
			renderMessageTemplate = renderMessageTemplate,
	}		}
	end		end

Mr. Stradivarius: implement parseSensitivityData

2018-10-08T14:08:43Z

implement parseSensitivityData

@@ Line 30: / Line 30: @@
 local function fetchSensitivityData(ipOrSubnet)
 	return querySensitiveIPs{test = {ipOrSubnet}}
 end
@@ Line 57: / Line 91: @@
 		parseTitle = parseTitle,
 		fetchSensitivityData = fetchSensitivityData,
+	}
 end

Mr. Stradivarius: make fetchSensitivityData testable

2018-10-08T09:00:11Z

make fetchSensitivityData testable

← Previous revision		Revision as of 09:00, 8 October 2018
Line 56:		Line 56:
	return {		return {
	parseTitle = parseTitle,		parseTitle = parseTitle,
			fetchSensitivityData = fetchSensitivityData,
	}		}
	end		end

Mr. Stradivarius: use Module:IP to normalise IP addresses and subnets

2018-10-08T08:18:36Z

use Module:IP to normalise IP addresses and subnets

← Previous revision		Revision as of 08:18, 8 October 2018
Line 3:		Line 3:

	local querySensitiveIPs = require('Module:Sensitive IP addresses').query		local querySensitiveIPs = require('Module:Sensitive IP addresses').query
	local ~~m_ip~~ = require('Module:IP')		local mIP = require('Module:IP')
	local IPAddress = ~~m_ip~~.IPAddress		local IPAddress = mIP.IPAddress
	local Subnet = ~~m_ip~~.Subnet		local Subnet = mIP.Subnet

	local function ~~normalizeIPOrRange~~(~~ipOrRange~~)		local function normalizeIPOrSubnet(ipOrSubnet)
			-- Normalize an IP address or subnet.
			-- If ipOrSubnet is not a valid IP address or subnet, returns nil.
			local ipSuccess, ipObj = pcall(IPAddress.new, ipOrSubnet)
			if ipSuccess and ipObj then
			return tostring(ipObj)
			end
			local subnetSuccess, subnetObj = pcall(Subnet.new, ipOrSubnet)
			if subnetSuccess and subnetObj then
			return tostring(subnetObj)
			end
		⚫	return nil
	end		end

	local function parseTitle(title)		local function parseTitle(title)
			-- Parse a title. If the subpage(s) of the root page are a valid IP
⚫	local ~~ipOrRange~~ = title.text:gsub('^.-/', '')
			-- address or subnet, then return the normalized IP address or subnet.
⚫	return ~~ipOrRange~~
		⚫	local ipOrSubnet = title.text:gsub('^.-/', '')
			return normalizeIPOrSubnet(ipOrSubnet)
	end		end

	local function fetchSensitivityData(~~ipOrRange~~)		local function fetchSensitivityData(ipOrSubnet)
	return querySensitiveIPs{test = {~~ipOrRange~~}}		return querySensitiveIPs{test = {ipOrSubnet}}
	end		end

Line 28:		Line 41:
	title = mw.title.getCurrentTitle()		title = mw.title.getCurrentTitle()
	end		end
	local ~~ipOrRange~~ = parseTitle(title)		local ipOrSubnet = parseTitle(title)
	if not ~~ipOrRange~~ then		if not ipOrSubnet then
	return nil		return nil
	end		end
	return generateMessage(fetchSensitivityData(~~ipOrRange~~))		return generateMessage(fetchSensitivityData(ipOrSubnet))
	end		end

Mr. Stradivarius: implement parseTitle

2018-10-08T07:26:25Z

implement parseTitle

← Previous revision		Revision as of 07:26, 8 October 2018
Line 10:		Line 10:
	end		end

	local function ~~parsePageName~~(~~page~~)		local function parseTitle(title)
			local ipOrRange = title.text:gsub('^.-/', '')
			return ipOrRange
	end		end

Line 26:		Line 28:
	title = mw.title.getCurrentTitle()		title = mw.title.getCurrentTitle()
	end		end
	local ipOrRange = ~~parsePageName~~(title~~.prefixedText~~)		local ipOrRange = parseTitle(title)
	if not ipOrRange then		if not ipOrRange then
	return nil		return nil
Line 40:		Line 42:
	function p._exportFunctions()		function p._exportFunctions()
	return {		return {
			parseTitle = parseTitle,
	}		}
	end		end

Mr. Stradivarius: create structure for a module to generate text at Special:Block

2018-10-08T06:34:29Z

create structure for a module to generate text at Special:Block

New page

-- This module creates a warning about sensitive IP addresses that is intended
-- to be placed in [[Special:Block]] via the [[Mediawiki:Blockiptext]] message.

local querySensitiveIPs = require('Module:Sensitive IP addresses').query
local m_ip = require('Module:IP')
local IPAddress = m_ip.IPAddress
local Subnet = m_ip.Subnet

local function normalizeIPOrRange(ipOrRange)
end

local function parsePageName(page)
end

local function fetchSensitivityData(ipOrRange)
return querySensitiveIPs{test = {ipOrRange}}
end

local function generateMessage(sensitivityData)
end

local p = {}

function p._main(args, title)
if not title then
title = mw.title.getCurrentTitle()
end
local ipOrRange = parsePageName(title.prefixedText)
if not ipOrRange then
return nil
end
return generateMessage(fetchSensitivityData(ipOrRange))
end

function p.main(frame)
local args = require('Module:Arguments').getArgs(frame)
return p._main(args)
end

function p._exportFunctions()
return {
}
end

return p