Module:Protection banner - Revision history

Rickyboy320: 231 revisions imported: Imported Category TOC from wikipedia

2017-08-11T17:56:37Z

231 revisions imported: Imported Category TOC from wikipedia

Rickyboy320: 1 revision imported: Infobox

2017-06-29T11:26:02Z

1 revision imported: Infobox

Cenarium: remove expiry param (now also automatically retrieved for autoreview) and needsexpiry check

2016-09-29T18:32:41Z

remove expiry param (now also automatically retrieved for autoreview) and needsexpiry check

Jackmcbarn: bring changes from sandbox live

2016-08-04T01:55:19Z

bring changes from sandbox live

Ymblanter: Changed protection level of Module:Protection banner: High-risk Lua module: request at my talk page ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2016-07-06T05:53:36Z

Changed protection level of Module:Protection banner: High-risk Lua module: request at my talk page ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

Mr. Stradivarius: add support for upload protection, and make some formatting tweaks

2016-03-03T13:11:32Z

add support for upload protection, and make some formatting tweaks

Cenarium: add expiry automatically for actions other than 'autoreview' using new {{PROTECTIONEXPIRY:action}} magic word implemented through Module:Effective protection expiry

2015-12-11T17:14:31Z

add expiry automatically for actions other than 'autoreview' using new {{PROTECTIONEXPIRY:action}} magic word implemented through Module:Effective protection expiry

Ymblanter: Changed protection level of Module:Protection banner: High-risk Lua module: RFPP request ([Edit=Allow only administrators] (indefinite) [Move=Allow only administrators] (indefinite))

2015-09-11T20:30:43Z

Changed protection level of Module:Protection banner: High-risk Lua module: RFPP request ([Edit=Allow only administrators] (indefinite) [Move=Allow only administrators] (indefinite))

Mr. Stradivarius: add hack to prevent indicator tags producing whitespace at the top of articles

2015-03-27T04:43:25Z

add hack to prevent indicator tags producing whitespace at the top of articles

Mr. Stradivarius: switch to tags again - the previous error was because the config module needs to be updated at the same time

2015-03-27T00:07:11Z

switch to <indicator> tags again - the previous error was because the config module needs to be updated at the same time

@@ Line 132: / Line 132: @@
 	elseif effectiveExpiry ~= 'unknown' then
 		obj.expiry = validateDate(effectiveExpiry, 'expiry date')
 	end
@@ Line 313: / Line 305: @@
 	end
 	return ''
 end
@@ Line 345: / Line 325: @@
 	local msg = self._cfg.msg
 	local ret = { self:makeProtectionCategory() }
 	if self:isIncorrect() then
 		ret[#ret + 1] = makeCategoryLink(

@@ Line 20: / Line 20: @@
 local function makeCategoryLink(cat, sort)
-	local nsText = mw.site.namespaces[14].name
+	if cat then
 		return string.format(
 			'[[%s:%s|%s]]',
-			nsText,
+			mw.site.namespaces[14].name,
 			cat,
 			sort
+		)
 	end
 end
@@ Line 41: / Line 32: @@
 -- Validation function for the expiry and the protection date
 local function validateDate(dateString, dateType)
-	lang = lang or mw.language.getContentLanguage()
+	if not lang then
 	local success, result = pcall(lang.formatDate, lang, 'U', dateString)
 	if success then
@@ Line 50: / Line 43: @@
 	end
 	error(string.format(
-		'invalid %s ("%s")',
+		'invalid %s: %s',
 		dateType,
 		tostring(dateString)
@@ Line 64: / Line 57: @@
 end
-local function toTableEnd(t, pos)
+-- Given a directed graph formatted as node -> table of direct successors,
-	-- Sends the value at position pos to the end of array t, and shifts the
+-- get a table of all nodes reachable from a given node (though always
-	-- other items down accordingly.
+-- including the given node).
-	return table.insert(t, table.remove(t, pos))
+local function getReachableNodes(graph, start)
 	local toWalk, retval = {[start] = true}, {}
 	while true do
 		-- Can't use pairs() since we're adding and removing things as we're iterating
 		local k = next(toWalk) -- This always gets the "first" key
-		if k == nil then break end
+		if k == nil then
 		toWalk[k] = nil
 		retval[k] = true
-		for _,v in ipairs(hierarchy[k]) do
+		for _,v in ipairs(graph[k]) do
 			if not retval[v] then
 				toWalk[v] = true
@@ Line 84: / Line 76: @@
 		end
 	end
 end
@@ Line 122: / Line 113: @@
 	else
 		error(string.format(
-			'invalid action ("%s")',
+			'invalid action: %s',
 			tostring(args.action)
 		), 3)
@@ Line 214: / Line 205: @@
 	-- Get the namespace key fragment.
-	local namespaceFragment
+	local namespaceFragment = cfg.categoryNamespaceKeys[title.namespace]
-	do
+	if not namespaceFragment and title.namespace % 2 == 1 then
-		namespaceFragment = cfg.categoryNamespaceKeys[title.namespace]
+			namespaceFragment = 'talk'
 	end
@@ Line 244: / Line 232: @@
 	-- instead.
 	--]]
-	if self.reason and cfg.reasonsWithNamespacePriority[self.reason] then
+	table.insert(order, table.remove(order, self.reason and cfg.reasonsWithNamespacePriority[self.reason] and 2 or 3))
 	--[[
@@ Line 495: / Line 478: @@
 		if level == 'autoconfirmed' then
 			requestType = 'semi'
 		elseif level == 'templateeditor' then
 			requestType = 'template'
@@ Line 761: / Line 746: @@
 	end
 	return setmetatable(obj, BannerTemplate)
 end
@@ Line 777: / Line 754: @@
 	return makeFileLink{
 		file = filename,
-		size = (self._imageWidth or 20) .. 'px',
+		size = (self.imageWidth or 20) .. 'px',
 		alt = self._imageAlt,
 		link = self._imageLink,
-		caption = self._imageCaption
+		caption = self.imageCaption
+	}
 end
@@ Line 793: / Line 770: @@
 function Banner.new(protectionObj, blurbObj, cfg)
 	local obj = BannerTemplate.new(protectionObj, cfg) -- This doesn't need the blurb.
-	obj:setImageWidth(40)
+	obj.imageWidth = 40
-	obj:setImageTooltip(blurbObj:makeBannerText('alt')) -- Large banners use the alt text for the tooltip.
+	obj.imageCaption = blurbObj:makeBannerText('alt') -- Large banners use the alt text for the tooltip.
 	obj._reasonText = blurbObj:makeBannerText('text')
 	obj._explanationText = blurbObj:makeBannerText('explanation')
@@ Line 828: / Line 805: @@
 function Padlock.new(protectionObj, blurbObj, cfg)
 	local obj = BannerTemplate.new(protectionObj, cfg) -- This doesn't need the blurb.
-	obj:setImageWidth(20)
+	obj.imageWidth = 20
-	obj:setImageTooltip(blurbObj:makeBannerText('tooltip'))
+	obj.imageCaption = blurbObj:makeBannerText('tooltip')
 	obj._imageAlt = blurbObj:makeBannerText('alt')
 	obj._imageLink = blurbObj:makeBannerText('link')
@@ Line 841: / Line 818: @@
 	local frame = mw.getCurrentFrame()
 	-- The nowiki tag helps prevent whitespace at the top of articles.
-	local nowiki = frame:extensionTag{name = 'nowiki'}
+	return frame:extensionTag{name = 'nowiki'} .. frame:extensionTag{
 		name = 'indicator',
 		args = {name = self._indicatorName},
 		content = self:renderImage()
+	}
 end
@@ Line 880: / Line 855: @@
 	if protectionObj.action == 'edit' or
 		args.demolevel or
-		not walkHierarchy(
+		not getReachableNodes(
 			cfg.hierarchy,
 			protectionObj.level

@@ Line 74: / Line 74: @@
 	while true do
 		-- Can't use pairs() since we're adding and removing things as we're iterating
-		local k = next(toWalk)
+		local k = next(toWalk) -- This always gets the "first" key
 		if k == nil then break end
 		toWalk[k] = nil
@@ Line 97: / Line 97: @@
 	edit = true,
 	move = true,
-	autoreview = true
+	autoreview = true,
+}
@@ Line 874: / Line 875: @@
 	local ret = {}
-	-- If a page's edit protection is equally or more restrictive than its protection from some other action,
+	-- If a page's edit protection is equally or more restrictive than its
-	-- then don't bother displaying anything for the other action (except categories).
+	-- protection from some other action, then don't bother displaying anything
-	if protectionObj.action == 'edit' or args.demolevel or not walkHierarchy(cfg.hierarchy, protectionObj.level)[effectiveProtectionLevel('edit', protectionObj.title)] then
+	-- for the other action (except categories).
 		-- Initialise the blurb object
 		local blurbObj = Blurb.new(protectionObj, args, cfg)

@@ Line 6: / Line 6: @@
 local makeFileLink = require('Module:File link')._main
 local effectiveProtectionLevel = require('Module:Effective protection level')._main
 local yesno = require('Module:Yesno')
@@ Line 134: / Line 135: @@
 	-- Set expiry
-	if args.expiry then
+	local effectiveExpiry = effectiveProtectionExpiry(obj.action, obj.title)
 		if cfg.indefStrings[args.expiry] then
 			obj.expiry = 'indef'

@@ Line 832: / Line 832: @@
 function Padlock:__tostring()
-	return mw.getCurrentFrame():extensionTag{
+	local frame = mw.getCurrentFrame()
 		name = 'indicator',
 		args = {name = self._indicatorName},
 		content = self:renderImage()
+	}
 end

← Older revision	Revision as of 17:56, 11 August 2017
(No difference)

← Older revision	Revision as of 11:26, 29 June 2017
(No difference)

← Older revision	Revision as of 05:53, 6 July 2016
(No difference)

← Older revision	Revision as of 20:30, 11 September 2015
(No difference)

@@ Line 825: / Line 825: @@
 	obj._imageAlt = blurbObj:makeBannerText('alt')
 	obj._imageLink = blurbObj:makeBannerText('link')
-	obj._right = cfg.padlockPositions[protectionObj.action]
+	obj._indicatorName = cfg.padlockIndicatorNames[protectionObj.action]
-		or cfg.padlockPositions.default
+		or cfg.padlockIndicatorNames.default
-		or '55px'
+		or 'pp-default'
 	return setmetatable(obj, Padlock)
 end
 function Padlock:__tostring()
-	local root = mw.html.create('div')
+	return mw.getCurrentFrame():extensionTag{
-	root
+		name = 'indicator',
-		:addClass('metadata topicon nopopups')
+		args = {name = self._indicatorName},
-		:attr('id', 'protected-icon')
+		content = self:renderImage()
-		:css{display = 'none', right = self._right}
 end