Fix team scoping bug and add object picker to matches/group-standings

TimWheeler-SQUP · claude · TimWheeler-SQUP · commit e559fdbe2d72 · 2026-06-12T12:55:55.000+01:00
Revert flag emojis — Regional Indicator Symbol pairs render as letter
codes (HR, GH, PA) rather than flag images in SquaredUp's table tile.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/plugins/WorldCup2026/v1/dataStreams/scripts/group-standings.js b/plugins/WorldCup2026/v1/dataStreams/scripts/group-standings.js
@@ -1,22 +1,6 @@
 var games = data.games || [];
 var teamFilter = context.objects[0] ? [].concat(context.objects[0].teamName)[0] || '' : '';
 
-var FLAG = {
-    'Algeria': '🇩🇿', 'Argentina': '🇦🇷', 'Australia': '🇦🇺', 'Austria': '🇦🇹',
-    'Belgium': '🇧🇪', 'Bosnia and Herzegovina': '🇧🇦', 'Brazil': '🇧🇷',
-    'Canada': '🇨🇦', 'Cape Verde': '🇨🇻', 'Colombia': '🇨🇴', 'Croatia': '🇭🇷',
-    'Curaçao': '🇨🇼', 'Czech Republic': '🇨🇿', 'Democratic Republic of the Congo': '🇨🇩',
-    'Ecuador': '🇪🇨', 'Egypt': '🇪🇬', 'England': '🏴󠁧󠁢󠁥󠁮󠁧󠁿', 'France': '🇫🇷',
-    'Germany': '🇩🇪', 'Ghana': '🇬🇭', 'Haiti': '🇭🇹', 'Iran': '🇮🇷', 'Iraq': '🇮🇶',
-    'Ivory Coast': '🇨🇮', 'Japan': '🇯🇵', 'Jordan': '🇯🇴', 'Mexico': '🇲🇽',
-    'Morocco': '🇲🇦', 'Netherlands': '🇳🇱', 'New Zealand': '🇳🇿', 'Norway': '🇳🇴',
-    'Panama': '🇵🇦', 'Paraguay': '🇵🇾', 'Portugal': '🇵🇹', 'Qatar': '🇶🇦',
-    'Saudi Arabia': '🇸🇦', 'Scotland': '🏴󠁧󠁢󠁳󠁣󠁴󠁿', 'Senegal': '🇸🇳',
-    'South Africa': '🇿🇦', 'South Korea': '🇰🇷', 'Spain': '🇪🇸', 'Sweden': '🇸🇪',
-    'Switzerland': '🇨🇭', 'Tunisia': '🇹🇳', 'Turkey': '🇹🇷',
-    'United States': '🇺🇸', 'Uruguay': '🇺🇾', 'Uzbekistan': '🇺🇿'
-};
-
 var groupGames = games.filter(function(g) { return g.type === 'group'; });
 
 var standings = {};
@@ -53,9 +37,8 @@ groupGames.forEach(function(g) {
 
 var rows = Object.keys(standings).map(function(k) {
     var s = standings[k];
-    var flag = FLAG[k] || '';
     return {
-        team: flag ? flag + ' ' + k : k,
+        team: k,
         group: s.group,
         mp: s.mp,
         w: s.w,
diff --git a/plugins/WorldCup2026/v1/dataStreams/scripts/last-match.js b/plugins/WorldCup2026/v1/dataStreams/scripts/last-match.js
@@ -1,22 +1,6 @@
 var games = data.games || [];
 var teamId = context.objects[0] ? String(context.objects[0].teamId) : '';
 
-var FLAG = {
-    'Algeria': '🇩🇿', 'Argentina': '🇦🇷', 'Australia': '🇦🇺', 'Austria': '🇦🇹',
-    'Belgium': '🇧🇪', 'Bosnia and Herzegovina': '🇧🇦', 'Brazil': '🇧🇷',
-    'Canada': '🇨🇦', 'Cape Verde': '🇨🇻', 'Colombia': '🇨🇴', 'Croatia': '🇭🇷',
-    'Curaçao': '🇨🇼', 'Czech Republic': '🇨🇿', 'Democratic Republic of the Congo': '🇨🇩',
-    'Ecuador': '🇪🇨', 'Egypt': '🇪🇬', 'England': '🏴󠁧󠁢󠁥󠁮󠁧󠁿', 'France': '🇫🇷',
-    'Germany': '🇩🇪', 'Ghana': '🇬🇭', 'Haiti': '🇭🇹', 'Iran': '🇮🇷', 'Iraq': '🇮🇶',
-    'Ivory Coast': '🇨🇮', 'Japan': '🇯🇵', 'Jordan': '🇯🇴', 'Mexico': '🇲🇽',
-    'Morocco': '🇲🇦', 'Netherlands': '🇳🇱', 'New Zealand': '🇳🇿', 'Norway': '🇳🇴',
-    'Panama': '🇵🇦', 'Paraguay': '🇵🇾', 'Portugal': '🇵🇹', 'Qatar': '🇶🇦',
-    'Saudi Arabia': '🇸🇦', 'Scotland': '🏴󠁧󠁢󠁳󠁣󠁴󠁿', 'Senegal': '🇸🇳',
-    'South Africa': '🇿🇦', 'South Korea': '🇰🇷', 'Spain': '🇪🇸', 'Sweden': '🇸🇪',
-    'Switzerland': '🇨🇭', 'Tunisia': '🇹🇳', 'Turkey': '🇹🇷',
-    'United States': '🇺🇸', 'Uruguay': '🇺🇾', 'Uzbekistan': '🇺🇿'
-};
-
 var stageMap = {
     group: 'Group Stage',
     r32: 'Round of 32',
@@ -54,12 +38,11 @@ if (played.length === 0) {
     var oppScore = parseInt(isHome ? last.away_score : last.home_score, 10);
     var scoreStr = isHome ? last.home_score + '-' + last.away_score : last.away_score + '-' + last.home_score;
     var matchResult = myScore > oppScore ? 'Win' : myScore < oppScore ? 'Loss' : 'Draw';
-    var opFlag = FLAG[opponent] || '';
 
     result = [{
         date: last.local_date,
         home_away: isHome ? 'Home' : 'Away',
-        opponent: opFlag ? opFlag + ' ' + opponent : opponent,
+        opponent: opponent,
         score: scoreStr,
         result: matchResult,
         stage: stageMap[last.type] || last.type,
diff --git a/plugins/WorldCup2026/v1/dataStreams/scripts/matches.js b/plugins/WorldCup2026/v1/dataStreams/scripts/matches.js
@@ -1,22 +1,6 @@
 var games = data.games || [];
 var teamId = context.objects[0] ? String(context.objects[0].teamId) : '';
 
-var FLAG = {
-    'Algeria': '🇩🇿', 'Argentina': '🇦🇷', 'Australia': '🇦🇺', 'Austria': '🇦🇹',
-    'Belgium': '🇧🇪', 'Bosnia and Herzegovina': '🇧🇦', 'Brazil': '🇧🇷',
-    'Canada': '🇨🇦', 'Cape Verde': '🇨🇻', 'Colombia': '🇨🇴', 'Croatia': '🇭🇷',
-    'Curaçao': '🇨🇼', 'Czech Republic': '🇨🇿', 'Democratic Republic of the Congo': '🇨🇩',
-    'Ecuador': '🇪🇨', 'Egypt': '🇪🇬', 'England': '🏴󠁧󠁢󠁥󠁮󠁧󠁿', 'France': '🇫🇷',
-    'Germany': '🇩🇪', 'Ghana': '🇬🇭', 'Haiti': '🇭🇹', 'Iran': '🇮🇷', 'Iraq': '🇮🇶',
-    'Ivory Coast': '🇨🇮', 'Japan': '🇯🇵', 'Jordan': '🇯🇴', 'Mexico': '🇲🇽',
-    'Morocco': '🇲🇦', 'Netherlands': '🇳🇱', 'New Zealand': '🇳🇿', 'Norway': '🇳🇴',
-    'Panama': '🇵🇦', 'Paraguay': '🇵🇾', 'Portugal': '🇵🇹', 'Qatar': '🇶🇦',
-    'Saudi Arabia': '🇸🇦', 'Scotland': '🏴󠁧󠁢󠁳󠁣󠁴󠁿', 'Senegal': '🇸🇳',
-    'South Africa': '🇿🇦', 'South Korea': '🇰🇷', 'Spain': '🇪🇸', 'Sweden': '🇸🇪',
-    'Switzerland': '🇨🇭', 'Tunisia': '🇹🇳', 'Turkey': '🇹🇷',
-    'United States': '🇺🇸', 'Uruguay': '🇺🇾', 'Uzbekistan': '🇺🇿'
-};
-
 var stageMap = {
     group: 'Group Stage',
     r32: 'Round of 32',
@@ -33,20 +17,11 @@ function parseDate(d) {
     return new Date(dateParts[2] + '-' + dateParts[0] + '-' + dateParts[1] + 'T' + parts[1] + ':00');
 }
 
-function withFlag(name) {
-    if (!name) return name;
-    var flag = FLAG[name];
-    return flag ? flag + ' ' + name : name;
-}
-
 function getTeamName(game, side) {
-    var name;
     if (side === 'home') {
-        name = game.home_team_id !== '0' ? game.home_team_name_en : (game.home_team_label || 'TBD');
-    } else {
-        name = game.away_team_id !== '0' ? game.away_team_name_en : (game.away_team_label || 'TBD');
+        return game.home_team_id !== '0' ? game.home_team_name_en : (game.home_team_label || 'TBD');
     }
-    return withFlag(name);
+    return game.away_team_id !== '0' ? game.away_team_name_en : (game.away_team_label || 'TBD');
 }
 
 var filtered = games.filter(function(g) {
diff --git a/plugins/WorldCup2026/v1/dataStreams/scripts/next-match.js b/plugins/WorldCup2026/v1/dataStreams/scripts/next-match.js
@@ -1,22 +1,6 @@
 var games = data.games || [];
 var teamId = context.objects[0] ? String(context.objects[0].teamId) : '';
 
-var FLAG = {
-    'Algeria': '🇩🇿', 'Argentina': '🇦🇷', 'Australia': '🇦🇺', 'Austria': '🇦🇹',
-    'Belgium': '🇧🇪', 'Bosnia and Herzegovina': '🇧🇦', 'Brazil': '🇧🇷',
-    'Canada': '🇨🇦', 'Cape Verde': '🇨🇻', 'Colombia': '🇨🇴', 'Croatia': '🇭🇷',
-    'Curaçao': '🇨🇼', 'Czech Republic': '🇨🇿', 'Democratic Republic of the Congo': '🇨🇩',
-    'Ecuador': '🇪🇨', 'Egypt': '🇪🇬', 'England': '🏴󠁧󠁢󠁥󠁮󠁧󠁿', 'France': '🇫🇷',
-    'Germany': '🇩🇪', 'Ghana': '🇬🇭', 'Haiti': '🇭🇹', 'Iran': '🇮🇷', 'Iraq': '🇮🇶',
-    'Ivory Coast': '🇨🇮', 'Japan': '🇯🇵', 'Jordan': '🇯🇴', 'Mexico': '🇲🇽',
-    'Morocco': '🇲🇦', 'Netherlands': '🇳🇱', 'New Zealand': '🇳🇿', 'Norway': '🇳🇴',
-    'Panama': '🇵🇦', 'Paraguay': '🇵🇾', 'Portugal': '🇵🇹', 'Qatar': '🇶🇦',
-    'Saudi Arabia': '🇸🇦', 'Scotland': '🏴󠁧󠁢󠁳󠁣󠁴󠁿', 'Senegal': '🇸🇳',
-    'South Africa': '🇿🇦', 'South Korea': '🇰🇷', 'Spain': '🇪🇸', 'Sweden': '🇸🇪',
-    'Switzerland': '🇨🇭', 'Tunisia': '🇹🇳', 'Turkey': '🇹🇷',
-    'United States': '🇺🇸', 'Uruguay': '🇺🇾', 'Uzbekistan': '🇺🇿'
-};
-
 var stageMap = {
     group: 'Group Stage',
     r32: 'Round of 32',
@@ -56,11 +40,10 @@ if (upcoming.length === 0) {
     if (!opponent || opponent === 'undefined') {
         opponent = isHome ? (next.away_team_label || 'TBD') : (next.home_team_label || 'TBD');
     }
-    var opFlag = FLAG[opponent] || '';
     result = [{
         date: next.local_date,
         home_away: isHome ? 'Home' : 'Away',
-        opponent: opFlag ? opFlag + ' ' + opponent : opponent,
+        opponent: opponent,
         stage: stageMap[next.type] || next.type,
         group: next.type === 'group' ? 'Group ' + next.group : '',
         sourceId: sourceId
diff --git a/plugins/WorldCup2026/v1/dataStreams/scripts/team-standing.js b/plugins/WorldCup2026/v1/dataStreams/scripts/team-standing.js
@@ -1,24 +1,8 @@
 var games = data.games || [];
 var teamId = context.objects[0] ? String([].concat(context.objects[0].teamId)[0] || '') : '';
 var teamName = context.objects[0] ? [].concat(context.objects[0].teamName)[0] || '' : '';
-var iso2Raw = context.objects[0] ? [].concat(context.objects[0].iso2)[0] || '' : '';
 var group = context.objects[0] ? [].concat(context.objects[0].group)[0] || '' : '';
 
-function flagFromIso2(code) {
-    if (!code) return '';
-    if (code === 'ENG') return '🏴󠁧󠁢󠁥󠁮󠁧󠁿';
-    if (code === 'SCO') return '🏴󠁧󠁢󠁳󠁣󠁴󠁿';
-    if (code.length === 2) {
-        return code.toUpperCase().split('').map(function(c) {
-            return String.fromCodePoint(c.charCodeAt(0) + 127397);
-        }).join('');
-    }
-    return '';
-}
-
-var flag = flagFromIso2(iso2Raw);
-var country = flag ? flag + ' ' + teamName : teamName;
-
 var groupGames = games.filter(function(g) {
     return g.type === 'group' &&
         (g.home_team_id === teamId || g.away_team_id === teamId);
@@ -43,4 +27,4 @@ var pts = (w * 3) + d;
 var gd = gf - ga;
 
 var sourceId = context.objects[0] ? context.objects[0].sourceId : '';
-result = [{ country: country, group: group, mp: mp, w: w, d: d, l: l, pts: pts, gf: gf, ga: ga, gd: gd, sourceId: sourceId }];
+result = [{ country: teamName, group: group, mp: mp, w: w, d: d, l: l, pts: pts, gf: gf, ga: ga, gd: gd, sourceId: sourceId }];
diff --git a/plugins/WorldCup2026/v1/metadata.json b/plugins/WorldCup2026/v1/metadata.json
@@ -1,7 +1,7 @@
 {
     "name": "worldcup2026",
     "displayName": "FIFA World Cup 2026",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "author": {
         "name": "@TimWheeler-SQUP",
         "type": "community"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "worldcup2026",`
`3`	`3`	`"displayName": "FIFA World Cup 2026",`
`4`		`- "version": "1.1.0",`
	`4`	`+ "version": "1.1.1",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "@TimWheeler-SQUP",`
`7`	`7`	`"type": "community"`