Module:Selected current events - Revision history

Bejakyo: Fixed doublebolding issue

2025-01-01T02:00:51Z

Fixed doublebolding issue

← Previous revision		Revision as of 02:00, 1 January 2025
Line 105:		Line 105:
	if keep and not skip then		if keep and not skip then
	local itemPrefix = ";" .. formattedDate		local itemPrefix = ";" .. formattedDate
	if itemHeading ~= "" then itemPrefix = itemPrefix .. " ~~'''~~"..itemHeading.."~~'''~~" end		if itemHeading ~= "" then itemPrefix = itemPrefix .. " "..itemHeading.."" end
	itemPrefix = itemPrefix .. "\n:"		itemPrefix = itemPrefix .. "\n:"
	if previousItemPrefix == itemPrefix then		if previousItemPrefix == itemPrefix then

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

2019-03-09T08:25:04Z

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

← Previous revision		Revision as of 08:25, 9 March 2019
Line 51:		Line 51:
	end		end
	return '<span style="font-weight:normal;">' .. string.gsub(dateString, "(.) (.) (.*)", formattedDatePattern) .. ' –</span>'		return '<span style="font-weight:normal;">' .. string.gsub(dateString, "(.) (.) (.*)", formattedDatePattern) .. ' –</span>'
			end

			function makeCollapsed(outerText, innerText)
			return "{{Hidden begin \| titlestyle = font-weight:normal \| title = " .. outerText .. "}}" .. innerText .. "{{Hidden end}}"
	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 getCurrentEvents(date, mdyDates, keepPatterns, skipPatterns)		function getCurrentEvents(date, mdyDates, keepPatterns, skipPatterns, showWikitext)
	local title = mw.title.new("Portal:Current events/" .. date)		local title = mw.title.new("Portal:Current events/" .. date)
	local raw = title:getContent()		local raw = title:getContent()
Line 109:		Line 113:
	end		end
	local item = mw.ustring.gsub(v, '%*+', itemPrefix)		local item = mw.ustring.gsub(v, '%*+', itemPrefix)
			if showWikitext then
			-- remove html comments
			local itemWikitext = mw.ustring.gsub(item, "%<%!%-%-(.-)%-%-%>", "")
			-- remove prefix from wikitext
			itemWikitext = mw.ustring.gsub(itemWikitext, ";(.-)\n", "")
			itemWikitext = "<pre>" .. mw.text.nowiki( itemWikitext ) .. "</pre>"
			-- remove prefix from item
			itemWithoutPrexix = mw.ustring.gsub(v, '%*+', '')
			item = itemPrefix .. makeCollapsed(itemWithoutPrexix, itemWikitext)
			end
	table.insert(items, item)		table.insert(items, item)
	end		end
Line 115:		Line 129:
	end		end

	function getItems(maxDays, mdyDates, patterns, skipPatterns)		function getItems(maxDays, mdyDates, patterns, skipPatterns, showWikitext)
	local allItems = {}		local allItems = {}
	local lang = mw.language.new('en')		local lang = mw.language.new('en')
Line 121:		Line 135:
	while daysAgo < maxDays do		while daysAgo < maxDays do
	local day = lang:formatDate('Y F j', 'now - '..daysAgo..' days')		local day = lang:formatDate('Y F j', 'now - '..daysAgo..' days')
	local dailyItems = getCurrentEvents(day, mdyDates, patterns, skipPatterns)		local dailyItems = getCurrentEvents(day, mdyDates, patterns, skipPatterns, showWikitext)
	for i, item in ipairs(dailyItems) do		for i, item in ipairs(dailyItems) do
	table.insert(allItems, item)		table.insert(allItems, item)
Line 161:		Line 175:

	local mdyDates = args.dates and string.lower(args.dates) == 'mdy'		local mdyDates = args.dates and string.lower(args.dates) == 'mdy'

			local showWikitext = isAffirmed(args.wikitext)

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

Evad37: skip processing items if that day's wikitext does not exist

2019-01-23T00:14:50Z

skip processing items if that day's wikitext does not exist

← Previous revision		Revision as of 00:14, 23 January 2019
Line 57:		Line 57:
	local title = mw.title.new("Portal:Current events/" .. date)		local title = mw.title.new("Portal:Current events/" .. date)
	local raw = title:getContent()		local raw = title:getContent()
			if (not raw) or raw == '' then
			return {}
			end
	local lines = mw.text.split( raw , '\n')		local lines = mw.text.split( raw , '\n')
	local items = {}		local items = {}

Ymblanter: Protected "Module:Selected current events": High-risk Lua module: request at WP:RFPP ([Edit=Require autoconfirmed or confirmed access] (indefinite) [Move=Require autoconfirmed or confirmed access] (indefinite))

2018-12-22T19:39:14Z

Protected "Module:Selected current events": High-risk Lua module: request at WP:RFPP ([Edit=Require autoconfirmed or confirmed access] (indefinite) [Move=Require autoconfirmed or confirmed access] (indefinite))

← Previous revision	Revision as of 19:39, 22 December 2018
(No difference)

Certes: Include items which are not (and do not have) subitems

2018-11-13T12:16:22Z

Include items which are not (and do not have) subitems

← Previous revision		Revision as of 12:16, 13 November 2018
Line 61:		Line 61:
	local itemHeading = ''		local itemHeading = ''
	local cleanItemHeading = ''		local cleanItemHeading = ''
	local ~~previousItemHeading~~ = ''		local previousItemPrefix = ''

	local formattedDate = formatDateString(date, mdyDates)		local formattedDate = formatDateString(date, mdyDates)
Line 68:		Line 68:
	local keep = false		local keep = false
	local skip = false		local skip = false
⚫	local ~~isListItem~~ = ( string.sub( v, 0, 1) == '*' )
	local isSublistItem = ( string.sub( v, 0, 2 ) == '**' )		local isSublistItem = ( string.sub( v, 0, 2 ) == '**' )
	if isListItem ~~and~~ not isSublistItem ~~then~~		local isListItem = not isSublistItem and ( string.sub( v, 0, 1) == '*' )
		⚫	local hasSublistItem = isListItem and i < #lines and ( string.sub( lines[i+1], 0, 2 ) == '**' )
	previousItemHeading = itemHeading

			if hasSublistItem then
	itemHeading = mw.text.trim(mw.ustring.gsub(v, '%*', '', 1))		itemHeading = mw.text.trim(mw.ustring.gsub(v, '%*', '', 1))
	cleanItemHeading = cleanForPatternMatching(itemHeading)		cleanItemHeading = cleanForPatternMatching(itemHeading)
	elseif ~~isSublistItem~~ then		elseif isListItem then
			itemHeading = ""
			cleanItemHeading = ""
			end

			if (isListItem and not hasSublistItem) or isSublistItem then
	local text = cleanForPatternMatching(v)		local text = cleanForPatternMatching(v)
	for ii, keepPatt in pairs(keepPatterns) do		for ii, keepPatt in pairs(keepPatterns) do
Line 89:		Line 95:
	end		end
	end		end

	if keep and not skip then		if keep and not skip then
	local itemPrefix = ~~':'~~		local itemPrefix = ";" .. formattedDate
			if itemHeading ~= "" then itemPrefix = itemPrefix .. " '''"..itemHeading.."'''" end
	if previousItemHeading ~= itemHeading then
	itemPrefix = ~~";"~~..~~formattedDate.."~~ ~~'''"..itemHeading..~~"~~'''~~\n:"		itemPrefix = itemPrefix .. "\n:"
			if previousItemPrefix == itemPrefix then
	previousItemHeading = itemHeading
			itemPrefix = ':'
			else
			previousItemPrefix = itemPrefix
	end		end
	local item = mw.ustring.gsub(v, '%*+', itemPrefix)		local item = mw.ustring.gsub(v, '%*+', itemPrefix)

Evad37: allow header and footer to be specified in args

2018-08-02T09:44:22Z

allow header and footer to be specified in args

← Previous revision		Revision as of 09:44, 2 August 2018
Line 151:		Line 151:
	local allItems = getItems(days, mdyDates, patterns, skipPatterns)		local allItems = getItems(days, mdyDates, patterns, skipPatterns)
	if #allItems < 1 then		if #allItems < 1 then
	return args.none or 'No recent news'		return args.header and '' or args.none or 'No recent news'
	end		end

Line 162:		Line 162:

	local output = makeOutput(allItems, maxItems, more)		local output = makeOutput(allItems, maxItems, more)
			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: fix "string expected, got nil" error by setting initial values of heading variables to empty string instead of implicit nil

2018-07-30T18:32:03Z

fix "string expected, got nil" error by setting initial values of heading variables to empty string instead of implicit nil

← Previous revision		Revision as of 18:32, 30 July 2018
Line 59:		Line 59:
	local lines = mw.text.split( raw , '\n')		local lines = mw.text.split( raw , '\n')
	local items = {}		local items = {}
	local itemHeading, cleanItemHeading, previousItemHeading		local itemHeading = ''
			local cleanItemHeading = ''
			local previousItemHeading = ''

	local formattedDate = formatDateString(date, mdyDates)		local formattedDate = formatDateString(date, mdyDates)

Evad37: update from sandbox: expand output if it contains templates

2018-06-07T02:33:11Z

update from sandbox: expand output if it contains templates

← Previous revision		Revision as of 02:33, 7 June 2018
Line 159:		Line 159:
	end		end

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

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

	end		end

Evad37: Update from sandbox: include headings along with items; adjust formatting to display date and heading on a separate line preceding items

2018-05-29T10:34:45Z

Update from sandbox: include headings along with items; adjust formatting to display date and heading on a separate line preceding items

@@ Line 34: / Line 34: @@
 end
 -- Get current events for a "YYYY Month D" date. Returns a table of list items.
@@ Line 41: / Line 59: @@
 	local lines = mw.text.split( raw , '\n')
 	local items = {}
-		formattedDate =  string.gsub(date, "(.*) (.*) (.*)", "%2 %3, %1 – ")
+	local formattedDate = formatDateString(date, mdyDates)
 	for i, v in ipairs(lines) do
 		local keep = false
 		local skip = false
-		if string.sub( v, 0, 2 ) == '**' then
+		local isListItem = ( string.sub( v, 0, 1) == '*' )
 			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) or mw.ustring.find(cleanItemHeading, keepPatt) ) then
 					keep = true
 				end
@@ Line 61: / Line 81: @@
 			if #skipPatterns > 0 then
 				for iii, skipPatt in pairs(skipPatterns) do
-					if not skip and mw.ustring.find(text, skipPatt) then
+					if not skip and ( mw.ustring.find(text, skipPatt) or mw.ustring.find(cleanItemHeading, skipPatt) ) then
 						skip = true
 					end
@@ Line 68: / Line 88: @@
 		end
 		if keep and not skip then
 			table.insert(items, item)
 		end

Evad37: option to show "More current events" link, or custom wikitext, at the bottom

2018-05-23T04:41:20Z

option to show "More current events" link, or custom wikitext, at the bottom

← Previous revision		Revision as of 04:41, 23 May 2018
Line 14:		Line 14:
	end		end

	function ~~makeOutput~~(~~allItems, maxItems~~)		function isAffirmed(val)
			if not(val) then return false end
			local affirmedWords = ' add added affirm affirmed include included on true yes y '
			return string.find(affirmedWords, ' '..string.lower(val)..' ', 1, true ) and true or false
			end

			function makeOutput(allItems, maxItems, more)
	local output = ''		local output = ''
	local itemIndex = 1		local itemIndex = 1
Line 21:		Line 27:
	output = output .. allItems[itemIndex] .. '\n'		output = output .. allItems[itemIndex] .. '\n'
	itemIndex = itemIndex + 1		itemIndex = itemIndex + 1
			end
			if more then
			output = output .. more
	end		end
	return mw.text.trim(output)		return mw.text.trim(output)
Line 120:		Line 129:
	end		end

	~~return~~ ~~makeOutput(allItems,~~ tonumber(args.max) or 6)		local maxItems = tonumber(args.max) or 6

			local more = args.more
			if isAffirmed(args.more) then
			more = "'''[[Portal:Current events\|More current events...]]'''"
			end

			return makeOutput(allItems, maxItems, more)