Module:RankedWars - Revision history

Bobogoobo: use error module

2025-10-21T10:53:32Z

use error module

← Older revision		Revision as of 10:53, 21 October 2025
Line 7:		Line 7:
	local data = mw.loadData('Module:RankedWars/data')		local data = mw.loadData('Module:RankedWars/data')
	local jsonData = mw.loadJsonData('Module:RankedWars/data.json')		local jsonData = mw.loadJsonData('Module:RankedWars/data.json')
			local err = require('Module:Error').call

	local p = {}		local p = {}
Line 180:		Line 181:
	function p.call(args)		function p.call(args)
	local faction, war, mode		local faction, war, mode
			if not args then args = {} end

	if args[1] then		if args[1] then
Line 187:		Line 189:
	war = tonumber(args[2])		war = tonumber(args[2])
	end		end
	mode = args.mode		mode = mw.ustring.lower(args.mode or '')
	args['has page'] = mw.ustring.gsub(		args['has page'] = mw.ustring.gsub(
	',' .. (args['has page'] or '') .. ',',		',' .. (args['has page'] or '') .. ',',
Line 194:		Line 196:
	)		)

	if not faction and ~~not (~~mode == 'json') then		if not faction and mode ~= 'json' then
	return '~~<span class="error">~~faction is currently required~~</span>~~'		return err('faction is currently required')
	end		end

	if faction and not data.factions[faction] then		if faction and not data.factions[faction] then
	return '~~<span class="error">~~incorrect faction name~~</span>~~'		return err('incorrect faction name')
	end		end
	if faction and war and not jsonData.wars[faction][war] then		if faction and war and not jsonData.wars[faction][war] then
	return '~~<span class="error">~~specified war not found for the given faction~~</span>~~'		return err('specified war not found for the given faction')
	end		end

Line 211:		Line 213:
	elseif mode == 'war' then		elseif mode == 'war' then
	if not war then		if not war then
	return '~~<span class="error">~~war id must be specified for war lookup~~</span>~~'		return err('war id must be specified for war lookup')
	end		end
	return displayWarData(faction, war)		return displayWarData(faction, war)
Line 217:		Line 219:
	return displayDataJson(args.ugly)		return displayDataJson(args.ugly)
	elseif mode then		elseif mode then
	return '~~<span class="error">unrecognized~~ mode~~</span>~~'		return err('invalid mode')
	else		else
	return '~~<span class="error">~~mode is currently required~~</span>~~'		return err('mode is currently required')
	end		end
	end		end

	return p		return p

Bobogoobo: templates and colors for win/lose/term, untested logic for ongoing wars

2025-10-21T09:46:17Z

templates and colors for win/lose/term, untested logic for ongoing wars

← Older revision		Revision as of 09:46, 21 October 2025
Line 1:		Line 1:
	--todo:		--todo:
	-- Handle ongoing wars (end = 0)		-- Handle ongoing wars (end = 0) - existing logic is untested
			-- Add function to get title+disambig of a war for easier linking to correct section, or full link including faction
	-- War lookup without faction (special case for internal) - remember to use faction name not shell name.		-- War lookup without faction (special case for internal) - remember to use faction name not shell name.
	-- ~~Use "clear" template~~ (~~need to make it~~)		-- Add overall and per-faction stats - most fought opponents, shortest/longest wars, most/least score, most contested (total score), etc
			-- See todos in JS
	local data = mw.loadData('Module:RankedWars/data')		local data = mw.loadData('Module:RankedWars/data')
	local jsonData = mw.loadJsonData('Module:RankedWars/data.json')		local jsonData = mw.loadJsonData('Module:RankedWars/data.json')
Line 44:		Line 46:
	local capName = factionName(faction)		local capName = factionName(faction)
	local warData = jsonData.wars[faction][warId]		local warData = jsonData.wars[faction][warId]
			local frame = mw.getCurrentFrame()

			local ongoing = false
			if warData['end'] == 0 then
			ongoing = true
			warData.note = 'This war is ongoing.'
			end

	local outcome = 'fought'		local outcome = 'fought'
	if warData.win then		if ongoing then
	outcome = 'won against'		outcome = 'is fighting'
			elseif warData.win then
			outcome = frame:expandTemplate({
			title = 'color',
			args = { 'green', 'bold', 'won' }
			}) .. ' against'
	else		else
	outcome = 'lost to'		outcome = frame:expandTemplate({
			title = 'color',
			args = { 'red', 'bold', 'lost' }
			}) .. ' to'
	end		end
	local terms = 'war'		local terms = 'war'
	if warData.termed then		if warData.termed then
	terms = 'termed war'		terms = frame:expandTemplate({
			title = 'color',
			args = { 'sandybrown', 'termed' }
			}) .. ' war'
	end		end
	local opponent = ~~mw.getCurrentFrame()~~:expandTemplate({		local opponent = frame:expandTemplate({
	title = 'Tornp',		title = 'Tornp',
	args = { warData.oppName }		args = { warData.oppName }
	})		})
	local hours = string.format('%.0f', (warData['end'] - warData['start']) / 3600)		local hours = '?'
			if not ongoing then
			hours = string.format('%.0f', (warData['end'] - warData['start']) / 3600)
			end
	local hourplural = 'hours'		local hourplural = 'hours'
	if tonumber(hours) == 1 then		if tonumber(hours) == 1 then
Line 91:		Line 114:
	local wars = jsonData.wars[faction]		local wars = jsonData.wars[faction]
	local out = ''		local out = ''
			local frame = mw.getCurrentFrame()

	--The JSON sorts the wars numerically and pairs is random, we want newest first		--The JSON sorts the wars numerically and pairs is random, we want newest first
Line 131:		Line 155:
	end		end
	if warpage then		if warpage then
	out = out .. ~~mw.getCurrentFrame()~~:expandTemplate({		out = out .. frame:expandTemplate({
	title = 'main',		title = 'main',
	args = { warpage }		args = { warpage }
Line 143:		Line 167:
	end		end
	out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'		out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'
	out = out .. '~~<br style="~~clear~~:both;" />~~\n'		out = out .. frame:expandTemplate({ title='clear' }) .. '\n'
	out = out .. '\n'		out = out .. '\n'
	end		end

Bobogoobo at 22:58, 17 October 2025

2025-10-17T22:58:22Z

← Older revision		Revision as of 22:58, 17 October 2025
Line 61:		Line 61:
	local hours = string.format('%.0f', (warData['end'] - warData['start']) / 3600)		local hours = string.format('%.0f', (warData['end'] - warData['start']) / 3600)
	local hourplural = 'hours'		local hourplural = 'hours'
	if hours == 1 then		if tonumber(hours) == 1 then
	hourplural = 'hour'		hourplural = 'hour'
	end		end

Bobogoobo: fix grammar

2025-10-17T22:57:04Z

fix grammar

← Older revision		Revision as of 22:57, 17 October 2025
Line 3:		Line 3:
	-- War lookup without faction (special case for internal) - remember to use faction name not shell name.		-- War lookup without faction (special case for internal) - remember to use faction name not shell name.
	-- Use "clear" template (need to make it)		-- Use "clear" template (need to make it)
	~~-- Fix "1 hours"/"1 wars"~~
	local data = mw.loadData('Module:RankedWars/data')		local data = mw.loadData('Module:RankedWars/data')
	local jsonData = mw.loadJsonData('Module:RankedWars/data.json')		local jsonData = mw.loadJsonData('Module:RankedWars/data.json')
Line 24:		Line 23:
	local capName = factionName(faction)		local capName = factionName(faction)
	local overall = jsonData.wars.overall[faction]		local overall = jsonData.wars.overall[faction]
			local warplural = 'wars'
			if overall.wars == 1 then
			warplural = 'war'
			end

	return table.concat({		return table.concat({
Line 29:		Line 32:
	'has participated in',		'has participated in',
	overall.wars,		overall.wars,
	'ranked ~~wars~~, winning',		'ranked ' .. warplural .. ', winning',
	overall.wins,		overall.wins,
	'(' .. overall.termedWins .. ' termed)',		'(' .. overall.termedWins .. ' termed)',
Line 56:		Line 59:
	args = { warData.oppName }		args = { warData.oppName }
	})		})
			local hours = string.format('%.0f', (warData['end'] - warData['start']) / 3600)
			local hourplural = 'hours'
			if hours == 1 then
			hourplural = 'hour'
			end

	return mw.text.trim(table.concat({		return mw.text.trim(table.concat({
Line 66:		Line 74:
	os.date('!%F %T TCT', warData.start),		os.date('!%F %T TCT', warData.start),
	'and lasted',		'and lasted',
	~~string~~.~~format('%~~.0f'~~, (warData[~~'~~end~~'~~] - warData[~~'~~start']) / 3600)~~,		hours .. ' ' .. hourplural .. '.',
	'~~hours.~~ With a lead target of',		'With a lead target of',
	warData.target .. ',',		warData.target .. ',',
	capName,		capName,

Bobogoobo: use /data

2025-10-17T20:24:38Z

use /data

← Older revision		Revision as of 20:24, 17 October 2025
Line 166:		Line 166:
	end		end

	if faction and not ~~jsonData~~.factions[faction] then		if faction and not data.factions[faction] then
	return '<span class="error">incorrect faction name</span>'		return '<span class="error">incorrect faction name</span>'
	end		end

Bobogoobo: load /data, add json mode, fix logic error

2025-10-17T19:18:59Z

load /data, add json mode, fix logic error

← Older revision		Revision as of 19:18, 17 October 2025
Line 4:		Line 4:
	-- Use "clear" template (need to make it)		-- Use "clear" template (need to make it)
	-- Fix "1 hours"/"1 wars"		-- Fix "1 hours"/"1 wars"
	--local data = mw.loadData('Module:RankedWars/data')		local data = mw.loadData('Module:RankedWars/data')
	local jsonData = mw.loadJsonData('Module:RankedWars/data.json')		local jsonData = mw.loadJsonData('Module:RankedWars/data.json')

Line 11:		Line 11:
	local function factionName(facKey)		local function factionName(facKey)
	return mw.ustring.upper(mw.ustring.sub(facKey, 1, 1)) .. mw.ustring.sub(facKey, 2)		return mw.ustring.upper(mw.ustring.sub(facKey, 1, 1)) .. mw.ustring.sub(facKey, 2)
			end

			local function displayDataJson(ugly)
			local flag = mw.text.JSON_PRETTY
			if ugly and ugly ~= '' then
			flag = 0
			end
			return mw.text.jsonEncode(data, flag)
	end		end

Line 154:		Line 162:
	)		)

	if not faction then		if not faction and not (mode == 'json') then
	return '<span class="error">faction is currently required</span>'		return '<span class="error">faction is currently required</span>'
	end		end
Line 174:		Line 182:
	end		end
	return displayWarData(faction, war)		return displayWarData(faction, war)
			elseif mode == 'json' then
			return displayDataJson(args.ugly)
			elseif mode then
			return '<span class="error">unrecognized mode</span>'
	else		else
	return '<span class="error">mode is currently required</span>'		return '<span class="error">mode is currently required</span>'

Bobogoobo: add disambig in file name, display war note

2025-10-17T14:20:57Z

add disambig in file name, display war note

← Older revision		Revision as of 14:20, 17 October 2025
Line 1:		Line 1:
	--todo: ~~handle~~ ongoing wars (end = 0)~~. Display war.note if present.~~ War lookup without faction (special case for internal).		--todo:
	--~~todo: use~~ clear template (need to make it)		-- Handle ongoing wars (end = 0)
			-- War lookup without faction (special case for internal) - remember to use faction name not shell name.
			-- Use "clear" template (need to make it)
			-- Fix "1 hours"/"1 wars"
	--local data = mw.loadData('Module:RankedWars/data')		--local data = mw.loadData('Module:RankedWars/data')
	local jsonData = mw.loadJsonData('Module:RankedWars/data.json')		local jsonData = mw.loadJsonData('Module:RankedWars/data.json')
Line 46:		Line 49:
	})		})

	return table.concat({		return mw.text.trim(table.concat({
	'NPO - ' .. capName,		'NPO - ' .. capName,
	outcome,		outcome,
Line 63:		Line 66:
	'while the opponent scored',		'while the opponent scored',
	warData.oppScore .. '.',		warData.oppScore .. '.',
	}, ' ')		warData.note or '',
			}, ' '))
	end		end

Line 95:		Line 99:
	end		end
	out = out .. '===' .. heading .. '===\n'		out = out .. '===' .. heading .. '===\n'
	~~out~~ = ~~out~~ .. '[' .. '[' .. '~~File:~~' .. ~~faction~~ .. ' vs ' .. ~~warData~~.~~oppName~~ .. ' ~~ranked war graph.png~~\|right\|400px\|alt=Ranked war graph]]\n'
			local filename = faction .. ' vs ' .. warData.oppName
			if disambig then
			filename = filename .. ' (' .. disambig .. ')'
			end
			filename = filename .. ' ranked war graph.png'
			out = out .. '[' .. '[' .. 'File:' .. filename .. '\|right\|400px\|alt=Ranked war graph]]\n'

	local warpage		local warpage
	if mw.ustring.find(args['has page'], ',' .. warData.id .. ',', 1, true) then		if mw.ustring.find(args['has page'], ',' .. warData.id .. ',', 1, true) then
Line 109:		Line 120:
	}) .. '\n'		}) .. '\n'
	end		end

	out = out .. displayWarData(faction, warData.id) .. '\n'		out = out .. displayWarData(faction, warData.id) .. '\n'
	local blurb = args[tostring(warData.id)]		local blurb = args[tostring(warData.id)]
Line 115:		Line 127:
	end		end
	out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'		out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'
	out = out .. '<br style="clear:both" />\n'		out = out .. '<br style="clear:both;" />\n'
	out = out .. '\n'		out = out .. '\n'
	end		end

Bobogoobo: add clear

2025-10-16T14:13:14Z

add clear

← Older revision		Revision as of 14:13, 16 October 2025
Line 1:		Line 1:
	--todo: handle ongoing wars (end = 0). Display war.note if present. War lookup without faction (special case for internal).		--todo: handle ongoing wars (end = 0). Display war.note if present. War lookup without faction (special case for internal).
			--todo: use clear template (need to make it)
	--local data = mw.loadData('Module:RankedWars/data')		--local data = mw.loadData('Module:RankedWars/data')
	local jsonData = mw.loadJsonData('Module:RankedWars/data.json')		local jsonData = mw.loadJsonData('Module:RankedWars/data.json')
Line 71:		Line 72:
	local out = ''		local out = ''

	--The JSON sorts the wars numerically, we want newest first		--The JSON sorts the wars numerically and pairs is random, we want newest first
	for warID, warData in pairs(wars) do		for warID, warData in pairs(wars) do
	table.insert(warIDs, 1, warID)		table.insert(warIDs, 1, warID)
Line 114:		Line 115:
	end		end
	out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'		out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'
			out = out .. '<br style="clear:both" />\n'
	out = out .. '\n'		out = out .. '\n'
	end		end

Bobogoobo: derp

2025-10-16T14:04:50Z

derp

← Older revision		Revision as of 14:04, 16 October 2025
Line 69:		Line 69:
	local repeats = {}		local repeats = {}
	local wars = jsonData.wars[faction]		local wars = jsonData.wars[faction]
			local out = ''

	--The JSON sorts the wars numerically, we want newest first		--The JSON sorts the wars numerically, we want newest first
Line 79:		Line 80:
	end		end
	end		end
			table.sort(warIDs, function(wa, wb)
			return wb < wa
			end)

	for _, id in ipairs(warIDs) do		for _, id in ipairs(warIDs) do
	local warData = wars[id]		local warData = wars[id]
	~~local out = ''~~

	local heading = warData.oppName		local heading = warData.oppName
	local disambig		local disambig
	if repeats[warData.oppName] > 1 then		if repeats[warData.oppName] > 1 then
	disambig = os.~~time~~('!%b %Y', warData.start)		disambig = os.date('!%b %Y', warData.start)
	heading = heading .. ' (' .. disambig .. ')'		heading = heading .. ' (' .. disambig .. ')'
	end		end
Line 112:		Line 115:
	out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'		out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'
	out = out .. '\n'		out = out .. '\n'

	~~return out~~
	end		end

			return out
	end		end

Bobogoobo: add image and links

2025-10-16T13:34:36Z

add image and links

← Older revision		Revision as of 13:34, 16 October 2025
Line 40:		Line 40:
	terms = 'termed war'		terms = 'termed war'
	end		end
			local opponent = mw.getCurrentFrame():expandTemplate({
			title = 'Tornp',
			args = { warData.oppName }
			})

	return table.concat({		return table.concat({
	'NPO - ' .. capName,		'NPO - ' .. capName,
	outcome,		outcome,
	~~warData.oppName~~,		opponent,
	'in a',		'in a',
	terms,		terms,
Line 87:		Line 91:
	end		end
	out = out .. '===' .. heading .. '===\n'		out = out .. '===' .. heading .. '===\n'
			out = out .. '[' .. '[' .. 'File:' .. faction .. ' vs ' .. warData.oppName .. ' ranked war graph.png\|right\|400px\|alt=Ranked war graph]]\n'
	local warpage		local warpage
	if mw.ustring.find(args['has page'], ',' .. warData.id .. ',', 1, true) then		if mw.ustring.find(args['has page'], ',' .. warData.id .. ',', 1, true) then
Line 95:		Line 100:
	end		end
	if warpage then		if warpage then
	out = out .. ~~'{' .~~. '{~~' ..~~ 'main\|' .. warpage .. '}}\n'		out = out .. mw.getCurrentFrame():expandTemplate({
			title = 'main',
			args = { warpage }
			}) .. '\n'
	end		end
	out = out .. displayWarData(faction, warData.id) .. '\n'		out = out .. displayWarData(faction, warData.id) .. '\n'
	local blurb = args[tostring(warData.id)]		local blurb = args[tostring(warData.id)]
	if blurb then		if blurb then
	out = out .. '\n' .. blurb		out = out .. '\n' .. blurb .. '\n'
	end		end
			out = out .. '*[https://www.torn.com/war.php?step=rankreport&rankID=' .. warData.id .. ' War report on Torn]\n'
			out = out .. '\n'

	return out		return out