Module:Selected recent additions - Revision history

Evad37: allow wikitext to be shown alongside items, for when the template is just used to generate suggestions

2019-03-09T07:31:27Z

allow wikitext to be shown alongside items, for when the template is just used to generate suggestions

← Previous revision		Revision as of 07:31, 9 March 2019
Line 55:		Line 55:
	return cleaned		return cleaned
	end		end

			function makeCollapsed(outerText, innerText)
			return "{{Hidden begin \| titlestyle = font-weight:normal \| title = " .. outerText .. "}}" .. innerText .. "{{Hidden end}}"
			end


	-- Get current events for a "YYYY Month D" date. Returns a table of list items.		-- Get current events for a "YYYY Month D" date. Returns a table of list items.
	function getRecentAdditions(subpage, keepPatterns, skipPatterns)		function getRecentAdditions(subpage, keepPatterns, skipPatterns, showWikitext)
	local title = mw.title.new('Wikipedia:Recent additions' .. subpage)		local title = mw.title.new('Wikipedia:Recent additions' .. subpage)
	local raw = title:getContent()		local raw = title:getContent()
Line 82:		Line 87:
	end		end
	if keep and not skip then		if keep and not skip then
			-- remove (pictured) inline note
	local cleanItem = mw.ustring.gsub(item, "%s*''%(.-pictured.-%)''", "")		local cleanItem = mw.ustring.gsub(item, "%s*''%(.-pictured.-%)''", "")
			-- remove (illustrated) inline note
	cleanItem = mw.ustring.gsub(cleanItem, "%s*''%(.-illustrated.-%)''", "")		cleanItem = mw.ustring.gsub(cleanItem, "%s*''%(.-illustrated.-%)''", "")
			if showWikitext then
			-- remove html comments
			cleanItem = mw.ustring.gsub(cleanItem, "%<%!%-%-(.-)%-%-%>", "")
			local itemWikitext = "<pre>" .. mw.text.nowiki( cleanItem ) .. "</pre>"
			cleanItem = makeCollapsed(cleanItem, itemWikitext)
			end
	table.insert(items, cleanItem)		table.insert(items, cleanItem)
	end		end
Line 90:		Line 103:
	end		end

	function getItems(maxMonths, patterns, skipPatterns)		function getItems(maxMonths, patterns, skipPatterns, showWikitext)
	local allItems = {}		local allItems = {}
	local lang = mw.language.new('en')		local lang = mw.language.new('en')
Line 106:		Line 119:
	subpage = lang:formatDate('/Y/F', year .. '-' .. month)		subpage = lang:formatDate('/Y/F', year .. '-' .. month)
	end		end
	local monthlyItems = getRecentAdditions(subpage, patterns, skipPatterns)		local monthlyItems = getRecentAdditions(subpage, patterns, skipPatterns, showWikitext)
	for i, item in ipairs(monthlyItems) do		for i, item in ipairs(monthlyItems) do
	table.insert(allItems, item)		table.insert(allItems, item)
Line 144:		Line 157:

	local months = tonumber(args.months) or 30		local months = tonumber(args.months) or 30

			local showWikitext = isAffirmed(args.wikitext)

	local allItems = getItems(months, patterns, skipPatterns)		local allItems = getItems(months, patterns, skipPatterns, showWikitext)
	if #allItems < 1 then		if #allItems < 1 then
	return args.header and '' or args.none or 'No recent additions'		return args.header and '' or args.none or 'No recent additions'

Evad37: also remove (illustrated) notes from blurbs

2019-02-04T08:49:37Z

also remove (illustrated) notes from blurbs

← Previous revision		Revision as of 08:49, 4 February 2019
Line 83:		Line 83:
	if keep and not skip then		if keep and not skip then
	local cleanItem = mw.ustring.gsub(item, "%s*''%(.-pictured.-%)''", "")		local cleanItem = mw.ustring.gsub(item, "%s*''%(.-pictured.-%)''", "")
			cleanItem = mw.ustring.gsub(cleanItem, "%s*''%(.-illustrated.-%)''", "")
	table.insert(items, cleanItem)		table.insert(items, cleanItem)
	end		end

Ymblanter: Protected "Module:Selected recent additions": High-risk Lua module ([Edit=Require autoconfirmed or confirmed access] (indefinite) [Move=Require autoconfirmed or confirmed access] (indefinite))

2018-12-23T16:45:07Z

Protected "Module:Selected recent additions": High-risk Lua module ([Edit=Require autoconfirmed or confirmed access] (indefinite) [Move=Require autoconfirmed or confirmed access] (indefinite))

← Previous revision	Revision as of 16:45, 23 December 2018
(No difference)

Evad37: allow header and footer to be specified in args

2018-08-03T02:41:29Z

allow header and footer to be specified in args

← Previous revision		Revision as of 02:41, 3 August 2018
Line 146:		Line 146:
	local allItems = getItems(months, patterns, skipPatterns)		local allItems = getItems(months, patterns, skipPatterns)
	if #allItems < 1 then		if #allItems < 1 then
	return args.none or 'No recent additions'		return args.header and '' or args.none or 'No recent additions'
	end		end

Line 159:		Line 159:

	local output = makeOutput(allItems, maxItems, more, nonRandom)		local output = makeOutput(allItems, maxItems, more, nonRandom)
			if args.header then
			output = args.header .. '\n' .. output .. '\n' .. (args.footer or '{{Box-footer}}')
			end
	local needsExpansion = mw.ustring.find(output, '{{', 0, true)		local needsExpansion = mw.ustring.find(output, '{{', 0, true)
	if needsExpansion then		if needsExpansion then

Evad37: remove spacing before (pictured) as well

2018-07-09T01:51:25Z

remove spacing before (pictured) as well

← Previous revision		Revision as of 01:51, 9 July 2018
Line 82:		Line 82:
	end		end
	if keep and not skip then		if keep and not skip then
	local cleanItem = mw.ustring.gsub(item, "''%(.-pictured.-%)''", "")		local cleanItem = mw.ustring.gsub(item, "%s*''%(.-pictured.-%)''", "")
	table.insert(items, cleanItem)		table.insert(items, cleanItem)
	end		end

Evad37: expand output if it contains templates – per edit to Module:Selected current events

2018-06-07T02:37:11Z

expand output if it contains templates – per edit to Module:Selected current events

← Previous revision		Revision as of 02:37, 7 June 2018
Line 158:		Line 158:
	local nonRandom = isAffirmed(args.latest)		local nonRandom = isAffirmed(args.latest)

	~~return~~ makeOutput(allItems, maxItems, more, nonRandom)		local output = makeOutput(allItems, maxItems, more, nonRandom)
			local needsExpansion = mw.ustring.find(output, '{{', 0, true)

			if needsExpansion then
			return frame:preprocess(output)
			else
			return output
			end
	end		end

Evad37: allow for latest / non-random items

2018-06-01T08:24:57Z

allow for latest / non-random items

@@ Line 22: / Line 22: @@
 end
-function makeOutput(allItems, maxItems, more)
+function makeOutput(allItems, maxItems, more, notRandom)
-	local randomiseArgs = {
+	local output
-		['limit'] = maxItems
+		output = ''
 	if more then
 		output = output .. more
@@ Line 145: / Line 156: @@
 	end
 end

Evad37: update from sandbox: better date handling

2018-05-31T16:45:19Z

update from sandbox: better date handling

← Previous revision		Revision as of 16:45, 31 May 2018
Line 81:		Line 81:
	local allItems = {}		local allItems = {}
	local lang = mw.language.new('en')		local lang = mw.language.new('en')
			local currentYear = tonumber(lang:formatDate('Y', 'now'))
			local currentMonth = tonumber(lang:formatDate('n', 'now'))
	local monthsAgo = 0		local monthsAgo = 0
	while monthsAgo < maxMonths do		while monthsAgo < maxMonths do
Line 87:		Line 89:
	subpage = ''		subpage = ''
	else		else
			local year = currentYear - math.modf( (monthsAgo+12-currentMonth)/12 )
⚫	subpage = ~~'/' ..~~ lang:formatDate('Y/F', ~~'now~~ - '..~~monthsAgo..'~~ ~~months'~~)
			local month = math.fmod(12 + currentMonth - math.fmod(monthsAgo, 12), 12)
			month = ( month ~= 0 ) and month or 12
		⚫	subpage = lang:formatDate('/Y/F', year .. '-' .. month)
	end		end
	local ~~monthyItems~~ = getRecentAdditions(subpage, patterns, skipPatterns)		local monthlyItems = getRecentAdditions(subpage, patterns, skipPatterns)
	for i, item in ipairs(~~monthyItems~~) do		for i, item in ipairs(monthlyItems) do
	table.insert(allItems, item)		table.insert(allItems, item)
	end		end

Evad37: update from sandbox (fix randomising and cleaning of items)

2018-05-31T15:31:59Z

update from sandbox (fix randomising and cleaning of items)

@@ Line 23: / Line 23: @@
 function makeOutput(allItems, maxItems, more)
 	if more then
 		output = output .. more
@@ Line 45: / Line 43: @@
 	cleaned = mw.ustring.gsub(cleaned, "%[.-%]"," ")
 	return cleaned
 end
@@ Line 85: / Line 71: @@
 		end
 		if keep and not skip then
-			cleanItem = mw.ustring.gsub(item, "''%(.-pictured.-%)''", "")
+			local cleanItem = mw.ustring.gsub(item, "''%(.-pictured.-%)''", "")
-			table.insert(items, item)
+			table.insert(items, cleanItem)
 		end
 	end

Evad37: try using iterator function to see if it gives better performance

2018-05-31T15:11:42Z

try using iterator function to see if it gives better performance

← Previous revision		Revision as of 15:11, 31 May 2018
Line 63:		Line 63:
	local title = mw.title.new('Wikipedia:Recent additions' .. subpage)		local title = mw.title.new('Wikipedia:Recent additions' .. subpage)
	local raw = title:getContent()		local raw = title:getContent()
	local ~~cleaned~~ = ~~cleanupRawWikitext(raw)~~		local itemPattern = '%%s?%.%.%.[%S ]'
	local lines = mw.text.split(cleaned, '\n')
	local items = {}		local items = {}
	for ~~i, v~~ in ~~ipairs~~(~~lines~~) do		for item in mw.ustring.gmatch(raw, itemPattern) do
	local keep = false		local keep = false
	local skip = false		local skip = false
	local isListItem = ( string.sub( v, 0, 1) == '*' )		local isListItem = ( string.sub(item, 0, 1) == '*' )
	if isListItem then		if isListItem then
	local text = cleanForPatternMatching(v)		local text = cleanForPatternMatching(item)
	for ii, keepPatt in pairs(keepPatterns) do		for ii, keepPatt in pairs(keepPatterns) do
	if not keep and mw.ustring.find(text, keepPatt) then		if not keep and mw.ustring.find(text, keepPatt) then
Line 86:		Line 85:
	end		end
	if keep and not skip then		if keep and not skip then
			cleanItem = mw.ustring.gsub(item, "''%(.-pictured.-%)''", "")
	table.insert(items, v)		table.insert(items, item)
	end		end
	end		end