BlueGit

projects-timfalken-com meteors

Merge feature/t1247-leaderboard: leaderboard under Play online, global top 10 and friends (t1247)

timfa Grok Bot · pushed by timfa

Authored 2026-11-16 · 1 day ago

Hash
99b08527dcfe29e2d7594aa41a833b5a824fd6bf
Pipeline
Passed
17 files changed +1576 −29
README.md +8 −2
@@ -15,8 +15,14 @@ Live (na de eerste deploy): https://projects.timfalken.com/meteors/
15 15 voor gast, dan blijft die keuze bewaard in deze tab (niet over een
16 16 nieuwe sessie). Het hoofdmenu (t1201) heeft **Spelen** (grote knop:
17 17 rondes tegen lokale bots, voorheen “Offline Strijd”), **Overleven**
18 (eindeloos alleen, voorheen “Spelen”) en **Online spelen**. Hieronder
19 de regels van het veld zelf.
18 (eindeloos alleen, voorheen “Spelen”), **Online spelen** en daaronder
19 **Ranglijst** (t1247): de top 10 op het puntentotaal van je profiel
20 (het getal waar het puntenscherm naartoe telt). Een tweede tab toont
21 alleen mensen op je vriendenlijst van
22 [auth.timfalken.com](https://auth.timfalken.com). Gasten zien de
23 wereldwijde top 10; de vriendentab vraagt hen in te loggen. Sta je
24 zelf in de lijst, dan is je rij gemarkeerd, met avatar en naam.
25 Hieronder de regels van het veld zelf.
20 26 2. Elke seconde valt er een blokje van één van vijf kleuren in een willekeurige kolom.
21 27 3. In een stilliggende kolom sleep je blokjes verticaal; ze wisselen om met de blokjes waar je langs gaat.
22 28 4. Drie of meer blokjes van dezelfde kleur op een rij (horizontaal of verticaal) worden donkergrijs, krijgen een vlam en springen omhoog. Alles wat erop stond, vliegt mee.
@@ -15,8 +15,14 @@ Live (na de eerste deploy): https://projects.timfalken.com/meteors/
15 voor gast, dan blijft die keuze bewaard in deze tab (niet over een
15 voor gast, dan blijft die keuze bewaard in deze tab (niet over een
16 nieuwe sessie). Het hoofdmenu (t1201) heeft **Spelen** (grote knop:
16 nieuwe sessie). Het hoofdmenu (t1201) heeft **Spelen** (grote knop:
17 rondes tegen lokale bots, voorheen “Offline Strijd”), **Overleven**
17 rondes tegen lokale bots, voorheen “Offline Strijd”), **Overleven**
18 (eindeloos alleen, voorheen “Spelen”) en **Online spelen**. Hieronder
18 (eindeloos alleen, voorheen “Spelen”), **Online spelen** en daaronder
19 de regels van het veld zelf.
19 **Ranglijst** (t1247): de top 10 op het puntentotaal van je profiel
20 (het getal waar het puntenscherm naartoe telt). Een tweede tab toont
21 alleen mensen op je vriendenlijst van
22 [auth.timfalken.com](https://auth.timfalken.com). Gasten zien de
23 wereldwijde top 10; de vriendentab vraagt hen in te loggen. Sta je
24 zelf in de lijst, dan is je rij gemarkeerd, met avatar en naam.
25 Hieronder de regels van het veld zelf.
202. Elke seconde valt er een blokje van één van vijf kleuren in een willekeurige kolom.
262. Elke seconde valt er een blokje van één van vijf kleuren in een willekeurige kolom.
213. In een stilliggende kolom sleep je blokjes verticaal; ze wisselen om met de blokjes waar je langs gaat.
273. In een stilliggende kolom sleep je blokjes verticaal; ze wisselen om met de blokjes waar je langs gaat.
224. Drie of meer blokjes van dezelfde kleur op een rij (horizontaal of verticaal) worden donkergrijs, krijgen een vlam en springen omhoog. Alles wat erop stond, vliegt mee.
284. Drie of meer blokjes van dezelfde kleur op een rij (horizontaal of verticaal) worden donkergrijs, krijgen een vlam en springen omhoog. Alles wat erop stond, vliegt mee.
build/game.js +403 −10
@@ -1313,7 +1313,15 @@ var I18N_CATALOG = {
1313 1313 "offline.defeated.many": "{n} opponents defeated",
1314 1314 "offline.defeated.other": "{n} opponents defeated",
1315 1315 "stats.gravity": "{pct}% ({g}g)",
1316 "menu.survival": "Survival"
1316 "menu.survival": "Survival",
1317 "menu.leaderboard": "Leaderboard",
1318 "leaderboard.title": "Leaderboard",
1319 "leaderboard.global": "Top 10",
1320 "leaderboard.friends": "Friends",
1321 "leaderboard.empty": "No scores yet.",
1322 "leaderboard.loginPrompt": "Log in to see how your friends rank.",
1323 "leaderboard.loadError": "The leaderboard could not be loaded.",
1324 "leaderboard.points": "{n} points"
1317 1325 },
1318 1326 "nl": {
1319 1327 "menu.play": "Spelen",
@@ -1606,7 +1614,15 @@ var I18N_CATALOG = {
1606 1614 "offline.defeated.many": "{n} tegenstanders verslagen",
1607 1615 "offline.defeated.other": "{n} tegenstanders verslagen",
1608 1616 "stats.gravity": "{pct}% ({g}g)",
1609 "menu.survival": "Overleven"
1617 "menu.survival": "Overleven",
1618 "menu.leaderboard": "Ranglijst",
1619 "leaderboard.title": "Ranglijst",
1620 "leaderboard.global": "Top 10",
1621 "leaderboard.friends": "Vrienden",
1622 "leaderboard.empty": "Nog geen scores.",
1623 "leaderboard.loginPrompt": "Log in om te zien hoe je vrienden ervoor staan.",
1624 "leaderboard.loadError": "De ranglijst kon niet worden geladen.",
1625 "leaderboard.points": "{n} punten"
1610 1626 },
1611 1627 "de": {
1612 1628 "menu.play": "Spielen",
@@ -1899,7 +1915,15 @@ var I18N_CATALOG = {
1899 1915 "offline.defeated.many": "{n} Gegner besiegt",
1900 1916 "offline.defeated.other": "{n} Gegner besiegt",
1901 1917 "stats.gravity": "{pct} % ({g} g)",
1902 "menu.survival": "Überleben"
1918 "menu.survival": "Überleben",
1919 "menu.leaderboard": "Rangliste",
1920 "leaderboard.title": "Rangliste",
1921 "leaderboard.global": "Top 10",
1922 "leaderboard.friends": "Freunde",
1923 "leaderboard.empty": "Noch keine Punkte.",
1924 "leaderboard.loginPrompt": "Melde dich an, um zu sehen, wie deine Freunde dastehen.",
1925 "leaderboard.loadError": "Die Rangliste konnte nicht geladen werden.",
1926 "leaderboard.points": "{n} Punkte"
1903 1927 },
1904 1928 "fr": {
1905 1929 "menu.play": "Jouer",
@@ -2192,7 +2216,15 @@ var I18N_CATALOG = {
2192 2216 "offline.defeated.many": "{n} adversaires vaincus",
2193 2217 "offline.defeated.other": "{n} adversaires vaincus",
2194 2218 "stats.gravity": "{pct} % ({g} g)",
2195 "menu.survival": "Survie"
2219 "menu.survival": "Survie",
2220 "menu.leaderboard": "Classement",
2221 "leaderboard.title": "Classement",
2222 "leaderboard.global": "Top 10",
2223 "leaderboard.friends": "Amis",
2224 "leaderboard.empty": "Pas encore de scores.",
2225 "leaderboard.loginPrompt": "Connecte-toi pour voir le classement de tes amis.",
2226 "leaderboard.loadError": "Le classement n'a pas pu être chargé.",
2227 "leaderboard.points": "{n} points"
2196 2228 },
2197 2229 "ja": {
2198 2230 "menu.play": "プレイ",
@@ -2485,7 +2517,15 @@ var I18N_CATALOG = {
2485 2517 "offline.defeated.many": "{n}人の相手を倒した",
2486 2518 "offline.defeated.other": "{n}人の相手を倒した",
2487 2519 "stats.gravity": "{pct}% ({g}g)",
2488 "menu.survival": "サバイバル"
2520 "menu.survival": "サバイバル",
2521 "menu.leaderboard": "ランキング",
2522 "leaderboard.title": "ランキング",
2523 "leaderboard.global": "トップ10",
2524 "leaderboard.friends": "フレンド",
2525 "leaderboard.empty": "まだスコアがありません。",
2526 "leaderboard.loginPrompt": "ログインするとフレンドの順位が見られます。",
2527 "leaderboard.loadError": "ランキングを読み込めませんでした。",
2528 "leaderboard.points": "{n} ポイント"
2489 2529 },
2490 2530 "zh": {
2491 2531 "menu.play": "开始游戏",
@@ -2778,7 +2818,15 @@ var I18N_CATALOG = {
2778 2818 "offline.defeated.many": "击败了 {n} 名对手",
2779 2819 "offline.defeated.other": "击败了 {n} 名对手",
2780 2820 "stats.gravity": "{pct}% ({g}g)",
2781 "menu.survival": "生存"
2821 "menu.survival": "生存",
2822 "menu.leaderboard": "排行榜",
2823 "leaderboard.title": "排行榜",
2824 "leaderboard.global": "前 10 名",
2825 "leaderboard.friends": "好友",
2826 "leaderboard.empty": "还没有分数。",
2827 "leaderboard.loginPrompt": "登录后即可查看好友排名。",
2828 "leaderboard.loadError": "无法加载排行榜。",
2829 "leaderboard.points": "{n} 分"
2782 2830 },
2783 2831 "ko": {
2784 2832 "menu.play": "플레이",
@@ -3071,7 +3119,15 @@ var I18N_CATALOG = {
3071 3119 "offline.defeated.many": "상대 {n}명 격파",
3072 3120 "offline.defeated.other": "상대 {n}명 격파",
3073 3121 "stats.gravity": "{pct}% ({g}g)",
3074 "menu.survival": "서바이벌"
3122 "menu.survival": "서바이벌",
3123 "menu.leaderboard": "순위표",
3124 "leaderboard.title": "순위표",
3125 "leaderboard.global": "상위 10",
3126 "leaderboard.friends": "친구",
3127 "leaderboard.empty": "아직 점수가 없습니다.",
3128 "leaderboard.loginPrompt": "로그인하면 친구 순위를 볼 수 있습니다.",
3129 "leaderboard.loadError": "순위표를 불러올 수 없습니다.",
3130 "leaderboard.points": "{n}점"
3075 3131 },
3076 3132 "pl": {
3077 3133 "menu.play": "Graj",
@@ -3364,7 +3420,15 @@ var I18N_CATALOG = {
3364 3420 "offline.defeated.many": "{n} pokonanych przeciwników",
3365 3421 "offline.defeated.other": "{n} pokonanych przeciwników",
3366 3422 "stats.gravity": "{pct} % ({g} g)",
3367 "menu.survival": "Przetrwanie"
3423 "menu.survival": "Przetrwanie",
3424 "menu.leaderboard": "Ranking",
3425 "leaderboard.title": "Ranking",
3426 "leaderboard.global": "Top 10",
3427 "leaderboard.friends": "Znajomi",
3428 "leaderboard.empty": "Brak wyników.",
3429 "leaderboard.loginPrompt": "Zaloguj się, aby zobaczyć pozycję znajomych.",
3430 "leaderboard.loadError": "Nie udało się wczytać rankingu.",
3431 "leaderboard.points": "{n} pkt"
3368 3432 },
3369 3433 "ru": {
3370 3434 "menu.play": "Играть",
@@ -3657,7 +3721,15 @@ var I18N_CATALOG = {
3657 3721 "offline.defeated.many": "{n} противников побеждено",
3658 3722 "offline.defeated.other": "{n} противников побеждено",
3659 3723 "stats.gravity": "{pct} % ({g} g)",
3660 "menu.survival": "Выживание"
3724 "menu.survival": "Выживание",
3725 "menu.leaderboard": "Таблица лидеров",
3726 "leaderboard.title": "Таблица лидеров",
3727 "leaderboard.global": "Топ-10",
3728 "leaderboard.friends": "Друзья",
3729 "leaderboard.empty": "Пока нет очков.",
3730 "leaderboard.loginPrompt": "Войди, чтобы увидеть места друзей.",
3731 "leaderboard.loadError": "Не удалось загрузить таблицу лидеров.",
3732 "leaderboard.points": "{n} очков"
3661 3733 },
3662 3734 "es": {
3663 3735 "menu.play": "Jugar",
@@ -3950,7 +4022,15 @@ var I18N_CATALOG = {
3950 4022 "offline.defeated.many": "{n} rivales derrotados",
3951 4023 "offline.defeated.other": "{n} rivales derrotados",
3952 4024 "stats.gravity": "{pct} % ({g} g)",
3953 "menu.survival": "Supervivencia"
4025 "menu.survival": "Supervivencia",
4026 "menu.leaderboard": "Clasificación",
4027 "leaderboard.title": "Clasificación",
4028 "leaderboard.global": "Top 10",
4029 "leaderboard.friends": "Amigos",
4030 "leaderboard.empty": "Aún no hay puntuaciones.",
4031 "leaderboard.loginPrompt": "Inicia sesión para ver la clasificación de tus amigos.",
4032 "leaderboard.loadError": "No se pudo cargar la clasificación.",
4033 "leaderboard.points": "{n} puntos"
3954 4034 }
3955 4035 },
3956 4036 "errors": {
@@ -9850,6 +9930,38 @@ Online.loginUrl = function ()
9850 9930 return 'auth.php?return=online';
9851 9931 };
9852 9932
9933 /** t1247: global or friends leaderboard (GET, no CSRF). */
9934 Online.leaderboard = function (scope)
9935 {
9936 var self = this;
9937 var url = 'api.php?action=leaderboard&scope=' + encodeURIComponent(scope === 'friends' ? 'friends' : 'global');
9938 return fetch(url, {
9939 method: 'GET',
9940 credentials: 'same-origin',
9941 headers: this._headers(false)
9942 }).then(function (res)
9943 {
9944 return res.json().then(function (data)
9945 {
9946 data = data || {};
9947 if (!res.ok && !data.error)
9948 {
9949 data.error = (typeof I18n !== 'undefined'
9950 ? I18n.t('error.serverStatus', { status: res.status })
9951 : ('De server gaf ' + res.status));
9952 data.ok = false;
9953 }
9954 return data;
9955 }, function ()
9956 {
9957 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.badResponse') : 'Geen geldig antwoord van de server.') };
9958 });
9959 }).catch(function ()
9960 {
9961 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.connection') : 'Geen verbinding met de server.') };
9962 });
9963 };
9964
9853 9965 Online.logoutUrl = function ()
9854 9966 {
9855 9967 return 'logout.php';
@@ -13622,6 +13734,130 @@ else if (typeof globalThis !== 'undefined')
13622 13734 * /workspace/meteors/src/loginPrompt.js
13623 13735 */
13624 13736
13737 /*
13738 * Start File:
13739 * /workspace/meteors/src/avatar.js
13740 */
13741 'use strict';
13742
13743 /**
13744 * Player avatars, same idea as Allianties: a coloured initials circle,
13745 * with the auth profile picture on top when it loads. A failed picture
13746 * is dropped; the initials stay.
13747 */
13748 var Avatar = {
13749 failed: {},
13750 loaded: {},
13751
13752 initials: function (name)
13753 {
13754 if (!name) { return '?'; }
13755 var parts = String(name).trim().split(/[\s._-]+/).filter(function (s) { return s.length > 0; });
13756 if (!parts.length) { return '?'; }
13757 var first = Array.from(parts[0]);
13758 var s = first[0];
13759 if (parts.length > 1) { s += Array.from(parts[parts.length - 1])[0]; }
13760 else if (first.length > 1 && /[a-z]/i.test(first[1])) { s += first[1]; }
13761 return s.toUpperCase();
13762 },
13763
13764 usableUrl: function (url)
13765 {
13766 if (typeof url !== 'string') { return null; }
13767 url = url.trim();
13768 if (!url) { return null; }
13769 if (!/^(https?:\/\/|data:image\/|\/|\.{0,2}\/?[\w-])/i.test(url)) { return null; }
13770 if (/^(javascript|vbscript):/i.test(url)) { return null; }
13771 if (Avatar.failed[url]) { return null; }
13772 return url;
13773 },
13774
13775 colorFor: function (id)
13776 {
13777 var palette = ['#e85d5d', '#4fa3e8', '#5dd39e', '#e8c547', '#b07ce8', '#e8873a', '#3ad1d1', '#e86fb8'];
13778 var h = 0;
13779 String(id || '').split('').forEach(function (c) { h = (h * 31 + c.charCodeAt(0)) >>> 0; });
13780 return palette[h % palette.length];
13781 },
13782
13783 textColor: function (hex)
13784 {
13785 var m = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(String(hex || ''));
13786 if (!m) { return '#fff'; }
13787 var v = m[1];
13788 if (v.length === 3) { v = v[0] + v[0] + v[1] + v[1] + v[2] + v[2]; }
13789 var r = parseInt(v.slice(0, 2), 16), g = parseInt(v.slice(2, 4), 16), b = parseInt(v.slice(4, 6), 16);
13790 var lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
13791 return lum > 0.6 ? '#111' : '#fff';
13792 },
13793
13794 piece: function (player, opts)
13795 {
13796 opts = opts || {};
13797 var doc = opts.doc || document;
13798 var color = player.color || Avatar.colorFor(player.id || player.name);
13799 var el = doc.createElement('span');
13800 el.className = 'player-avatar' + (player.alive === false ? ' dead' : '');
13801 el.setAttribute('role', 'img');
13802 el.setAttribute('aria-label', player.name || '?');
13803 el.title = player.name || '';
13804 el.style.borderColor = color;
13805 el.style.backgroundColor = color;
13806 el.style.color = Avatar.textColor(color);
13807 if (opts.size)
13808 {
13809 var size = opts.size;
13810 el.style.width = size + 'px';
13811 el.style.height = size + 'px';
13812 el.style.fontSize = Math.max(10, Math.round(size * 0.4)) + 'px';
13813 }
13814 var txt = doc.createElement('span');
13815 txt.className = 'player-avatar-initials';
13816 txt.textContent = Avatar.initials(player.name);
13817 el.appendChild(txt);
13818 var url = Avatar.usableUrl(player.avatar);
13819 if (url)
13820 {
13821 var img = doc.createElement('img');
13822 img.alt = '';
13823 img.className = 'player-avatar-img';
13824 img.decoding = 'async';
13825 img.referrerPolicy = 'no-referrer';
13826 img.addEventListener('error', function ()
13827 {
13828 Avatar.failed[url] = true;
13829 el.classList.remove('has-img');
13830 if (img.parentNode) { img.parentNode.removeChild(img); }
13831 });
13832 img.addEventListener('load', function ()
13833 {
13834 if (!img.naturalWidth)
13835 {
13836 Avatar.failed[url] = true;
13837 if (img.parentNode) { img.parentNode.removeChild(img); }
13838 return;
13839 }
13840 Avatar.loaded[url] = true;
13841 el.classList.add('has-img');
13842 });
13843 if (Avatar.loaded[url]) { el.classList.add('has-img'); }
13844 img.src = url;
13845 el.appendChild(img);
13846 }
13847 return el;
13848 }
13849 };
13850
13851 if (typeof module !== 'undefined' && module.exports)
13852 { module.exports = Avatar; }
13853 else if (typeof globalThis !== 'undefined')
13854 { globalThis.Avatar = Avatar; }
13855
13856 /*
13857 * End File:
13858 * /workspace/meteors/src/avatar.js
13859 */
13860
13625 13861 /*
13626 13862 * Start File:
13627 13863 * /workspace/meteors/src/main.js
@@ -13752,6 +13988,7 @@ window.onload = function ()
13752 13988 { refreshAllUi(); });
13753 13989 }
13754 13990 bindOnlineUi();
13991 bindLeaderboard();
13755 13992 bindOfflineUi();
13756 13993 bindPlanetSelect();
13757 13994 restoreSelectedPlanet();
@@ -16487,6 +16724,160 @@ function applyProfileLocale ()
16487 16724 { Online.setLocale(I18n.locale); }
16488 16725 }
16489 16726
16727 /* ---------- t1247 leaderboard -------------------------------------- */
16728
16729 function bindLeaderboard ()
16730 {
16731 var btn = document.getElementById('btn-leaderboard');
16732 if (btn)
16733 { btn.addEventListener('click', function () { openLeaderboard(); }); }
16734 var back = document.getElementById('btn-lb-back');
16735 if (back)
16736 { back.addEventListener('click', closeLeaderboard); }
16737 var globalTab = document.getElementById('lb-tab-global');
16738 var friendsTab = document.getElementById('lb-tab-friends');
16739 if (globalTab)
16740 { globalTab.addEventListener('click', function () { setLeaderboardTab('global'); }); }
16741 if (friendsTab)
16742 { friendsTab.addEventListener('click', function () { setLeaderboardTab('friends'); }); }
16743 }
16744
16745 function openLeaderboard (tab)
16746 {
16747 hideEl('menu');
16748 hideEl('online-panel');
16749 hideEl('planet-select');
16750 hideEl('login-prompt');
16751 app.mode = 'leaderboard';
16752 app.leaderboardTab = tab || app.leaderboardTab || 'global';
16753 showEl('leaderboard');
16754 setLeaderboardTab(app.leaderboardTab);
16755 }
16756
16757 function closeLeaderboard ()
16758 {
16759 hideEl('leaderboard');
16760 app.mode = 'menu';
16761 showEl('menu');
16762 }
16763
16764 function setLeaderboardTab (tab)
16765 {
16766 tab = tab === 'friends' ? 'friends' : 'global';
16767 app.leaderboardTab = tab;
16768 var globalTab = document.getElementById('lb-tab-global');
16769 var friendsTab = document.getElementById('lb-tab-friends');
16770 if (globalTab)
16771 { globalTab.setAttribute('aria-selected', tab === 'global' ? 'true' : 'false'); }
16772 if (friendsTab)
16773 { friendsTab.setAttribute('aria-selected', tab === 'friends' ? 'true' : 'false'); }
16774 loadLeaderboard(tab);
16775 }
16776
16777 function loadLeaderboard (tab)
16778 {
16779 tab = tab || app.leaderboardTab || 'global';
16780 var login = document.getElementById('lb-login');
16781 var list = document.getElementById('lb-list');
16782 var empty = document.getElementById('lb-empty');
16783 var err = document.getElementById('lb-error');
16784 if (err)
16785 { err.hidden = true; err.textContent = ''; }
16786 if (empty)
16787 { empty.hidden = true; }
16788 if (list)
16789 { list.innerHTML = ''; }
16790 var loggedIn = typeof Online !== 'undefined' && !!Online.me;
16791 if (tab === 'friends' && !loggedIn)
16792 {
16793 if (login)
16794 { login.hidden = false; }
16795 return;
16796 }
16797 if (login)
16798 { login.hidden = true; }
16799 if (typeof Online === 'undefined' || !Online.leaderboard)
16800 {
16801 showLeaderboardError((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
16802 return;
16803 }
16804 Online.leaderboard(tab).then(function (data)
16805 {
16806 if (app.mode !== 'leaderboard' || app.leaderboardTab !== tab)
16807 { return; }
16808 if (!data || data.ok === false)
16809 {
16810 var msg = (data && data.error)
16811 ? ((typeof I18n !== 'undefined') ? I18n.error(data.error) : data.error)
16812 : ((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
16813 showLeaderboardError(msg);
16814 return;
16815 }
16816 if (tab === 'friends' && data.login_required)
16817 {
16818 if (login)
16819 { login.hidden = false; }
16820 return;
16821 }
16822 renderLeaderboard(data.players || [], tab);
16823 });
16824 }
16825
16826 function showLeaderboardError (text)
16827 {
16828 var err = document.getElementById('lb-error');
16829 if (!err)
16830 { return; }
16831 err.hidden = !text;
16832 err.textContent = text || '';
16833 }
16834
16835 function renderLeaderboard (players, tab)
16836 {
16837 var list = document.getElementById('lb-list');
16838 var empty = document.getElementById('lb-empty');
16839 var login = document.getElementById('lb-login');
16840 if (login)
16841 { login.hidden = true; }
16842 if (!list)
16843 { return; }
16844 list.innerHTML = '';
16845 if (!players || !players.length)
16846 {
16847 if (empty)
16848 { empty.hidden = false; }
16849 return;
16850 }
16851 if (empty)
16852 { empty.hidden = true; }
16853 var meId = (typeof Online !== 'undefined' && Online.me) ? Online.me.id : null;
16854 for (var i = 0; i < players.length; i++)
16855 {
16856 var p = players[i];
16857 var li = document.createElement('li');
16858 var you = !!(p.you || (meId && p.id === meId));
16859 li.className = 'lb-row' + (you ? ' you' : '');
16860 var rank = document.createElement('span');
16861 rank.className = 'lb-rank';
16862 rank.textContent = String(p.rank || (i + 1));
16863 li.appendChild(rank);
16864 if (typeof Avatar !== 'undefined' && Avatar.piece)
16865 { li.appendChild(Avatar.piece({ id: p.id, name: p.name, avatar: p.avatar }, { size: 40 })); }
16866 var name = document.createElement('span');
16867 name.className = 'lb-name';
16868 name.textContent = p.name || '';
16869 li.appendChild(name);
16870 var pts = document.createElement('span');
16871 pts.className = 'lb-points';
16872 var n = p.points || 0;
16873 pts.textContent = (typeof I18n !== 'undefined')
16874 ? I18n.t('leaderboard.points', { n: n }, n + ' points')
16875 : (n + ' points');
16876 li.appendChild(pts);
16877 list.appendChild(li);
16878 }
16879 }
16880
16490 16881 function refreshAllUi ()
16491 16882 {
16492 16883 if (typeof I18n !== 'undefined')
@@ -16521,6 +16912,8 @@ function refreshAllUi ()
16521 16912 if (typeof refreshOfflineHud === 'function')
16522 16913 { refreshOfflineHud(); }
16523 16914 }
16915 if (app && app.mode === 'leaderboard' && typeof loadLeaderboard === 'function')
16916 { loadLeaderboard(app.leaderboardTab); }
16524 16917 }
16525 16918
16526 16919 /*
@@ -1313,7 +1313,15 @@ var I18N_CATALOG = {
1313 "offline.defeated.many": "{n} opponents defeated",
1313 "offline.defeated.many": "{n} opponents defeated",
1314 "offline.defeated.other": "{n} opponents defeated",
1314 "offline.defeated.other": "{n} opponents defeated",
1315 "stats.gravity": "{pct}% ({g}g)",
1315 "stats.gravity": "{pct}% ({g}g)",
1316 "menu.survival": "Survival"
1316 "menu.survival": "Survival",
1317 "menu.leaderboard": "Leaderboard",
1318 "leaderboard.title": "Leaderboard",
1319 "leaderboard.global": "Top 10",
1320 "leaderboard.friends": "Friends",
1321 "leaderboard.empty": "No scores yet.",
1322 "leaderboard.loginPrompt": "Log in to see how your friends rank.",
1323 "leaderboard.loadError": "The leaderboard could not be loaded.",
1324 "leaderboard.points": "{n} points"
1317 },
1325 },
1318 "nl": {
1326 "nl": {
1319 "menu.play": "Spelen",
1327 "menu.play": "Spelen",
@@ -1606,7 +1614,15 @@ var I18N_CATALOG = {
1606 "offline.defeated.many": "{n} tegenstanders verslagen",
1614 "offline.defeated.many": "{n} tegenstanders verslagen",
1607 "offline.defeated.other": "{n} tegenstanders verslagen",
1615 "offline.defeated.other": "{n} tegenstanders verslagen",
1608 "stats.gravity": "{pct}% ({g}g)",
1616 "stats.gravity": "{pct}% ({g}g)",
1609 "menu.survival": "Overleven"
1617 "menu.survival": "Overleven",
1618 "menu.leaderboard": "Ranglijst",
1619 "leaderboard.title": "Ranglijst",
1620 "leaderboard.global": "Top 10",
1621 "leaderboard.friends": "Vrienden",
1622 "leaderboard.empty": "Nog geen scores.",
1623 "leaderboard.loginPrompt": "Log in om te zien hoe je vrienden ervoor staan.",
1624 "leaderboard.loadError": "De ranglijst kon niet worden geladen.",
1625 "leaderboard.points": "{n} punten"
1610 },
1626 },
1611 "de": {
1627 "de": {
1612 "menu.play": "Spielen",
1628 "menu.play": "Spielen",
@@ -1899,7 +1915,15 @@ var I18N_CATALOG = {
1899 "offline.defeated.many": "{n} Gegner besiegt",
1915 "offline.defeated.many": "{n} Gegner besiegt",
1900 "offline.defeated.other": "{n} Gegner besiegt",
1916 "offline.defeated.other": "{n} Gegner besiegt",
1901 "stats.gravity": "{pct} % ({g} g)",
1917 "stats.gravity": "{pct} % ({g} g)",
1902 "menu.survival": "Überleben"
1918 "menu.survival": "Überleben",
1919 "menu.leaderboard": "Rangliste",
1920 "leaderboard.title": "Rangliste",
1921 "leaderboard.global": "Top 10",
1922 "leaderboard.friends": "Freunde",
1923 "leaderboard.empty": "Noch keine Punkte.",
1924 "leaderboard.loginPrompt": "Melde dich an, um zu sehen, wie deine Freunde dastehen.",
1925 "leaderboard.loadError": "Die Rangliste konnte nicht geladen werden.",
1926 "leaderboard.points": "{n} Punkte"
1903 },
1927 },
1904 "fr": {
1928 "fr": {
1905 "menu.play": "Jouer",
1929 "menu.play": "Jouer",
@@ -2192,7 +2216,15 @@ var I18N_CATALOG = {
2192 "offline.defeated.many": "{n} adversaires vaincus",
2216 "offline.defeated.many": "{n} adversaires vaincus",
2193 "offline.defeated.other": "{n} adversaires vaincus",
2217 "offline.defeated.other": "{n} adversaires vaincus",
2194 "stats.gravity": "{pct} % ({g} g)",
2218 "stats.gravity": "{pct} % ({g} g)",
2195 "menu.survival": "Survie"
2219 "menu.survival": "Survie",
2220 "menu.leaderboard": "Classement",
2221 "leaderboard.title": "Classement",
2222 "leaderboard.global": "Top 10",
2223 "leaderboard.friends": "Amis",
2224 "leaderboard.empty": "Pas encore de scores.",
2225 "leaderboard.loginPrompt": "Connecte-toi pour voir le classement de tes amis.",
2226 "leaderboard.loadError": "Le classement n'a pas pu être chargé.",
2227 "leaderboard.points": "{n} points"
2196 },
2228 },
2197 "ja": {
2229 "ja": {
2198 "menu.play": "プレイ",
2230 "menu.play": "プレイ",
@@ -2485,7 +2517,15 @@ var I18N_CATALOG = {
2485 "offline.defeated.many": "{n}人の相手を倒した",
2517 "offline.defeated.many": "{n}人の相手を倒した",
2486 "offline.defeated.other": "{n}人の相手を倒した",
2518 "offline.defeated.other": "{n}人の相手を倒した",
2487 "stats.gravity": "{pct}% ({g}g)",
2519 "stats.gravity": "{pct}% ({g}g)",
2488 "menu.survival": "サバイバル"
2520 "menu.survival": "サバイバル",
2521 "menu.leaderboard": "ランキング",
2522 "leaderboard.title": "ランキング",
2523 "leaderboard.global": "トップ10",
2524 "leaderboard.friends": "フレンド",
2525 "leaderboard.empty": "まだスコアがありません。",
2526 "leaderboard.loginPrompt": "ログインするとフレンドの順位が見られます。",
2527 "leaderboard.loadError": "ランキングを読み込めませんでした。",
2528 "leaderboard.points": "{n} ポイント"
2489 },
2529 },
2490 "zh": {
2530 "zh": {
2491 "menu.play": "开始游戏",
2531 "menu.play": "开始游戏",
@@ -2778,7 +2818,15 @@ var I18N_CATALOG = {
2778 "offline.defeated.many": "击败了 {n} 名对手",
2818 "offline.defeated.many": "击败了 {n} 名对手",
2779 "offline.defeated.other": "击败了 {n} 名对手",
2819 "offline.defeated.other": "击败了 {n} 名对手",
2780 "stats.gravity": "{pct}% ({g}g)",
2820 "stats.gravity": "{pct}% ({g}g)",
2781 "menu.survival": "生存"
2821 "menu.survival": "生存",
2822 "menu.leaderboard": "排行榜",
2823 "leaderboard.title": "排行榜",
2824 "leaderboard.global": "前 10 名",
2825 "leaderboard.friends": "好友",
2826 "leaderboard.empty": "还没有分数。",
2827 "leaderboard.loginPrompt": "登录后即可查看好友排名。",
2828 "leaderboard.loadError": "无法加载排行榜。",
2829 "leaderboard.points": "{n} 分"
2782 },
2830 },
2783 "ko": {
2831 "ko": {
2784 "menu.play": "플레이",
2832 "menu.play": "플레이",
@@ -3071,7 +3119,15 @@ var I18N_CATALOG = {
3071 "offline.defeated.many": "상대 {n}명 격파",
3119 "offline.defeated.many": "상대 {n}명 격파",
3072 "offline.defeated.other": "상대 {n}명 격파",
3120 "offline.defeated.other": "상대 {n}명 격파",
3073 "stats.gravity": "{pct}% ({g}g)",
3121 "stats.gravity": "{pct}% ({g}g)",
3074 "menu.survival": "서바이벌"
3122 "menu.survival": "서바이벌",
3123 "menu.leaderboard": "순위표",
3124 "leaderboard.title": "순위표",
3125 "leaderboard.global": "상위 10",
3126 "leaderboard.friends": "친구",
3127 "leaderboard.empty": "아직 점수가 없습니다.",
3128 "leaderboard.loginPrompt": "로그인하면 친구 순위를 볼 수 있습니다.",
3129 "leaderboard.loadError": "순위표를 불러올 수 없습니다.",
3130 "leaderboard.points": "{n}점"
3075 },
3131 },
3076 "pl": {
3132 "pl": {
3077 "menu.play": "Graj",
3133 "menu.play": "Graj",
@@ -3364,7 +3420,15 @@ var I18N_CATALOG = {
3364 "offline.defeated.many": "{n} pokonanych przeciwników",
3420 "offline.defeated.many": "{n} pokonanych przeciwników",
3365 "offline.defeated.other": "{n} pokonanych przeciwników",
3421 "offline.defeated.other": "{n} pokonanych przeciwników",
3366 "stats.gravity": "{pct} % ({g} g)",
3422 "stats.gravity": "{pct} % ({g} g)",
3367 "menu.survival": "Przetrwanie"
3423 "menu.survival": "Przetrwanie",
3424 "menu.leaderboard": "Ranking",
3425 "leaderboard.title": "Ranking",
3426 "leaderboard.global": "Top 10",
3427 "leaderboard.friends": "Znajomi",
3428 "leaderboard.empty": "Brak wyników.",
3429 "leaderboard.loginPrompt": "Zaloguj się, aby zobaczyć pozycję znajomych.",
3430 "leaderboard.loadError": "Nie udało się wczytać rankingu.",
3431 "leaderboard.points": "{n} pkt"
3368 },
3432 },
3369 "ru": {
3433 "ru": {
3370 "menu.play": "Играть",
3434 "menu.play": "Играть",
@@ -3657,7 +3721,15 @@ var I18N_CATALOG = {
3657 "offline.defeated.many": "{n} противников побеждено",
3721 "offline.defeated.many": "{n} противников побеждено",
3658 "offline.defeated.other": "{n} противников побеждено",
3722 "offline.defeated.other": "{n} противников побеждено",
3659 "stats.gravity": "{pct} % ({g} g)",
3723 "stats.gravity": "{pct} % ({g} g)",
3660 "menu.survival": "Выживание"
3724 "menu.survival": "Выживание",
3725 "menu.leaderboard": "Таблица лидеров",
3726 "leaderboard.title": "Таблица лидеров",
3727 "leaderboard.global": "Топ-10",
3728 "leaderboard.friends": "Друзья",
3729 "leaderboard.empty": "Пока нет очков.",
3730 "leaderboard.loginPrompt": "Войди, чтобы увидеть места друзей.",
3731 "leaderboard.loadError": "Не удалось загрузить таблицу лидеров.",
3732 "leaderboard.points": "{n} очков"
3661 },
3733 },
3662 "es": {
3734 "es": {
3663 "menu.play": "Jugar",
3735 "menu.play": "Jugar",
@@ -3950,7 +4022,15 @@ var I18N_CATALOG = {
3950 "offline.defeated.many": "{n} rivales derrotados",
4022 "offline.defeated.many": "{n} rivales derrotados",
3951 "offline.defeated.other": "{n} rivales derrotados",
4023 "offline.defeated.other": "{n} rivales derrotados",
3952 "stats.gravity": "{pct} % ({g} g)",
4024 "stats.gravity": "{pct} % ({g} g)",
3953 "menu.survival": "Supervivencia"
4025 "menu.survival": "Supervivencia",
4026 "menu.leaderboard": "Clasificación",
4027 "leaderboard.title": "Clasificación",
4028 "leaderboard.global": "Top 10",
4029 "leaderboard.friends": "Amigos",
4030 "leaderboard.empty": "Aún no hay puntuaciones.",
4031 "leaderboard.loginPrompt": "Inicia sesión para ver la clasificación de tus amigos.",
4032 "leaderboard.loadError": "No se pudo cargar la clasificación.",
4033 "leaderboard.points": "{n} puntos"
3954 }
4034 }
3955 },
4035 },
3956 "errors": {
4036 "errors": {
@@ -9850,6 +9930,38 @@ Online.loginUrl = function ()
9850 return 'auth.php?return=online';
9930 return 'auth.php?return=online';
9851};
9931};
9852
9932
9933/** t1247: global or friends leaderboard (GET, no CSRF). */
9934Online.leaderboard = function (scope)
9935{
9936 var self = this;
9937 var url = 'api.php?action=leaderboard&scope=' + encodeURIComponent(scope === 'friends' ? 'friends' : 'global');
9938 return fetch(url, {
9939 method: 'GET',
9940 credentials: 'same-origin',
9941 headers: this._headers(false)
9942 }).then(function (res)
9943 {
9944 return res.json().then(function (data)
9945 {
9946 data = data || {};
9947 if (!res.ok && !data.error)
9948 {
9949 data.error = (typeof I18n !== 'undefined'
9950 ? I18n.t('error.serverStatus', { status: res.status })
9951 : ('De server gaf ' + res.status));
9952 data.ok = false;
9953 }
9954 return data;
9955 }, function ()
9956 {
9957 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.badResponse') : 'Geen geldig antwoord van de server.') };
9958 });
9959 }).catch(function ()
9960 {
9961 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.connection') : 'Geen verbinding met de server.') };
9962 });
9963};
9964
9853Online.logoutUrl = function ()
9965Online.logoutUrl = function ()
9854{
9966{
9855 return 'logout.php';
9967 return 'logout.php';
@@ -13622,6 +13734,130 @@ else if (typeof globalThis !== 'undefined')
13622 * /workspace/meteors/src/loginPrompt.js
13734 * /workspace/meteors/src/loginPrompt.js
13623 */
13735 */
13624
13736
13737/*
13738 * Start File:
13739 * /workspace/meteors/src/avatar.js
13740 */
13741'use strict';
13742
13743/**
13744 * Player avatars, same idea as Allianties: a coloured initials circle,
13745 * with the auth profile picture on top when it loads. A failed picture
13746 * is dropped; the initials stay.
13747 */
13748var Avatar = {
13749 failed: {},
13750 loaded: {},
13751
13752 initials: function (name)
13753 {
13754 if (!name) { return '?'; }
13755 var parts = String(name).trim().split(/[\s._-]+/).filter(function (s) { return s.length > 0; });
13756 if (!parts.length) { return '?'; }
13757 var first = Array.from(parts[0]);
13758 var s = first[0];
13759 if (parts.length > 1) { s += Array.from(parts[parts.length - 1])[0]; }
13760 else if (first.length > 1 && /[a-z]/i.test(first[1])) { s += first[1]; }
13761 return s.toUpperCase();
13762 },
13763
13764 usableUrl: function (url)
13765 {
13766 if (typeof url !== 'string') { return null; }
13767 url = url.trim();
13768 if (!url) { return null; }
13769 if (!/^(https?:\/\/|data:image\/|\/|\.{0,2}\/?[\w-])/i.test(url)) { return null; }
13770 if (/^(javascript|vbscript):/i.test(url)) { return null; }
13771 if (Avatar.failed[url]) { return null; }
13772 return url;
13773 },
13774
13775 colorFor: function (id)
13776 {
13777 var palette = ['#e85d5d', '#4fa3e8', '#5dd39e', '#e8c547', '#b07ce8', '#e8873a', '#3ad1d1', '#e86fb8'];
13778 var h = 0;
13779 String(id || '').split('').forEach(function (c) { h = (h * 31 + c.charCodeAt(0)) >>> 0; });
13780 return palette[h % palette.length];
13781 },
13782
13783 textColor: function (hex)
13784 {
13785 var m = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(String(hex || ''));
13786 if (!m) { return '#fff'; }
13787 var v = m[1];
13788 if (v.length === 3) { v = v[0] + v[0] + v[1] + v[1] + v[2] + v[2]; }
13789 var r = parseInt(v.slice(0, 2), 16), g = parseInt(v.slice(2, 4), 16), b = parseInt(v.slice(4, 6), 16);
13790 var lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
13791 return lum > 0.6 ? '#111' : '#fff';
13792 },
13793
13794 piece: function (player, opts)
13795 {
13796 opts = opts || {};
13797 var doc = opts.doc || document;
13798 var color = player.color || Avatar.colorFor(player.id || player.name);
13799 var el = doc.createElement('span');
13800 el.className = 'player-avatar' + (player.alive === false ? ' dead' : '');
13801 el.setAttribute('role', 'img');
13802 el.setAttribute('aria-label', player.name || '?');
13803 el.title = player.name || '';
13804 el.style.borderColor = color;
13805 el.style.backgroundColor = color;
13806 el.style.color = Avatar.textColor(color);
13807 if (opts.size)
13808 {
13809 var size = opts.size;
13810 el.style.width = size + 'px';
13811 el.style.height = size + 'px';
13812 el.style.fontSize = Math.max(10, Math.round(size * 0.4)) + 'px';
13813 }
13814 var txt = doc.createElement('span');
13815 txt.className = 'player-avatar-initials';
13816 txt.textContent = Avatar.initials(player.name);
13817 el.appendChild(txt);
13818 var url = Avatar.usableUrl(player.avatar);
13819 if (url)
13820 {
13821 var img = doc.createElement('img');
13822 img.alt = '';
13823 img.className = 'player-avatar-img';
13824 img.decoding = 'async';
13825 img.referrerPolicy = 'no-referrer';
13826 img.addEventListener('error', function ()
13827 {
13828 Avatar.failed[url] = true;
13829 el.classList.remove('has-img');
13830 if (img.parentNode) { img.parentNode.removeChild(img); }
13831 });
13832 img.addEventListener('load', function ()
13833 {
13834 if (!img.naturalWidth)
13835 {
13836 Avatar.failed[url] = true;
13837 if (img.parentNode) { img.parentNode.removeChild(img); }
13838 return;
13839 }
13840 Avatar.loaded[url] = true;
13841 el.classList.add('has-img');
13842 });
13843 if (Avatar.loaded[url]) { el.classList.add('has-img'); }
13844 img.src = url;
13845 el.appendChild(img);
13846 }
13847 return el;
13848 }
13849};
13850
13851if (typeof module !== 'undefined' && module.exports)
13852{ module.exports = Avatar; }
13853else if (typeof globalThis !== 'undefined')
13854{ globalThis.Avatar = Avatar; }
13855
13856/*
13857 * End File:
13858 * /workspace/meteors/src/avatar.js
13859 */
13860
13625/*
13861/*
13626 * Start File:
13862 * Start File:
13627 * /workspace/meteors/src/main.js
13863 * /workspace/meteors/src/main.js
@@ -13752,6 +13988,7 @@ window.onload = function ()
13752 { refreshAllUi(); });
13988 { refreshAllUi(); });
13753 }
13989 }
13754 bindOnlineUi();
13990 bindOnlineUi();
13991 bindLeaderboard();
13755 bindOfflineUi();
13992 bindOfflineUi();
13756 bindPlanetSelect();
13993 bindPlanetSelect();
13757 restoreSelectedPlanet();
13994 restoreSelectedPlanet();
@@ -16487,6 +16724,160 @@ function applyProfileLocale ()
16487 { Online.setLocale(I18n.locale); }
16724 { Online.setLocale(I18n.locale); }
16488}
16725}
16489
16726
16727/* ---------- t1247 leaderboard -------------------------------------- */
16728
16729function bindLeaderboard ()
16730{
16731 var btn = document.getElementById('btn-leaderboard');
16732 if (btn)
16733 { btn.addEventListener('click', function () { openLeaderboard(); }); }
16734 var back = document.getElementById('btn-lb-back');
16735 if (back)
16736 { back.addEventListener('click', closeLeaderboard); }
16737 var globalTab = document.getElementById('lb-tab-global');
16738 var friendsTab = document.getElementById('lb-tab-friends');
16739 if (globalTab)
16740 { globalTab.addEventListener('click', function () { setLeaderboardTab('global'); }); }
16741 if (friendsTab)
16742 { friendsTab.addEventListener('click', function () { setLeaderboardTab('friends'); }); }
16743}
16744
16745function openLeaderboard (tab)
16746{
16747 hideEl('menu');
16748 hideEl('online-panel');
16749 hideEl('planet-select');
16750 hideEl('login-prompt');
16751 app.mode = 'leaderboard';
16752 app.leaderboardTab = tab || app.leaderboardTab || 'global';
16753 showEl('leaderboard');
16754 setLeaderboardTab(app.leaderboardTab);
16755}
16756
16757function closeLeaderboard ()
16758{
16759 hideEl('leaderboard');
16760 app.mode = 'menu';
16761 showEl('menu');
16762}
16763
16764function setLeaderboardTab (tab)
16765{
16766 tab = tab === 'friends' ? 'friends' : 'global';
16767 app.leaderboardTab = tab;
16768 var globalTab = document.getElementById('lb-tab-global');
16769 var friendsTab = document.getElementById('lb-tab-friends');
16770 if (globalTab)
16771 { globalTab.setAttribute('aria-selected', tab === 'global' ? 'true' : 'false'); }
16772 if (friendsTab)
16773 { friendsTab.setAttribute('aria-selected', tab === 'friends' ? 'true' : 'false'); }
16774 loadLeaderboard(tab);
16775}
16776
16777function loadLeaderboard (tab)
16778{
16779 tab = tab || app.leaderboardTab || 'global';
16780 var login = document.getElementById('lb-login');
16781 var list = document.getElementById('lb-list');
16782 var empty = document.getElementById('lb-empty');
16783 var err = document.getElementById('lb-error');
16784 if (err)
16785 { err.hidden = true; err.textContent = ''; }
16786 if (empty)
16787 { empty.hidden = true; }
16788 if (list)
16789 { list.innerHTML = ''; }
16790 var loggedIn = typeof Online !== 'undefined' && !!Online.me;
16791 if (tab === 'friends' && !loggedIn)
16792 {
16793 if (login)
16794 { login.hidden = false; }
16795 return;
16796 }
16797 if (login)
16798 { login.hidden = true; }
16799 if (typeof Online === 'undefined' || !Online.leaderboard)
16800 {
16801 showLeaderboardError((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
16802 return;
16803 }
16804 Online.leaderboard(tab).then(function (data)
16805 {
16806 if (app.mode !== 'leaderboard' || app.leaderboardTab !== tab)
16807 { return; }
16808 if (!data || data.ok === false)
16809 {
16810 var msg = (data && data.error)
16811 ? ((typeof I18n !== 'undefined') ? I18n.error(data.error) : data.error)
16812 : ((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
16813 showLeaderboardError(msg);
16814 return;
16815 }
16816 if (tab === 'friends' && data.login_required)
16817 {
16818 if (login)
16819 { login.hidden = false; }
16820 return;
16821 }
16822 renderLeaderboard(data.players || [], tab);
16823 });
16824}
16825
16826function showLeaderboardError (text)
16827{
16828 var err = document.getElementById('lb-error');
16829 if (!err)
16830 { return; }
16831 err.hidden = !text;
16832 err.textContent = text || '';
16833}
16834
16835function renderLeaderboard (players, tab)
16836{
16837 var list = document.getElementById('lb-list');
16838 var empty = document.getElementById('lb-empty');
16839 var login = document.getElementById('lb-login');
16840 if (login)
16841 { login.hidden = true; }
16842 if (!list)
16843 { return; }
16844 list.innerHTML = '';
16845 if (!players || !players.length)
16846 {
16847 if (empty)
16848 { empty.hidden = false; }
16849 return;
16850 }
16851 if (empty)
16852 { empty.hidden = true; }
16853 var meId = (typeof Online !== 'undefined' && Online.me) ? Online.me.id : null;
16854 for (var i = 0; i < players.length; i++)
16855 {
16856 var p = players[i];
16857 var li = document.createElement('li');
16858 var you = !!(p.you || (meId && p.id === meId));
16859 li.className = 'lb-row' + (you ? ' you' : '');
16860 var rank = document.createElement('span');
16861 rank.className = 'lb-rank';
16862 rank.textContent = String(p.rank || (i + 1));
16863 li.appendChild(rank);
16864 if (typeof Avatar !== 'undefined' && Avatar.piece)
16865 { li.appendChild(Avatar.piece({ id: p.id, name: p.name, avatar: p.avatar }, { size: 40 })); }
16866 var name = document.createElement('span');
16867 name.className = 'lb-name';
16868 name.textContent = p.name || '';
16869 li.appendChild(name);
16870 var pts = document.createElement('span');
16871 pts.className = 'lb-points';
16872 var n = p.points || 0;
16873 pts.textContent = (typeof I18n !== 'undefined')
16874 ? I18n.t('leaderboard.points', { n: n }, n + ' points')
16875 : (n + ' points');
16876 li.appendChild(pts);
16877 list.appendChild(li);
16878 }
16879}
16880
16490function refreshAllUi ()
16881function refreshAllUi ()
16491{
16882{
16492 if (typeof I18n !== 'undefined')
16883 if (typeof I18n !== 'undefined')
@@ -16521,6 +16912,8 @@ function refreshAllUi ()
16521 if (typeof refreshOfflineHud === 'function')
16912 if (typeof refreshOfflineHud === 'function')
16522 { refreshOfflineHud(); }
16913 { refreshOfflineHud(); }
16523 }
16914 }
16915 if (app && app.mode === 'leaderboard' && typeof loadLeaderboard === 'function')
16916 { loadLeaderboard(app.leaderboardTab); }
16524}
16917}
16525
16918
16526/*
16919/*
build/index.html +17 −0
@@ -20,6 +20,7 @@
20 20 <button type="button" id="btn-play" data-i18n="menu.play">Play</button>
21 21 <button type="button" id="btn-survival" class="btn-secondary" data-i18n="menu.survival">Survival</button>
22 22 <button type="button" id="btn-online" class="btn-secondary" data-i18n="menu.online">Play online</button>
23 <button type="button" id="btn-leaderboard" class="btn-secondary" data-i18n="menu.leaderboard">Leaderboard</button>
23 24 <button type="button" id="btn-designer" class="btn-secondary" hidden data-i18n="menu.designer">Planet Designer</button>
24 25 <p id="last-score" class="last-score" hidden><span data-i18n="menu.lastScore">Last score:</span> <strong>0</strong></p>
25 26 <p id="start-error" class="notice error" hidden role="alert"></p>
@@ -61,6 +62,22 @@
61 62 </div>
62 63 </div>
63 64
65 <div id="leaderboard" class="screen" hidden>
66 <h1 data-i18n="leaderboard.title">Leaderboard</h1>
67 <div id="lb-tabs" class="lb-tabs" role="tablist">
68 <button type="button" id="lb-tab-global" class="lb-tab" role="tab" aria-selected="true" data-i18n="leaderboard.global">Top 10</button>
69 <button type="button" id="lb-tab-friends" class="lb-tab" role="tab" aria-selected="false" data-i18n="leaderboard.friends">Friends</button>
70 </div>
71 <p id="lb-error" class="notice error" hidden role="alert"></p>
72 <p id="lb-login" class="tagline" hidden>
73 <span data-i18n="leaderboard.loginPrompt">Log in to see how your friends rank.</span>
74 <a id="lb-login-link" href="auth.php" class="button" data-i18n="menu.login">Log in</a>
75 </p>
76 <ol id="lb-list" class="lb-list"></ol>
77 <p id="lb-empty" class="hint" hidden data-i18n="leaderboard.empty">No scores yet.</p>
78 <button type="button" id="btn-lb-back" class="btn-secondary" data-i18n="planet.back">Back</button>
79 </div>
80
64 81 <div id="planet-select" class="screen" hidden>
65 82 <h1 data-i18n="planet.title">Choose a field</h1>
66 83 <p id="planet-mode" class="planet-mode"></p>
@@ -20,6 +20,7 @@
20 <button type="button" id="btn-play" data-i18n="menu.play">Play</button>
20 <button type="button" id="btn-play" data-i18n="menu.play">Play</button>
21 <button type="button" id="btn-survival" class="btn-secondary" data-i18n="menu.survival">Survival</button>
21 <button type="button" id="btn-survival" class="btn-secondary" data-i18n="menu.survival">Survival</button>
22 <button type="button" id="btn-online" class="btn-secondary" data-i18n="menu.online">Play online</button>
22 <button type="button" id="btn-online" class="btn-secondary" data-i18n="menu.online">Play online</button>
23 <button type="button" id="btn-leaderboard" class="btn-secondary" data-i18n="menu.leaderboard">Leaderboard</button>
23 <button type="button" id="btn-designer" class="btn-secondary" hidden data-i18n="menu.designer">Planet Designer</button>
24 <button type="button" id="btn-designer" class="btn-secondary" hidden data-i18n="menu.designer">Planet Designer</button>
24 <p id="last-score" class="last-score" hidden><span data-i18n="menu.lastScore">Last score:</span> <strong>0</strong></p>
25 <p id="last-score" class="last-score" hidden><span data-i18n="menu.lastScore">Last score:</span> <strong>0</strong></p>
25 <p id="start-error" class="notice error" hidden role="alert"></p>
26 <p id="start-error" class="notice error" hidden role="alert"></p>
@@ -61,6 +62,22 @@
61 </div>
62 </div>
62 </div>
63 </div>
63
64
65 <div id="leaderboard" class="screen" hidden>
66 <h1 data-i18n="leaderboard.title">Leaderboard</h1>
67 <div id="lb-tabs" class="lb-tabs" role="tablist">
68 <button type="button" id="lb-tab-global" class="lb-tab" role="tab" aria-selected="true" data-i18n="leaderboard.global">Top 10</button>
69 <button type="button" id="lb-tab-friends" class="lb-tab" role="tab" aria-selected="false" data-i18n="leaderboard.friends">Friends</button>
70 </div>
71 <p id="lb-error" class="notice error" hidden role="alert"></p>
72 <p id="lb-login" class="tagline" hidden>
73 <span data-i18n="leaderboard.loginPrompt">Log in to see how your friends rank.</span>
74 <a id="lb-login-link" href="auth.php" class="button" data-i18n="menu.login">Log in</a>
75 </p>
76 <ol id="lb-list" class="lb-list"></ol>
77 <p id="lb-empty" class="hint" hidden data-i18n="leaderboard.empty">No scores yet.</p>
78 <button type="button" id="btn-lb-back" class="btn-secondary" data-i18n="planet.back">Back</button>
79 </div>
80
64 <div id="planet-select" class="screen" hidden>
81 <div id="planet-select" class="screen" hidden>
65 <h1 data-i18n="planet.title">Choose a field</h1>
82 <h1 data-i18n="planet.title">Choose a field</h1>
66 <p id="planet-mode" class="planet-mode"></p>
83 <p id="planet-mode" class="planet-mode"></p>
build/style.css +113 −1
@@ -46,7 +46,7 @@ html, body {
46 46 text-align: center;
47 47 }
48 48
49 .screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden], #login-prompt[hidden] { display: none !important; }
49 .screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden], #login-prompt[hidden], #leaderboard[hidden] { display: none !important; }
50 50
51 51 h1 {
52 52 font-size: clamp(48px, 14vw, 96px);
@@ -1208,3 +1208,115 @@ html[lang="ja"], html[lang="zh-Hans"], html[lang="ko"] {
1208 1208 #btn-login-prompt { padding: 10px 36px; }
1209 1209 }
1210 1210
1211
1212 /* t1247: leaderboard */
1213 #leaderboard {
1214 z-index: 5;
1215 overflow: auto;
1216 padding: 16px 16px 24px;
1217 }
1218 #leaderboard h1 {
1219 font-size: clamp(36px, 9vw, 64px);
1220 }
1221 .lb-tabs {
1222 display: flex;
1223 gap: 8px;
1224 justify-content: center;
1225 flex-wrap: wrap;
1226 margin: 4px 0 16px;
1227 }
1228 .lb-tab {
1229 appearance: none;
1230 font: inherit;
1231 cursor: pointer;
1232 padding: 8px 20px;
1233 min-height: 44px;
1234 border-radius: 999px;
1235 border: 1px solid #6a7394;
1236 color: #e8eaf2;
1237 background: linear-gradient(180deg, #2a3150, #1b2038);
1238 touch-action: manipulation;
1239 }
1240 .lb-tab[aria-selected="true"] {
1241 border-color: #ffe27a;
1242 color: #1a1020;
1243 background: linear-gradient(180deg, #ffe27a, #f0c53a 40%, #e89a20);
1244 font-weight: 700;
1245 }
1246 .lb-tab:is(:hover, :focus-visible) {
1247 border-color: #ffe27a;
1248 }
1249 .lb-list {
1250 list-style: none;
1251 margin: 0 auto;
1252 padding: 0;
1253 width: min(100%, 28rem);
1254 text-align: left;
1255 }
1256 .lb-row {
1257 display: flex;
1258 align-items: center;
1259 gap: 10px;
1260 padding: 8px 10px;
1261 border-radius: 12px;
1262 min-height: 52px;
1263 }
1264 .lb-row + .lb-row { margin-top: 4px; }
1265 .lb-row.you {
1266 background: rgba(255, 226, 122, 0.16);
1267 outline: 1px solid rgba(255, 226, 122, 0.55);
1268 font-weight: 700;
1269 }
1270 .lb-rank {
1271 flex: 0 0 2rem;
1272 text-align: right;
1273 font-variant-numeric: tabular-nums;
1274 font-weight: 700;
1275 color: #ffe27a;
1276 }
1277 .player-avatar {
1278 flex: 0 0 auto;
1279 position: relative;
1280 display: inline-flex;
1281 align-items: center;
1282 justify-content: center;
1283 width: 40px;
1284 height: 40px;
1285 border-radius: 50%;
1286 border: 2px solid currentColor;
1287 overflow: hidden;
1288 font-weight: 700;
1289 line-height: 1;
1290 letter-spacing: 0.02em;
1291 text-transform: uppercase;
1292 }
1293 .player-avatar-initials { pointer-events: none; }
1294 .player-avatar-img {
1295 position: absolute;
1296 inset: 0;
1297 width: 100%;
1298 height: 100%;
1299 object-fit: cover;
1300 display: none;
1301 }
1302 .player-avatar.has-img .player-avatar-img { display: block; }
1303 .player-avatar.has-img .player-avatar-initials { display: none; }
1304 .lb-name {
1305 flex: 1 1 auto;
1306 min-width: 0;
1307 overflow: hidden;
1308 text-overflow: ellipsis;
1309 white-space: nowrap;
1310 }
1311 .lb-points {
1312 flex: 0 0 auto;
1313 font-variant-numeric: tabular-nums;
1314 color: #ffe27a;
1315 white-space: nowrap;
1316 }
1317 #lb-login .button { margin-left: 8px; }
1318 #leaderboard #btn-lb-back { margin-top: 20px; }
1319 @media (max-width: 420px) {
1320 .lb-points { font-size: 14px; }
1321 .player-avatar { width: 36px; height: 36px; }
1322 }
@@ -46,7 +46,7 @@ html, body {
46 text-align: center;
46 text-align: center;
47}
47}
48
48
49.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden], #login-prompt[hidden] { display: none !important; }
49.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #game-menu[hidden], #btn-game-menu[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden], #login-prompt[hidden], #leaderboard[hidden] { display: none !important; }
50
50
51h1 {
51h1 {
52 font-size: clamp(48px, 14vw, 96px);
52 font-size: clamp(48px, 14vw, 96px);
@@ -1208,3 +1208,115 @@ html[lang="ja"], html[lang="zh-Hans"], html[lang="ko"] {
1208 #btn-login-prompt { padding: 10px 36px; }
1208 #btn-login-prompt { padding: 10px 36px; }
1209}
1209}
1210
1210
1211
1212/* t1247: leaderboard */
1213#leaderboard {
1214 z-index: 5;
1215 overflow: auto;
1216 padding: 16px 16px 24px;
1217}
1218#leaderboard h1 {
1219 font-size: clamp(36px, 9vw, 64px);
1220}
1221.lb-tabs {
1222 display: flex;
1223 gap: 8px;
1224 justify-content: center;
1225 flex-wrap: wrap;
1226 margin: 4px 0 16px;
1227}
1228.lb-tab {
1229 appearance: none;
1230 font: inherit;
1231 cursor: pointer;
1232 padding: 8px 20px;
1233 min-height: 44px;
1234 border-radius: 999px;
1235 border: 1px solid #6a7394;
1236 color: #e8eaf2;
1237 background: linear-gradient(180deg, #2a3150, #1b2038);
1238 touch-action: manipulation;
1239}
1240.lb-tab[aria-selected="true"] {
1241 border-color: #ffe27a;
1242 color: #1a1020;
1243 background: linear-gradient(180deg, #ffe27a, #f0c53a 40%, #e89a20);
1244 font-weight: 700;
1245}
1246.lb-tab:is(:hover, :focus-visible) {
1247 border-color: #ffe27a;
1248}
1249.lb-list {
1250 list-style: none;
1251 margin: 0 auto;
1252 padding: 0;
1253 width: min(100%, 28rem);
1254 text-align: left;
1255}
1256.lb-row {
1257 display: flex;
1258 align-items: center;
1259 gap: 10px;
1260 padding: 8px 10px;
1261 border-radius: 12px;
1262 min-height: 52px;
1263}
1264.lb-row + .lb-row { margin-top: 4px; }
1265.lb-row.you {
1266 background: rgba(255, 226, 122, 0.16);
1267 outline: 1px solid rgba(255, 226, 122, 0.55);
1268 font-weight: 700;
1269}
1270.lb-rank {
1271 flex: 0 0 2rem;
1272 text-align: right;
1273 font-variant-numeric: tabular-nums;
1274 font-weight: 700;
1275 color: #ffe27a;
1276}
1277.player-avatar {
1278 flex: 0 0 auto;
1279 position: relative;
1280 display: inline-flex;
1281 align-items: center;
1282 justify-content: center;
1283 width: 40px;
1284 height: 40px;
1285 border-radius: 50%;
1286 border: 2px solid currentColor;
1287 overflow: hidden;
1288 font-weight: 700;
1289 line-height: 1;
1290 letter-spacing: 0.02em;
1291 text-transform: uppercase;
1292}
1293.player-avatar-initials { pointer-events: none; }
1294.player-avatar-img {
1295 position: absolute;
1296 inset: 0;
1297 width: 100%;
1298 height: 100%;
1299 object-fit: cover;
1300 display: none;
1301}
1302.player-avatar.has-img .player-avatar-img { display: block; }
1303.player-avatar.has-img .player-avatar-initials { display: none; }
1304.lb-name {
1305 flex: 1 1 auto;
1306 min-width: 0;
1307 overflow: hidden;
1308 text-overflow: ellipsis;
1309 white-space: nowrap;
1310}
1311.lb-points {
1312 flex: 0 0 auto;
1313 font-variant-numeric: tabular-nums;
1314 color: #ffe27a;
1315 white-space: nowrap;
1316}
1317#lb-login .button { margin-left: 8px; }
1318#leaderboard #btn-lb-back { margin-top: 20px; }
1319@media (max-width: 420px) {
1320 .lb-points { font-size: 14px; }
1321 .player-avatar { width: 36px; height: 36px; }
1322}
docs/ASSUMPTIONS.md +43 −0
@@ -1388,3 +1388,46 @@ auth.timfalken.com is niets veranderd.
1388 1388
1389 1389 Tests: `test/login-prompt.test.js`; Playwright
1390 1390 `test/t1246-login-prompt-playwright.py URL TAG`.
1391
1392 ## t1247 — Ranglijst
1393
1394 Onder **Online spelen** op het hoofdmenu staat **Ranglijst**. Het scherm
1395 heeft twee tabs: **Top 10** (wereldwijd) en **Vrienden**.
1396
1397 **Punten.** Gesorteerd op `profiles.lifetime_points`, hetzelfde
1398 profieltotaal waar het puntenscherm (t1173) naartoe telt. Gelijk
1399 spel: alfabetisch op naam, daarna `user_id`. Maximaal 10 rijen.
1400 Wie niet in de top 10 staat, krijgt geen extra rij.
1401
1402 **Namen en avatars.** Bij inloggen (en bij `me`) bewaart de server naam
1403 en `avatar_url` van auth.timfalken.com op het profiel. Ontbreekt een
1404 naam (oude rijen), dan valt de weergave terug op het deel na `:` in het
1405 user-id. De avatar is dezelfde aanpak als in Allianties: een gekleurde
1406 cirkel met initialen, met het profielfotootje eroverheen als dat
1407 laadt; bij een fout blijft de cirkel staan. Ongeldige URL’s
1408 (`javascript:` e.d.) worden geweigerd.
1409
1410 **Vrienden.** De server haalt `GET /api/friends` op auth.timfalken.com op
1411 met het bestaande OAuth-access-token uit de sessie (gezet in
1412 `callback.php`). Elk vriend-id wordt `auth:{id}` en gekoppeld aan het
1413 lokale profiel. Een vriend die Meteors nog nooit heeft gespeeld, staat
1414 er wél op, met 0 punten en naam/avatar uit de friends-API. Aan
1415 auth.timfalken.com is niets veranderd. Vrienden beheer je op je
1416 accountpagina daar.
1417
1418 **Gasten.** De wereldwijde tab is een open GET (`api.php?action=leaderboard`,
1419 geen CSRF, geen login). De vriendentab toont “Log in om te zien hoe je
1420 vrienden ervoor staan” met een link naar `auth.php`. De API geeft voor
1421 gasten op `scope=friends` `login_required: true` en een lege lijst,
1422 geen 401.
1423
1424 **Lokaal.** Zonder auth-token (testers `test_user_1` / `test_user_2`)
1425 zijn die twee testers elkaars vriend, zodat de vriendentab lokaal
1426 getest kan worden. Op productie bestaat die koppeling niet.
1427
1428 **Markering.** Sta je in de getoonde lijst, dan krijgt je rij de class
1429 `you` (lichte gouden achtergrond). Op de vriendentab sta je zelf niet
1430 (jij zit niet op je eigen vriendenlijst).
1431
1432 Tests: `server/tests/run.php` (t1247), `test/leaderboard.test.js`;
1433 Playwright `test/t1247-leaderboard-playwright.py URL TAG`.
@@ -1388,3 +1388,46 @@ auth.timfalken.com is niets veranderd.
1388
1388
1389Tests: `test/login-prompt.test.js`; Playwright
1389Tests: `test/login-prompt.test.js`; Playwright
1390`test/t1246-login-prompt-playwright.py URL TAG`.
1390`test/t1246-login-prompt-playwright.py URL TAG`.
1391
1392## t1247 — Ranglijst
1393
1394Onder **Online spelen** op het hoofdmenu staat **Ranglijst**. Het scherm
1395heeft twee tabs: **Top 10** (wereldwijd) en **Vrienden**.
1396
1397**Punten.** Gesorteerd op `profiles.lifetime_points`, hetzelfde
1398profieltotaal waar het puntenscherm (t1173) naartoe telt. Gelijk
1399spel: alfabetisch op naam, daarna `user_id`. Maximaal 10 rijen.
1400Wie niet in de top 10 staat, krijgt geen extra rij.
1401
1402**Namen en avatars.** Bij inloggen (en bij `me`) bewaart de server naam
1403en `avatar_url` van auth.timfalken.com op het profiel. Ontbreekt een
1404naam (oude rijen), dan valt de weergave terug op het deel na `:` in het
1405user-id. De avatar is dezelfde aanpak als in Allianties: een gekleurde
1406cirkel met initialen, met het profielfotootje eroverheen als dat
1407laadt; bij een fout blijft de cirkel staan. Ongeldige URL’s
1408(`javascript:` e.d.) worden geweigerd.
1409
1410**Vrienden.** De server haalt `GET /api/friends` op auth.timfalken.com op
1411met het bestaande OAuth-access-token uit de sessie (gezet in
1412`callback.php`). Elk vriend-id wordt `auth:{id}` en gekoppeld aan het
1413lokale profiel. Een vriend die Meteors nog nooit heeft gespeeld, staat
1414er wél op, met 0 punten en naam/avatar uit de friends-API. Aan
1415auth.timfalken.com is niets veranderd. Vrienden beheer je op je
1416accountpagina daar.
1417
1418**Gasten.** De wereldwijde tab is een open GET (`api.php?action=leaderboard`,
1419geen CSRF, geen login). De vriendentab toont “Log in om te zien hoe je
1420vrienden ervoor staan” met een link naar `auth.php`. De API geeft voor
1421gasten op `scope=friends` `login_required: true` en een lege lijst,
1422geen 401.
1423
1424**Lokaal.** Zonder auth-token (testers `test_user_1` / `test_user_2`)
1425zijn die twee testers elkaars vriend, zodat de vriendentab lokaal
1426getest kan worden. Op productie bestaat die koppeling niet.
1427
1428**Markering.** Sta je in de getoonde lijst, dan krijgt je rij de class
1429`you` (lichte gouden achtergrond). Op de vriendentab sta je zelf niet
1430(jij zit niet op je eigen vriendenlijst).
1431
1432Tests: `server/tests/run.php` (t1247), `test/leaderboard.test.js`;
1433Playwright `test/t1247-leaderboard-playwright.py URL TAG`.
server/api.php +46 −0
@@ -27,6 +27,7 @@ try {
27 27 ];
28 28 if ($user) {
29 29 $store = Store::open();
30 $store->touchProfile($user['id'], $user['name'], $user['avatar'] ?? null);
30 31 $view = $store->viewFor($user['id']);
31 32 $profile = $store->profilePayload($user['id']);
32 33 }
@@ -52,6 +53,51 @@ try {
52 53 ]);
53 54 }
54 55
56 if ($action === 'leaderboard') {
57 $scope = (string) ($body['scope'] ?? $_GET['scope'] ?? 'global');
58 if ($scope !== 'friends') {
59 $scope = 'global';
60 }
61 $store = Store::open();
62 $viewer = $user['id'] ?? null;
63 if ($scope === 'friends') {
64 if (!$user) {
65 jsonOut([
66 'ok' => true,
67 'scope' => 'friends',
68 'login_required' => true,
69 'players' => [],
70 'me' => null,
71 ]);
72 }
73 $friends = [];
74 $token = $_SESSION['token'] ?? null;
75 if (is_string($token) && $token !== '') {
76 try {
77 $friends = parseAuthFriends(authRequest('/api/friends', null, $token));
78 } catch (Throwable $e) {
79 jsonFail('De vriendenlijst is nu niet beschikbaar.', 502);
80 }
81 } elseif (localDev()) {
82 $friends = localTestFriends($user['id']);
83 }
84 jsonOut([
85 'ok' => true,
86 'scope' => 'friends',
87 'login_required' => false,
88 'players' => $store->friendsLeaderboard($friends, 10, $viewer),
89 'me' => $viewer,
90 ]);
91 }
92 jsonOut([
93 'ok' => true,
94 'scope' => 'global',
95 'login_required' => false,
96 'players' => $store->topPlayers(10, $viewer),
97 'me' => $viewer,
98 ]);
99 }
100
55 101 if ($action === 'test_login') {
56 102 if (!localDev()) {
57 103 jsonFail('Niet beschikbaar.', 403);
@@ -27,6 +27,7 @@ try {
27 ];
27 ];
28 if ($user) {
28 if ($user) {
29 $store = Store::open();
29 $store = Store::open();
30 $store->touchProfile($user['id'], $user['name'], $user['avatar'] ?? null);
30 $view = $store->viewFor($user['id']);
31 $view = $store->viewFor($user['id']);
31 $profile = $store->profilePayload($user['id']);
32 $profile = $store->profilePayload($user['id']);
32 }
33 }
@@ -52,6 +53,51 @@ try {
52 ]);
53 ]);
53 }
54 }
54
55
56 if ($action === 'leaderboard') {
57 $scope = (string) ($body['scope'] ?? $_GET['scope'] ?? 'global');
58 if ($scope !== 'friends') {
59 $scope = 'global';
60 }
61 $store = Store::open();
62 $viewer = $user['id'] ?? null;
63 if ($scope === 'friends') {
64 if (!$user) {
65 jsonOut([
66 'ok' => true,
67 'scope' => 'friends',
68 'login_required' => true,
69 'players' => [],
70 'me' => null,
71 ]);
72 }
73 $friends = [];
74 $token = $_SESSION['token'] ?? null;
75 if (is_string($token) && $token !== '') {
76 try {
77 $friends = parseAuthFriends(authRequest('/api/friends', null, $token));
78 } catch (Throwable $e) {
79 jsonFail('De vriendenlijst is nu niet beschikbaar.', 502);
80 }
81 } elseif (localDev()) {
82 $friends = localTestFriends($user['id']);
83 }
84 jsonOut([
85 'ok' => true,
86 'scope' => 'friends',
87 'login_required' => false,
88 'players' => $store->friendsLeaderboard($friends, 10, $viewer),
89 'me' => $viewer,
90 ]);
91 }
92 jsonOut([
93 'ok' => true,
94 'scope' => 'global',
95 'login_required' => false,
96 'players' => $store->topPlayers(10, $viewer),
97 'me' => $viewer,
98 ]);
99 }
100
55 if ($action === 'test_login') {
101 if ($action === 'test_login') {
56 if (!localDev()) {
102 if (!localDev()) {
57 jsonFail('Niet beschikbaar.', 403);
103 jsonFail('Niet beschikbaar.', 403);
server/callback.php +2 −2
@@ -31,8 +31,8 @@ try {
31 31 if (!isset($me['user']) || !is_array($me['user'])) {
32 32 throw new RuntimeException('Het profiel ontbreekt.');
33 33 }
34 [$id, $name] = authIdentity($me['user']);
35 loginUser($id, $name);
34 [$id, $name, $avatar] = authIdentity($me['user']);
35 loginUser($id, $name, $avatar);
36 36 $_SESSION['token'] = $token['access_token'];
37 37 $_SESSION['expires'] = time() + (int) $token['expires_in'];
38 38 // t1193: back to the main menu unless the login started from Online.
@@ -31,8 +31,8 @@ try {
31 if (!isset($me['user']) || !is_array($me['user'])) {
31 if (!isset($me['user']) || !is_array($me['user'])) {
32 throw new RuntimeException('Het profiel ontbreekt.');
32 throw new RuntimeException('Het profiel ontbreekt.');
33 }
33 }
34 [$id, $name] = authIdentity($me['user']);
34 [$id, $name, $avatar] = authIdentity($me['user']);
35 loginUser($id, $name);
35 loginUser($id, $name, $avatar);
36 $_SESSION['token'] = $token['access_token'];
36 $_SESSION['token'] = $token['access_token'];
37 $_SESSION['expires'] = time() + (int) $token['expires_in'];
37 $_SESSION['expires'] = time() + (int) $token['expires_in'];
38 // t1193: back to the main menu unless the login started from Online.
38 // t1193: back to the main menu unless the login started from Online.
server/lib/Store.php +134 −0
@@ -116,6 +116,8 @@ CREATE TABLE IF NOT EXISTS custom_planets (
116 116 CREATE INDEX IF NOT EXISTS custom_planets_user ON custom_planets (user_id);
117 117 SQL);
118 118 $this->ensureColumn('profiles', 'last_planet', 'TEXT');
119 $this->ensureColumn('profiles', 'name', 'TEXT');
120 $this->ensureColumn('profiles', 'avatar', 'TEXT');
119 121 }
120 122
121 123 private function ensureColumn(string $table, string $column, string $ddl): void
@@ -844,6 +846,138 @@ SQL);
844 846 return (int) $this->ensureProfile($userId)['lifetime_points'];
845 847 }
846 848
849 /** Remember the player's display name and avatar (from auth / the session). */
850 public function touchProfile(string $userId, ?string $name = null, ?string $avatar = null): array
851 {
852 $this->ensureProfile($userId);
853 $sets = ['updated = ?'];
854 $args = [$this->now()];
855 if ($name !== null) {
856 $name = trim($name);
857 if ($name !== '' && mb_strlen($name) <= 64 && !preg_match('/[\x00-\x1F]/', $name)) {
858 $sets[] = 'name = ?';
859 $args[] = $name;
860 }
861 }
862 if ($avatar !== null) {
863 $sets[] = 'avatar = ?';
864 $args[] = safeAvatarUrl($avatar);
865 }
866 $args[] = $userId;
867 $this->pdo->prepare(
868 'UPDATE profiles SET ' . implode(', ', $sets) . ' WHERE user_id = ?'
869 )->execute($args);
870 return $this->ensureProfile($userId);
871 }
872
873 /**
874 * Global top players by lifetime_points (the profile total the reward
875 * screen counts up). Ties: name, then user_id.
876 *
877 * @return list<array{rank:int,id:string,name:string,avatar:?string,points:int,you:bool}>
878 */
879 public function topPlayers(int $limit = 10, ?string $viewerId = null): array
880 {
881 $limit = max(1, min(50, $limit));
882 $stmt = $this->pdo->prepare(
883 'SELECT user_id, lifetime_points, name, avatar FROM profiles
884 ORDER BY lifetime_points DESC, name COLLATE NOCASE ASC, user_id ASC
885 LIMIT ?'
886 );
887 $stmt->execute([$limit]);
888 return $this->presentLeaderboard($stmt->fetchAll() ?: [], $viewerId);
889 }
890
891 /**
892 * Friends-only leaderboard. Friends without a Meteors profile appear
893 * with 0 points, using the name/avatar from the auth friends list.
894 *
895 * @param list<array{id:string,name?:string,avatar?:?string}> $friends
896 * @return list<array{rank:int,id:string,name:string,avatar:?string,points:int,you:bool}>
897 */
898 public function friendsLeaderboard(array $friends, int $limit = 10, ?string $viewerId = null): array
899 {
900 $limit = max(1, min(50, $limit));
901 $byId = [];
902 foreach ($friends as $f) {
903 if (!is_array($f) || !isset($f['id']) || !is_string($f['id']) || $f['id'] === '') {
904 continue;
905 }
906 $byId[$f['id']] = $f;
907 }
908 if ($byId === []) {
909 return [];
910 }
911 $ids = array_keys($byId);
912 $placeholders = implode(',', array_fill(0, count($ids), '?'));
913 $stmt = $this->pdo->prepare(
914 "SELECT user_id, lifetime_points, name, avatar FROM profiles WHERE user_id IN ($placeholders)"
915 );
916 $stmt->execute($ids);
917 $found = [];
918 foreach ($stmt->fetchAll() ?: [] as $row) {
919 $found[$row['user_id']] = $row;
920 }
921 $rows = [];
922 foreach ($byId as $id => $f) {
923 $row = $found[$id] ?? null;
924 $fallbackName = isset($f['name']) && is_string($f['name']) ? $f['name'] : '';
925 $fallbackAvatar = isset($f['avatar']) && is_string($f['avatar']) ? $f['avatar'] : null;
926 $rows[] = [
927 'user_id' => $id,
928 'lifetime_points' => $row !== null ? (int) $row['lifetime_points'] : 0,
929 'name' => ($row['name'] ?? '') !== '' && $row !== null ? $row['name'] : $fallbackName,
930 'avatar' => ($row['avatar'] ?? '') !== '' && $row !== null
931 ? $row['avatar']
932 : $fallbackAvatar,
933 ];
934 }
935 $list = $this->presentLeaderboard($rows, $viewerId);
936 return array_slice($list, 0, $limit);
937 }
938
939 /**
940 * @param list<array<string,mixed>> $rows
941 * @return list<array{rank:int,id:string,name:string,avatar:?string,points:int,you:bool}>
942 */
943 private function presentLeaderboard(array $rows, ?string $viewerId): array
944 {
945 $list = [];
946 foreach ($rows as $row) {
947 $id = (string) ($row['user_id'] ?? '');
948 $name = trim((string) ($row['name'] ?? ''));
949 if ($name === '') {
950 $name = str_contains($id, ':') ? substr($id, (int) strrpos($id, ':') + 1) : $id;
951 if ($name === '') {
952 $name = 'Player';
953 }
954 }
955 $list[] = [
956 'id' => $id,
957 'name' => $name,
958 'avatar' => safeAvatarUrl($row['avatar'] ?? null),
959 'points' => (int) ($row['lifetime_points'] ?? 0),
960 'you' => $viewerId !== null && $viewerId !== '' && $viewerId === $id,
961 ];
962 }
963 usort($list, static function (array $a, array $b): int {
964 $pc = $b['points'] <=> $a['points'];
965 if ($pc !== 0) {
966 return $pc;
967 }
968 $nc = strcasecmp($a['name'], $b['name']);
969 if ($nc !== 0) {
970 return $nc;
971 }
972 return strcmp($a['id'], $b['id']);
973 });
974 foreach ($list as $i => &$p) {
975 $p['rank'] = $i + 1;
976 }
977 unset($p);
978 return $list;
979 }
980
847 981 public function locale(string $userId): ?string
848 982 {
849 983 $v = $this->ensureProfile($userId)['locale'] ?? null;
@@ -116,6 +116,8 @@ CREATE TABLE IF NOT EXISTS custom_planets (
116CREATE INDEX IF NOT EXISTS custom_planets_user ON custom_planets (user_id);
116CREATE INDEX IF NOT EXISTS custom_planets_user ON custom_planets (user_id);
117SQL);
117SQL);
118 $this->ensureColumn('profiles', 'last_planet', 'TEXT');
118 $this->ensureColumn('profiles', 'last_planet', 'TEXT');
119 $this->ensureColumn('profiles', 'name', 'TEXT');
120 $this->ensureColumn('profiles', 'avatar', 'TEXT');
119 }
121 }
120
122
121 private function ensureColumn(string $table, string $column, string $ddl): void
123 private function ensureColumn(string $table, string $column, string $ddl): void
@@ -844,6 +846,138 @@ SQL);
844 return (int) $this->ensureProfile($userId)['lifetime_points'];
846 return (int) $this->ensureProfile($userId)['lifetime_points'];
845 }
847 }
846
848
849 /** Remember the player's display name and avatar (from auth / the session). */
850 public function touchProfile(string $userId, ?string $name = null, ?string $avatar = null): array
851 {
852 $this->ensureProfile($userId);
853 $sets = ['updated = ?'];
854 $args = [$this->now()];
855 if ($name !== null) {
856 $name = trim($name);
857 if ($name !== '' && mb_strlen($name) <= 64 && !preg_match('/[\x00-\x1F]/', $name)) {
858 $sets[] = 'name = ?';
859 $args[] = $name;
860 }
861 }
862 if ($avatar !== null) {
863 $sets[] = 'avatar = ?';
864 $args[] = safeAvatarUrl($avatar);
865 }
866 $args[] = $userId;
867 $this->pdo->prepare(
868 'UPDATE profiles SET ' . implode(', ', $sets) . ' WHERE user_id = ?'
869 )->execute($args);
870 return $this->ensureProfile($userId);
871 }
872
873 /**
874 * Global top players by lifetime_points (the profile total the reward
875 * screen counts up). Ties: name, then user_id.
876 *
877 * @return list<array{rank:int,id:string,name:string,avatar:?string,points:int,you:bool}>
878 */
879 public function topPlayers(int $limit = 10, ?string $viewerId = null): array
880 {
881 $limit = max(1, min(50, $limit));
882 $stmt = $this->pdo->prepare(
883 'SELECT user_id, lifetime_points, name, avatar FROM profiles
884 ORDER BY lifetime_points DESC, name COLLATE NOCASE ASC, user_id ASC
885 LIMIT ?'
886 );
887 $stmt->execute([$limit]);
888 return $this->presentLeaderboard($stmt->fetchAll() ?: [], $viewerId);
889 }
890
891 /**
892 * Friends-only leaderboard. Friends without a Meteors profile appear
893 * with 0 points, using the name/avatar from the auth friends list.
894 *
895 * @param list<array{id:string,name?:string,avatar?:?string}> $friends
896 * @return list<array{rank:int,id:string,name:string,avatar:?string,points:int,you:bool}>
897 */
898 public function friendsLeaderboard(array $friends, int $limit = 10, ?string $viewerId = null): array
899 {
900 $limit = max(1, min(50, $limit));
901 $byId = [];
902 foreach ($friends as $f) {
903 if (!is_array($f) || !isset($f['id']) || !is_string($f['id']) || $f['id'] === '') {
904 continue;
905 }
906 $byId[$f['id']] = $f;
907 }
908 if ($byId === []) {
909 return [];
910 }
911 $ids = array_keys($byId);
912 $placeholders = implode(',', array_fill(0, count($ids), '?'));
913 $stmt = $this->pdo->prepare(
914 "SELECT user_id, lifetime_points, name, avatar FROM profiles WHERE user_id IN ($placeholders)"
915 );
916 $stmt->execute($ids);
917 $found = [];
918 foreach ($stmt->fetchAll() ?: [] as $row) {
919 $found[$row['user_id']] = $row;
920 }
921 $rows = [];
922 foreach ($byId as $id => $f) {
923 $row = $found[$id] ?? null;
924 $fallbackName = isset($f['name']) && is_string($f['name']) ? $f['name'] : '';
925 $fallbackAvatar = isset($f['avatar']) && is_string($f['avatar']) ? $f['avatar'] : null;
926 $rows[] = [
927 'user_id' => $id,
928 'lifetime_points' => $row !== null ? (int) $row['lifetime_points'] : 0,
929 'name' => ($row['name'] ?? '') !== '' && $row !== null ? $row['name'] : $fallbackName,
930 'avatar' => ($row['avatar'] ?? '') !== '' && $row !== null
931 ? $row['avatar']
932 : $fallbackAvatar,
933 ];
934 }
935 $list = $this->presentLeaderboard($rows, $viewerId);
936 return array_slice($list, 0, $limit);
937 }
938
939 /**
940 * @param list<array<string,mixed>> $rows
941 * @return list<array{rank:int,id:string,name:string,avatar:?string,points:int,you:bool}>
942 */
943 private function presentLeaderboard(array $rows, ?string $viewerId): array
944 {
945 $list = [];
946 foreach ($rows as $row) {
947 $id = (string) ($row['user_id'] ?? '');
948 $name = trim((string) ($row['name'] ?? ''));
949 if ($name === '') {
950 $name = str_contains($id, ':') ? substr($id, (int) strrpos($id, ':') + 1) : $id;
951 if ($name === '') {
952 $name = 'Player';
953 }
954 }
955 $list[] = [
956 'id' => $id,
957 'name' => $name,
958 'avatar' => safeAvatarUrl($row['avatar'] ?? null),
959 'points' => (int) ($row['lifetime_points'] ?? 0),
960 'you' => $viewerId !== null && $viewerId !== '' && $viewerId === $id,
961 ];
962 }
963 usort($list, static function (array $a, array $b): int {
964 $pc = $b['points'] <=> $a['points'];
965 if ($pc !== 0) {
966 return $pc;
967 }
968 $nc = strcasecmp($a['name'], $b['name']);
969 if ($nc !== 0) {
970 return $nc;
971 }
972 return strcmp($a['id'], $b['id']);
973 });
974 foreach ($list as $i => &$p) {
975 $p['rank'] = $i + 1;
976 }
977 unset($p);
978 return $list;
979 }
980
847 public function locale(string $userId): ?string
981 public function locale(string $userId): ?string
848 {
982 {
849 $v = $this->ensureProfile($userId)['locale'] ?? null;
983 $v = $this->ensureProfile($userId)['locale'] ?? null;
server/lib/bootstrap.php +88 −4
@@ -165,7 +165,85 @@ function authRequest(string $path, ?array $form = null, ?string $token = null):
165 165 return $data;
166 166 }
167 167
168 /** @return array{0:string,1:string} */
168 /** Safe profile-picture URL from auth (https/http or a same-origin path). */
169 function safeAvatarUrl($url): ?string
170 {
171 if (!is_string($url)) {
172 return null;
173 }
174 $url = trim($url);
175 if ($url === '' || strlen($url) > 500) {
176 return null;
177 }
178 if (preg_match('#^(javascript|vbscript|data):#i', $url)) {
179 return null;
180 }
181 if (preg_match('#^https?://#i', $url) || str_starts_with($url, '/')) {
182 return $url;
183 }
184 return null;
185 }
186
187 function authAvatarUrl(array $profile): ?string
188 {
189 foreach (['avatar_url', 'avatar', 'picture'] as $k) {
190 if (isset($profile[$k]) && is_string($profile[$k])) {
191 $url = safeAvatarUrl($profile[$k]);
192 if ($url !== null) {
193 return $url;
194 }
195 }
196 }
197 return null;
198 }
199
200 /**
201 * Parse GET /api/friends from auth.timfalken.com into Meteors user ids
202 * (`auth:{id}`), names and avatars. Invalid entries are skipped.
203 *
204 * @return list<array{id:string,name:string,avatar:?string}>
205 */
206 function parseAuthFriends($data): array
207 {
208 if (!is_array($data) || !isset($data['friends']) || !is_array($data['friends'])) {
209 return [];
210 }
211 $out = [];
212 foreach ($data['friends'] as $f) {
213 if (!is_array($f) || !isset($f['id'])) {
214 continue;
215 }
216 $raw = $f['id'];
217 $numeric = is_int($raw) || (is_string($raw) && preg_match('/^[1-9][0-9]{0,17}$/', $raw));
218 if (!$numeric || (int) $raw < 1) {
219 continue;
220 }
221 $name = isset($f['username']) && is_string($f['username']) ? trim($f['username']) : '';
222 if ($name === '' || mb_strlen($name) > 64) {
223 $name = 'auth:' . (int) $raw;
224 }
225 $out[] = [
226 'id' => 'auth:' . (int) $raw,
227 'name' => $name,
228 'avatar' => authAvatarUrl($f),
229 ];
230 }
231 return $out;
232 }
233
234 /** Local testers test_user_1 and test_user_2 are friends of each other. */
235 function localTestFriends(string $userId): array
236 {
237 if ($userId === 'local:test_user_1') {
238 return [['id' => 'local:test_user_2', 'name' => 'test_user_2', 'avatar' => null]];
239 }
240 if ($userId === 'local:test_user_2') {
241 return [['id' => 'local:test_user_1', 'name' => 'test_user_1', 'avatar' => null]];
242 }
243 return [];
244 }
245
246 /** @return array{0:string,1:string,2:?string} id, name, avatar */
169 247 function authIdentity(array $profile): array
170 248 {
171 249 if (!isset($profile['id'], $profile['username']) || !is_string($profile['username'])) {
@@ -176,7 +254,7 @@ function authIdentity(array $profile): array
176 254 if (!$numeric || (int) $raw < 1) {
177 255 throw new RuntimeException('Ongeldig account-id.');
178 256 }
179 return ['auth:' . (int) $raw, $profile['username']];
257 return ['auth:' . (int) $raw, $profile['username'], authAvatarUrl($profile)];
180 258 }
181 259
182 260 /**
@@ -195,7 +273,7 @@ function loginReturnPath(?string $target): string
195 273 return $target === 'online' ? 'index.html?online=1' : 'index.html';
196 274 }
197 275
198 function loginUser(string $id, string $name): void
276 function loginUser(string $id, string $name, ?string $avatar = null): void
199 277 {
200 278 if (!preg_match('/^(?:local:test_user_[12]|auth:[1-9][0-9]{0,17})$/', $id)) {
201 279 throw new RuntimeException('Ongeldig account.');
@@ -207,6 +285,7 @@ function loginUser(string $id, string $name): void
207 285 session_regenerate_id(true);
208 286 $_SESSION['user'] = $id;
209 287 $_SESSION['name'] = $name;
288 $_SESSION['avatar'] = safeAvatarUrl($avatar);
210 289 $_SESSION['csrf'] = bin2hex(random_bytes(24));
211 290 $_SESSION['expires'] = time() + METEORS_SESSION_TTL;
212 291 }
@@ -237,7 +316,12 @@ function currentUser(): ?array
237 316 if (!localDev() && (($_SESSION['expires'] ?? 0) < time())) {
238 317 return null;
239 318 }
240 return ['id' => $id, 'name' => $name];
319 $avatar = $_SESSION['avatar'] ?? null;
320 return [
321 'id' => $id,
322 'name' => $name,
323 'avatar' => is_string($avatar) ? safeAvatarUrl($avatar) : null,
324 ];
241 325 }
242 326
243 327 function requireUser(): array
@@ -165,7 +165,85 @@ function authRequest(string $path, ?array $form = null, ?string $token = null):
165 return $data;
165 return $data;
166}
166}
167
167
168/** @return array{0:string,1:string} */
168/** Safe profile-picture URL from auth (https/http or a same-origin path). */
169function safeAvatarUrl($url): ?string
170{
171 if (!is_string($url)) {
172 return null;
173 }
174 $url = trim($url);
175 if ($url === '' || strlen($url) > 500) {
176 return null;
177 }
178 if (preg_match('#^(javascript|vbscript|data):#i', $url)) {
179 return null;
180 }
181 if (preg_match('#^https?://#i', $url) || str_starts_with($url, '/')) {
182 return $url;
183 }
184 return null;
185}
186
187function authAvatarUrl(array $profile): ?string
188{
189 foreach (['avatar_url', 'avatar', 'picture'] as $k) {
190 if (isset($profile[$k]) && is_string($profile[$k])) {
191 $url = safeAvatarUrl($profile[$k]);
192 if ($url !== null) {
193 return $url;
194 }
195 }
196 }
197 return null;
198}
199
200/**
201 * Parse GET /api/friends from auth.timfalken.com into Meteors user ids
202 * (`auth:{id}`), names and avatars. Invalid entries are skipped.
203 *
204 * @return list<array{id:string,name:string,avatar:?string}>
205 */
206function parseAuthFriends($data): array
207{
208 if (!is_array($data) || !isset($data['friends']) || !is_array($data['friends'])) {
209 return [];
210 }
211 $out = [];
212 foreach ($data['friends'] as $f) {
213 if (!is_array($f) || !isset($f['id'])) {
214 continue;
215 }
216 $raw = $f['id'];
217 $numeric = is_int($raw) || (is_string($raw) && preg_match('/^[1-9][0-9]{0,17}$/', $raw));
218 if (!$numeric || (int) $raw < 1) {
219 continue;
220 }
221 $name = isset($f['username']) && is_string($f['username']) ? trim($f['username']) : '';
222 if ($name === '' || mb_strlen($name) > 64) {
223 $name = 'auth:' . (int) $raw;
224 }
225 $out[] = [
226 'id' => 'auth:' . (int) $raw,
227 'name' => $name,
228 'avatar' => authAvatarUrl($f),
229 ];
230 }
231 return $out;
232}
233
234/** Local testers test_user_1 and test_user_2 are friends of each other. */
235function localTestFriends(string $userId): array
236{
237 if ($userId === 'local:test_user_1') {
238 return [['id' => 'local:test_user_2', 'name' => 'test_user_2', 'avatar' => null]];
239 }
240 if ($userId === 'local:test_user_2') {
241 return [['id' => 'local:test_user_1', 'name' => 'test_user_1', 'avatar' => null]];
242 }
243 return [];
244}
245
246/** @return array{0:string,1:string,2:?string} id, name, avatar */
169function authIdentity(array $profile): array
247function authIdentity(array $profile): array
170{
248{
171 if (!isset($profile['id'], $profile['username']) || !is_string($profile['username'])) {
249 if (!isset($profile['id'], $profile['username']) || !is_string($profile['username'])) {
@@ -176,7 +254,7 @@ function authIdentity(array $profile): array
176 if (!$numeric || (int) $raw < 1) {
254 if (!$numeric || (int) $raw < 1) {
177 throw new RuntimeException('Ongeldig account-id.');
255 throw new RuntimeException('Ongeldig account-id.');
178 }
256 }
179 return ['auth:' . (int) $raw, $profile['username']];
257 return ['auth:' . (int) $raw, $profile['username'], authAvatarUrl($profile)];
180}
258}
181
259
182/**
260/**
@@ -195,7 +273,7 @@ function loginReturnPath(?string $target): string
195 return $target === 'online' ? 'index.html?online=1' : 'index.html';
273 return $target === 'online' ? 'index.html?online=1' : 'index.html';
196}
274}
197
275
198function loginUser(string $id, string $name): void
276function loginUser(string $id, string $name, ?string $avatar = null): void
199{
277{
200 if (!preg_match('/^(?:local:test_user_[12]|auth:[1-9][0-9]{0,17})$/', $id)) {
278 if (!preg_match('/^(?:local:test_user_[12]|auth:[1-9][0-9]{0,17})$/', $id)) {
201 throw new RuntimeException('Ongeldig account.');
279 throw new RuntimeException('Ongeldig account.');
@@ -207,6 +285,7 @@ function loginUser(string $id, string $name): void
207 session_regenerate_id(true);
285 session_regenerate_id(true);
208 $_SESSION['user'] = $id;
286 $_SESSION['user'] = $id;
209 $_SESSION['name'] = $name;
287 $_SESSION['name'] = $name;
288 $_SESSION['avatar'] = safeAvatarUrl($avatar);
210 $_SESSION['csrf'] = bin2hex(random_bytes(24));
289 $_SESSION['csrf'] = bin2hex(random_bytes(24));
211 $_SESSION['expires'] = time() + METEORS_SESSION_TTL;
290 $_SESSION['expires'] = time() + METEORS_SESSION_TTL;
212}
291}
@@ -237,7 +316,12 @@ function currentUser(): ?array
237 if (!localDev() && (($_SESSION['expires'] ?? 0) < time())) {
316 if (!localDev() && (($_SESSION['expires'] ?? 0) < time())) {
238 return null;
317 return null;
239 }
318 }
240 return ['id' => $id, 'name' => $name];
319 $avatar = $_SESSION['avatar'] ?? null;
320 return [
321 'id' => $id,
322 'name' => $name,
323 'avatar' => is_string($avatar) ? safeAvatarUrl($avatar) : null,
324 ];
241}
325}
242
326
243function requireUser(): array
327function requireUser(): array
server/lib/i18n.json +90 −10
@@ -291,7 +291,15 @@
291 291 "offline.defeated.many": "{n} opponents defeated",
292 292 "offline.defeated.other": "{n} opponents defeated",
293 293 "stats.gravity": "{pct}% ({g}g)",
294 "menu.survival": "Survival"
294 "menu.survival": "Survival",
295 "menu.leaderboard": "Leaderboard",
296 "leaderboard.title": "Leaderboard",
297 "leaderboard.global": "Top 10",
298 "leaderboard.friends": "Friends",
299 "leaderboard.empty": "No scores yet.",
300 "leaderboard.loginPrompt": "Log in to see how your friends rank.",
301 "leaderboard.loadError": "The leaderboard could not be loaded.",
302 "leaderboard.points": "{n} points"
295 303 },
296 304 "nl": {
297 305 "menu.play": "Spelen",
@@ -584,7 +592,15 @@
584 592 "offline.defeated.many": "{n} tegenstanders verslagen",
585 593 "offline.defeated.other": "{n} tegenstanders verslagen",
586 594 "stats.gravity": "{pct}% ({g}g)",
587 "menu.survival": "Overleven"
595 "menu.survival": "Overleven",
596 "menu.leaderboard": "Ranglijst",
597 "leaderboard.title": "Ranglijst",
598 "leaderboard.global": "Top 10",
599 "leaderboard.friends": "Vrienden",
600 "leaderboard.empty": "Nog geen scores.",
601 "leaderboard.loginPrompt": "Log in om te zien hoe je vrienden ervoor staan.",
602 "leaderboard.loadError": "De ranglijst kon niet worden geladen.",
603 "leaderboard.points": "{n} punten"
588 604 },
589 605 "de": {
590 606 "menu.play": "Spielen",
@@ -877,7 +893,15 @@
877 893 "offline.defeated.many": "{n} Gegner besiegt",
878 894 "offline.defeated.other": "{n} Gegner besiegt",
879 895 "stats.gravity": "{pct} % ({g} g)",
880 "menu.survival": "Überleben"
896 "menu.survival": "Überleben",
897 "menu.leaderboard": "Rangliste",
898 "leaderboard.title": "Rangliste",
899 "leaderboard.global": "Top 10",
900 "leaderboard.friends": "Freunde",
901 "leaderboard.empty": "Noch keine Punkte.",
902 "leaderboard.loginPrompt": "Melde dich an, um zu sehen, wie deine Freunde dastehen.",
903 "leaderboard.loadError": "Die Rangliste konnte nicht geladen werden.",
904 "leaderboard.points": "{n} Punkte"
881 905 },
882 906 "fr": {
883 907 "menu.play": "Jouer",
@@ -1170,7 +1194,15 @@
1170 1194 "offline.defeated.many": "{n} adversaires vaincus",
1171 1195 "offline.defeated.other": "{n} adversaires vaincus",
1172 1196 "stats.gravity": "{pct} % ({g} g)",
1173 "menu.survival": "Survie"
1197 "menu.survival": "Survie",
1198 "menu.leaderboard": "Classement",
1199 "leaderboard.title": "Classement",
1200 "leaderboard.global": "Top 10",
1201 "leaderboard.friends": "Amis",
1202 "leaderboard.empty": "Pas encore de scores.",
1203 "leaderboard.loginPrompt": "Connecte-toi pour voir le classement de tes amis.",
1204 "leaderboard.loadError": "Le classement n'a pas pu être chargé.",
1205 "leaderboard.points": "{n} points"
1174 1206 },
1175 1207 "ja": {
1176 1208 "menu.play": "プレイ",
@@ -1463,7 +1495,15 @@
1463 1495 "offline.defeated.many": "{n}人の相手を倒した",
1464 1496 "offline.defeated.other": "{n}人の相手を倒した",
1465 1497 "stats.gravity": "{pct}% ({g}g)",
1466 "menu.survival": "サバイバル"
1498 "menu.survival": "サバイバル",
1499 "menu.leaderboard": "ランキング",
1500 "leaderboard.title": "ランキング",
1501 "leaderboard.global": "トップ10",
1502 "leaderboard.friends": "フレンド",
1503 "leaderboard.empty": "まだスコアがありません。",
1504 "leaderboard.loginPrompt": "ログインするとフレンドの順位が見られます。",
1505 "leaderboard.loadError": "ランキングを読み込めませんでした。",
1506 "leaderboard.points": "{n} ポイント"
1467 1507 },
1468 1508 "zh": {
1469 1509 "menu.play": "开始游戏",
@@ -1756,7 +1796,15 @@
1756 1796 "offline.defeated.many": "击败了 {n} 名对手",
1757 1797 "offline.defeated.other": "击败了 {n} 名对手",
1758 1798 "stats.gravity": "{pct}% ({g}g)",
1759 "menu.survival": "生存"
1799 "menu.survival": "生存",
1800 "menu.leaderboard": "排行榜",
1801 "leaderboard.title": "排行榜",
1802 "leaderboard.global": "前 10 名",
1803 "leaderboard.friends": "好友",
1804 "leaderboard.empty": "还没有分数。",
1805 "leaderboard.loginPrompt": "登录后即可查看好友排名。",
1806 "leaderboard.loadError": "无法加载排行榜。",
1807 "leaderboard.points": "{n} 分"
1760 1808 },
1761 1809 "ko": {
1762 1810 "menu.play": "플레이",
@@ -2049,7 +2097,15 @@
2049 2097 "offline.defeated.many": "상대 {n}명 격파",
2050 2098 "offline.defeated.other": "상대 {n}명 격파",
2051 2099 "stats.gravity": "{pct}% ({g}g)",
2052 "menu.survival": "서바이벌"
2100 "menu.survival": "서바이벌",
2101 "menu.leaderboard": "순위표",
2102 "leaderboard.title": "순위표",
2103 "leaderboard.global": "상위 10",
2104 "leaderboard.friends": "친구",
2105 "leaderboard.empty": "아직 점수가 없습니다.",
2106 "leaderboard.loginPrompt": "로그인하면 친구 순위를 볼 수 있습니다.",
2107 "leaderboard.loadError": "순위표를 불러올 수 없습니다.",
2108 "leaderboard.points": "{n}점"
2053 2109 },
2054 2110 "pl": {
2055 2111 "menu.play": "Graj",
@@ -2342,7 +2398,15 @@
2342 2398 "offline.defeated.many": "{n} pokonanych przeciwników",
2343 2399 "offline.defeated.other": "{n} pokonanych przeciwników",
2344 2400 "stats.gravity": "{pct} % ({g} g)",
2345 "menu.survival": "Przetrwanie"
2401 "menu.survival": "Przetrwanie",
2402 "menu.leaderboard": "Ranking",
2403 "leaderboard.title": "Ranking",
2404 "leaderboard.global": "Top 10",
2405 "leaderboard.friends": "Znajomi",
2406 "leaderboard.empty": "Brak wyników.",
2407 "leaderboard.loginPrompt": "Zaloguj się, aby zobaczyć pozycję znajomych.",
2408 "leaderboard.loadError": "Nie udało się wczytać rankingu.",
2409 "leaderboard.points": "{n} pkt"
2346 2410 },
2347 2411 "ru": {
2348 2412 "menu.play": "Играть",
@@ -2635,7 +2699,15 @@
2635 2699 "offline.defeated.many": "{n} противников побеждено",
2636 2700 "offline.defeated.other": "{n} противников побеждено",
2637 2701 "stats.gravity": "{pct} % ({g} g)",
2638 "menu.survival": "Выживание"
2702 "menu.survival": "Выживание",
2703 "menu.leaderboard": "Таблица лидеров",
2704 "leaderboard.title": "Таблица лидеров",
2705 "leaderboard.global": "Топ-10",
2706 "leaderboard.friends": "Друзья",
2707 "leaderboard.empty": "Пока нет очков.",
2708 "leaderboard.loginPrompt": "Войди, чтобы увидеть места друзей.",
2709 "leaderboard.loadError": "Не удалось загрузить таблицу лидеров.",
2710 "leaderboard.points": "{n} очков"
2639 2711 },
2640 2712 "es": {
2641 2713 "menu.play": "Jugar",
@@ -2928,7 +3000,15 @@
2928 3000 "offline.defeated.many": "{n} rivales derrotados",
2929 3001 "offline.defeated.other": "{n} rivales derrotados",
2930 3002 "stats.gravity": "{pct} % ({g} g)",
2931 "menu.survival": "Supervivencia"
3003 "menu.survival": "Supervivencia",
3004 "menu.leaderboard": "Clasificación",
3005 "leaderboard.title": "Clasificación",
3006 "leaderboard.global": "Top 10",
3007 "leaderboard.friends": "Amigos",
3008 "leaderboard.empty": "Aún no hay puntuaciones.",
3009 "leaderboard.loginPrompt": "Inicia sesión para ver la clasificación de tus amigos.",
3010 "leaderboard.loadError": "No se pudo cargar la clasificación.",
3011 "leaderboard.points": "{n} puntos"
2932 3012 }
2933 3013 },
2934 3014 "errors": {
@@ -291,7 +291,15 @@
291 "offline.defeated.many": "{n} opponents defeated",
291 "offline.defeated.many": "{n} opponents defeated",
292 "offline.defeated.other": "{n} opponents defeated",
292 "offline.defeated.other": "{n} opponents defeated",
293 "stats.gravity": "{pct}% ({g}g)",
293 "stats.gravity": "{pct}% ({g}g)",
294 "menu.survival": "Survival"
294 "menu.survival": "Survival",
295 "menu.leaderboard": "Leaderboard",
296 "leaderboard.title": "Leaderboard",
297 "leaderboard.global": "Top 10",
298 "leaderboard.friends": "Friends",
299 "leaderboard.empty": "No scores yet.",
300 "leaderboard.loginPrompt": "Log in to see how your friends rank.",
301 "leaderboard.loadError": "The leaderboard could not be loaded.",
302 "leaderboard.points": "{n} points"
295 },
303 },
296 "nl": {
304 "nl": {
297 "menu.play": "Spelen",
305 "menu.play": "Spelen",
@@ -584,7 +592,15 @@
584 "offline.defeated.many": "{n} tegenstanders verslagen",
592 "offline.defeated.many": "{n} tegenstanders verslagen",
585 "offline.defeated.other": "{n} tegenstanders verslagen",
593 "offline.defeated.other": "{n} tegenstanders verslagen",
586 "stats.gravity": "{pct}% ({g}g)",
594 "stats.gravity": "{pct}% ({g}g)",
587 "menu.survival": "Overleven"
595 "menu.survival": "Overleven",
596 "menu.leaderboard": "Ranglijst",
597 "leaderboard.title": "Ranglijst",
598 "leaderboard.global": "Top 10",
599 "leaderboard.friends": "Vrienden",
600 "leaderboard.empty": "Nog geen scores.",
601 "leaderboard.loginPrompt": "Log in om te zien hoe je vrienden ervoor staan.",
602 "leaderboard.loadError": "De ranglijst kon niet worden geladen.",
603 "leaderboard.points": "{n} punten"
588 },
604 },
589 "de": {
605 "de": {
590 "menu.play": "Spielen",
606 "menu.play": "Spielen",
@@ -877,7 +893,15 @@
877 "offline.defeated.many": "{n} Gegner besiegt",
893 "offline.defeated.many": "{n} Gegner besiegt",
878 "offline.defeated.other": "{n} Gegner besiegt",
894 "offline.defeated.other": "{n} Gegner besiegt",
879 "stats.gravity": "{pct} % ({g} g)",
895 "stats.gravity": "{pct} % ({g} g)",
880 "menu.survival": "Überleben"
896 "menu.survival": "Überleben",
897 "menu.leaderboard": "Rangliste",
898 "leaderboard.title": "Rangliste",
899 "leaderboard.global": "Top 10",
900 "leaderboard.friends": "Freunde",
901 "leaderboard.empty": "Noch keine Punkte.",
902 "leaderboard.loginPrompt": "Melde dich an, um zu sehen, wie deine Freunde dastehen.",
903 "leaderboard.loadError": "Die Rangliste konnte nicht geladen werden.",
904 "leaderboard.points": "{n} Punkte"
881 },
905 },
882 "fr": {
906 "fr": {
883 "menu.play": "Jouer",
907 "menu.play": "Jouer",
@@ -1170,7 +1194,15 @@
1170 "offline.defeated.many": "{n} adversaires vaincus",
1194 "offline.defeated.many": "{n} adversaires vaincus",
1171 "offline.defeated.other": "{n} adversaires vaincus",
1195 "offline.defeated.other": "{n} adversaires vaincus",
1172 "stats.gravity": "{pct} % ({g} g)",
1196 "stats.gravity": "{pct} % ({g} g)",
1173 "menu.survival": "Survie"
1197 "menu.survival": "Survie",
1198 "menu.leaderboard": "Classement",
1199 "leaderboard.title": "Classement",
1200 "leaderboard.global": "Top 10",
1201 "leaderboard.friends": "Amis",
1202 "leaderboard.empty": "Pas encore de scores.",
1203 "leaderboard.loginPrompt": "Connecte-toi pour voir le classement de tes amis.",
1204 "leaderboard.loadError": "Le classement n'a pas pu être chargé.",
1205 "leaderboard.points": "{n} points"
1174 },
1206 },
1175 "ja": {
1207 "ja": {
1176 "menu.play": "プレイ",
1208 "menu.play": "プレイ",
@@ -1463,7 +1495,15 @@
1463 "offline.defeated.many": "{n}人の相手を倒した",
1495 "offline.defeated.many": "{n}人の相手を倒した",
1464 "offline.defeated.other": "{n}人の相手を倒した",
1496 "offline.defeated.other": "{n}人の相手を倒した",
1465 "stats.gravity": "{pct}% ({g}g)",
1497 "stats.gravity": "{pct}% ({g}g)",
1466 "menu.survival": "サバイバル"
1498 "menu.survival": "サバイバル",
1499 "menu.leaderboard": "ランキング",
1500 "leaderboard.title": "ランキング",
1501 "leaderboard.global": "トップ10",
1502 "leaderboard.friends": "フレンド",
1503 "leaderboard.empty": "まだスコアがありません。",
1504 "leaderboard.loginPrompt": "ログインするとフレンドの順位が見られます。",
1505 "leaderboard.loadError": "ランキングを読み込めませんでした。",
1506 "leaderboard.points": "{n} ポイント"
1467 },
1507 },
1468 "zh": {
1508 "zh": {
1469 "menu.play": "开始游戏",
1509 "menu.play": "开始游戏",
@@ -1756,7 +1796,15 @@
1756 "offline.defeated.many": "击败了 {n} 名对手",
1796 "offline.defeated.many": "击败了 {n} 名对手",
1757 "offline.defeated.other": "击败了 {n} 名对手",
1797 "offline.defeated.other": "击败了 {n} 名对手",
1758 "stats.gravity": "{pct}% ({g}g)",
1798 "stats.gravity": "{pct}% ({g}g)",
1759 "menu.survival": "生存"
1799 "menu.survival": "生存",
1800 "menu.leaderboard": "排行榜",
1801 "leaderboard.title": "排行榜",
1802 "leaderboard.global": "前 10 名",
1803 "leaderboard.friends": "好友",
1804 "leaderboard.empty": "还没有分数。",
1805 "leaderboard.loginPrompt": "登录后即可查看好友排名。",
1806 "leaderboard.loadError": "无法加载排行榜。",
1807 "leaderboard.points": "{n} 分"
1760 },
1808 },
1761 "ko": {
1809 "ko": {
1762 "menu.play": "플레이",
1810 "menu.play": "플레이",
@@ -2049,7 +2097,15 @@
2049 "offline.defeated.many": "상대 {n}명 격파",
2097 "offline.defeated.many": "상대 {n}명 격파",
2050 "offline.defeated.other": "상대 {n}명 격파",
2098 "offline.defeated.other": "상대 {n}명 격파",
2051 "stats.gravity": "{pct}% ({g}g)",
2099 "stats.gravity": "{pct}% ({g}g)",
2052 "menu.survival": "서바이벌"
2100 "menu.survival": "서바이벌",
2101 "menu.leaderboard": "순위표",
2102 "leaderboard.title": "순위표",
2103 "leaderboard.global": "상위 10",
2104 "leaderboard.friends": "친구",
2105 "leaderboard.empty": "아직 점수가 없습니다.",
2106 "leaderboard.loginPrompt": "로그인하면 친구 순위를 볼 수 있습니다.",
2107 "leaderboard.loadError": "순위표를 불러올 수 없습니다.",
2108 "leaderboard.points": "{n}점"
2053 },
2109 },
2054 "pl": {
2110 "pl": {
2055 "menu.play": "Graj",
2111 "menu.play": "Graj",
@@ -2342,7 +2398,15 @@
2342 "offline.defeated.many": "{n} pokonanych przeciwników",
2398 "offline.defeated.many": "{n} pokonanych przeciwników",
2343 "offline.defeated.other": "{n} pokonanych przeciwników",
2399 "offline.defeated.other": "{n} pokonanych przeciwników",
2344 "stats.gravity": "{pct} % ({g} g)",
2400 "stats.gravity": "{pct} % ({g} g)",
2345 "menu.survival": "Przetrwanie"
2401 "menu.survival": "Przetrwanie",
2402 "menu.leaderboard": "Ranking",
2403 "leaderboard.title": "Ranking",
2404 "leaderboard.global": "Top 10",
2405 "leaderboard.friends": "Znajomi",
2406 "leaderboard.empty": "Brak wyników.",
2407 "leaderboard.loginPrompt": "Zaloguj się, aby zobaczyć pozycję znajomych.",
2408 "leaderboard.loadError": "Nie udało się wczytać rankingu.",
2409 "leaderboard.points": "{n} pkt"
2346 },
2410 },
2347 "ru": {
2411 "ru": {
2348 "menu.play": "Играть",
2412 "menu.play": "Играть",
@@ -2635,7 +2699,15 @@
2635 "offline.defeated.many": "{n} противников побеждено",
2699 "offline.defeated.many": "{n} противников побеждено",
2636 "offline.defeated.other": "{n} противников побеждено",
2700 "offline.defeated.other": "{n} противников побеждено",
2637 "stats.gravity": "{pct} % ({g} g)",
2701 "stats.gravity": "{pct} % ({g} g)",
2638 "menu.survival": "Выживание"
2702 "menu.survival": "Выживание",
2703 "menu.leaderboard": "Таблица лидеров",
2704 "leaderboard.title": "Таблица лидеров",
2705 "leaderboard.global": "Топ-10",
2706 "leaderboard.friends": "Друзья",
2707 "leaderboard.empty": "Пока нет очков.",
2708 "leaderboard.loginPrompt": "Войди, чтобы увидеть места друзей.",
2709 "leaderboard.loadError": "Не удалось загрузить таблицу лидеров.",
2710 "leaderboard.points": "{n} очков"
2639 },
2711 },
2640 "es": {
2712 "es": {
2641 "menu.play": "Jugar",
2713 "menu.play": "Jugar",
@@ -2928,7 +3000,15 @@
2928 "offline.defeated.many": "{n} rivales derrotados",
3000 "offline.defeated.many": "{n} rivales derrotados",
2929 "offline.defeated.other": "{n} rivales derrotados",
3001 "offline.defeated.other": "{n} rivales derrotados",
2930 "stats.gravity": "{pct} % ({g} g)",
3002 "stats.gravity": "{pct} % ({g} g)",
2931 "menu.survival": "Supervivencia"
3003 "menu.survival": "Supervivencia",
3004 "menu.leaderboard": "Clasificación",
3005 "leaderboard.title": "Clasificación",
3006 "leaderboard.global": "Top 10",
3007 "leaderboard.friends": "Amigos",
3008 "leaderboard.empty": "Aún no hay puntuaciones.",
3009 "leaderboard.loginPrompt": "Inicia sesión para ver la clasificación de tus amigos.",
3010 "leaderboard.loadError": "No se pudo cargar la clasificación.",
3011 "leaderboard.points": "{n} puntos"
2932 }
3012 }
2933 },
3013 },
2934 "errors": {
3014 "errors": {
server/tests/run.php +81 −0
@@ -565,6 +565,87 @@ try {
565 565 expect(true, 'unknown locale refused');
566 566 }
567 567
568
569 echo "Leaderboard (t1247)\n";
570 expect(safeAvatarUrl(null) === null, 'null avatar rejected');
571 expect(safeAvatarUrl('javascript:alert(1)') === null, 'javascript avatar rejected');
572 expect(safeAvatarUrl('https://auth.timfalken.com/avatar/1?v=2') === 'https://auth.timfalken.com/avatar/1?v=2', 'https avatar kept');
573 expect(safeAvatarUrl('/avatar/1') === '/avatar/1', 'same-origin path kept');
574 $parsed = parseAuthFriends([
575 'friends' => [
576 ['id' => 2, 'username' => 'ada', 'avatar_url' => 'https://auth.timfalken.com/avatar/2?v=3'],
577 ['id' => 'nope', 'username' => 'bad'],
578 ['id' => 0, 'username' => 'zero'],
579 'not-an-array',
580 ['id' => 3, 'username' => 'bob'],
581 ],
582 ]);
583 expect(count($parsed) === 2, 'parseAuthFriends keeps two valid friends');
584 expect($parsed[0]['id'] === 'auth:2' && $parsed[0]['name'] === 'ada', 'first friend id+name');
585 expect($parsed[0]['avatar'] === 'https://auth.timfalken.com/avatar/2?v=3', 'first friend avatar');
586 expect($parsed[1]['id'] === 'auth:3' && $parsed[1]['name'] === 'bob' && $parsed[1]['avatar'] === null, 'second friend no avatar');
587 expect(parseAuthFriends(['friends' => []]) === [], 'empty friends list');
588 expect(parseAuthFriends(null) === [], 'invalid friends payload');
589 [$aid, $aname, $aav] = authIdentity(['id' => 7, 'username' => 'tim', 'avatar_url' => 'https://auth.timfalken.com/avatar/7?v=1']);
590 expect($aid === 'auth:7' && $aname === 'tim' && $aav === 'https://auth.timfalken.com/avatar/7?v=1', 'authIdentity includes avatar_url');
591 expect(localTestFriends('local:test_user_1')[0]['id'] === 'local:test_user_2', 'local test_user_1 is friends with test_user_2');
592 expect(localTestFriends('local:test_user_2')[0]['id'] === 'local:test_user_1', 'and the other way around');
593 expect(localTestFriends('auth:7') === [], 'real accounts have no local test friends');
594
595 $lbDir = $tmp . '/leaderboard';
596 mkdir($lbDir, 0775, true);
597 $lb = Store::open($lbDir);
598 for ($i = 1; $i <= 12; $i++) {
599 $uid = 'auth:' . (1000 + $i);
600 $lb->touchProfile($uid, 'Player ' . sprintf('%02d', $i), 'https://auth.timfalken.com/avatar/' . (1000 + $i));
601 $lb->awardPoints($uid, $i * 10, 'lb-' . $i, 'solo');
602 }
603 // nameless profile still appears, fallback name from the id
604 $lb->awardPoints('auth:1099', 5, 'lb-nameless', 'solo');
605 $top = $lb->topPlayers(10, 'auth:1012');
606 expect(count($top) === 10, 'global list is capped at 10 (got ' . count($top) . ')');
607 expect($top[0]['id'] === 'auth:1012' && $top[0]['points'] === 120 && $top[0]['rank'] === 1, 'highest score is first');
608 expect($top[0]['you'] === true, 'current player is flagged when in the top 10');
609 expect($top[0]['name'] === 'Player 12', 'name is stored on the profile');
610 expect($top[0]['avatar'] === 'https://auth.timfalken.com/avatar/1012', 'avatar is stored on the profile');
611 expect($top[9]['id'] === 'auth:1003' && $top[9]['points'] === 30 && $top[9]['you'] === false, '10th is Player 03 with 30 points');
612 $ids = array_column($top, 'id');
613 expect(!in_array('auth:1002', $ids, true) && !in_array('auth:1099', $ids, true), '11th and nameless (5 pts) stay off the top 10');
614 $below = $lb->topPlayers(10, 'auth:1001');
615 expect($below[0]['you'] === false && !in_array(true, array_column($below, 'you'), true), 'viewer outside the top 10 is not flagged');
616
617 // ties: same points, then name, then id
618 $lb->touchProfile('auth:2001', 'Cara', null);
619 $lb->touchProfile('auth:2002', 'Ada', null);
620 $lb->awardPoints('auth:2001', 7, 'tie-c', 'solo');
621 $lb->awardPoints('auth:2002', 7, 'tie-a', 'solo');
622 $tie = $lb->topPlayers(50);
623 $cara = null; $ada = null;
624 foreach ($tie as $row) {
625 if ($row['id'] === 'auth:2001') { $cara = $row; }
626 if ($row['id'] === 'auth:2002') { $ada = $row; }
627 }
628 expect($ada && $cara && $ada['points'] === 7 && $cara['points'] === 7, 'tied players both listed');
629 expect($ada['rank'] < $cara['rank'], 'tie broken by name (Ada before Cara)');
630
631 $friends = [
632 ['id' => 'auth:1012', 'name' => 'From API', 'avatar' => 'https://auth.timfalken.com/avatar/from-api'],
633 ['id' => 'auth:1005', 'name' => 'Player 05', 'avatar' => null],
634 ['id' => 'auth:3001', 'name' => 'Never Played', 'avatar' => 'https://auth.timfalken.com/avatar/3001'],
635 ];
636 $fl = $lb->friendsLeaderboard($friends, 10, 'auth:1099');
637 expect(count($fl) === 3, 'friends tab lists only the friend list (got ' . count($fl) . ')');
638 expect($fl[0]['id'] === 'auth:1012' && $fl[0]['points'] === 120 && $fl[0]['name'] === 'Player 12', 'friend with a profile uses stored name and points');
639 expect($fl[1]['id'] === 'auth:1005' && $fl[1]['points'] === 50, 'second friend by points');
640 expect($fl[2]['id'] === 'auth:3001' && $fl[2]['points'] === 0 && $fl[2]['name'] === 'Never Played', 'friend without a Meteors profile is shown with 0 points');
641 expect($fl[2]['avatar'] === 'https://auth.timfalken.com/avatar/3001', 'avatar from the auth friends list');
642 expect($fl[0]['you'] === false, 'you are not flagged on the friends list unless you are on it');
643 expect($lb->friendsLeaderboard([], 10, 'auth:1012') === [], 'empty friend list → empty board');
644
645 $apiSrc = (string) file_get_contents(dirname(__DIR__) . '/api.php');
646 expect(strpos($apiSrc, "action === 'leaderboard'") !== false, 'api.php has a leaderboard action');
647 expect(strpos($apiSrc, "authRequest('/api/friends'") !== false, 'friends tab uses GET /api/friends on auth.timfalken.com');
648
568 649 echo "\nConfig helpers\n";
569 650
570 651
@@ -565,6 +565,87 @@ try {
565 expect(true, 'unknown locale refused');
565 expect(true, 'unknown locale refused');
566}
566}
567
567
568
569echo "Leaderboard (t1247)\n";
570expect(safeAvatarUrl(null) === null, 'null avatar rejected');
571expect(safeAvatarUrl('javascript:alert(1)') === null, 'javascript avatar rejected');
572expect(safeAvatarUrl('https://auth.timfalken.com/avatar/1?v=2') === 'https://auth.timfalken.com/avatar/1?v=2', 'https avatar kept');
573expect(safeAvatarUrl('/avatar/1') === '/avatar/1', 'same-origin path kept');
574$parsed = parseAuthFriends([
575 'friends' => [
576 ['id' => 2, 'username' => 'ada', 'avatar_url' => 'https://auth.timfalken.com/avatar/2?v=3'],
577 ['id' => 'nope', 'username' => 'bad'],
578 ['id' => 0, 'username' => 'zero'],
579 'not-an-array',
580 ['id' => 3, 'username' => 'bob'],
581 ],
582]);
583expect(count($parsed) === 2, 'parseAuthFriends keeps two valid friends');
584expect($parsed[0]['id'] === 'auth:2' && $parsed[0]['name'] === 'ada', 'first friend id+name');
585expect($parsed[0]['avatar'] === 'https://auth.timfalken.com/avatar/2?v=3', 'first friend avatar');
586expect($parsed[1]['id'] === 'auth:3' && $parsed[1]['name'] === 'bob' && $parsed[1]['avatar'] === null, 'second friend no avatar');
587expect(parseAuthFriends(['friends' => []]) === [], 'empty friends list');
588expect(parseAuthFriends(null) === [], 'invalid friends payload');
589[$aid, $aname, $aav] = authIdentity(['id' => 7, 'username' => 'tim', 'avatar_url' => 'https://auth.timfalken.com/avatar/7?v=1']);
590expect($aid === 'auth:7' && $aname === 'tim' && $aav === 'https://auth.timfalken.com/avatar/7?v=1', 'authIdentity includes avatar_url');
591expect(localTestFriends('local:test_user_1')[0]['id'] === 'local:test_user_2', 'local test_user_1 is friends with test_user_2');
592expect(localTestFriends('local:test_user_2')[0]['id'] === 'local:test_user_1', 'and the other way around');
593expect(localTestFriends('auth:7') === [], 'real accounts have no local test friends');
594
595$lbDir = $tmp . '/leaderboard';
596mkdir($lbDir, 0775, true);
597$lb = Store::open($lbDir);
598for ($i = 1; $i <= 12; $i++) {
599 $uid = 'auth:' . (1000 + $i);
600 $lb->touchProfile($uid, 'Player ' . sprintf('%02d', $i), 'https://auth.timfalken.com/avatar/' . (1000 + $i));
601 $lb->awardPoints($uid, $i * 10, 'lb-' . $i, 'solo');
602}
603// nameless profile still appears, fallback name from the id
604$lb->awardPoints('auth:1099', 5, 'lb-nameless', 'solo');
605$top = $lb->topPlayers(10, 'auth:1012');
606expect(count($top) === 10, 'global list is capped at 10 (got ' . count($top) . ')');
607expect($top[0]['id'] === 'auth:1012' && $top[0]['points'] === 120 && $top[0]['rank'] === 1, 'highest score is first');
608expect($top[0]['you'] === true, 'current player is flagged when in the top 10');
609expect($top[0]['name'] === 'Player 12', 'name is stored on the profile');
610expect($top[0]['avatar'] === 'https://auth.timfalken.com/avatar/1012', 'avatar is stored on the profile');
611expect($top[9]['id'] === 'auth:1003' && $top[9]['points'] === 30 && $top[9]['you'] === false, '10th is Player 03 with 30 points');
612$ids = array_column($top, 'id');
613expect(!in_array('auth:1002', $ids, true) && !in_array('auth:1099', $ids, true), '11th and nameless (5 pts) stay off the top 10');
614$below = $lb->topPlayers(10, 'auth:1001');
615expect($below[0]['you'] === false && !in_array(true, array_column($below, 'you'), true), 'viewer outside the top 10 is not flagged');
616
617// ties: same points, then name, then id
618$lb->touchProfile('auth:2001', 'Cara', null);
619$lb->touchProfile('auth:2002', 'Ada', null);
620$lb->awardPoints('auth:2001', 7, 'tie-c', 'solo');
621$lb->awardPoints('auth:2002', 7, 'tie-a', 'solo');
622$tie = $lb->topPlayers(50);
623$cara = null; $ada = null;
624foreach ($tie as $row) {
625 if ($row['id'] === 'auth:2001') { $cara = $row; }
626 if ($row['id'] === 'auth:2002') { $ada = $row; }
627}
628expect($ada && $cara && $ada['points'] === 7 && $cara['points'] === 7, 'tied players both listed');
629expect($ada['rank'] < $cara['rank'], 'tie broken by name (Ada before Cara)');
630
631$friends = [
632 ['id' => 'auth:1012', 'name' => 'From API', 'avatar' => 'https://auth.timfalken.com/avatar/from-api'],
633 ['id' => 'auth:1005', 'name' => 'Player 05', 'avatar' => null],
634 ['id' => 'auth:3001', 'name' => 'Never Played', 'avatar' => 'https://auth.timfalken.com/avatar/3001'],
635];
636$fl = $lb->friendsLeaderboard($friends, 10, 'auth:1099');
637expect(count($fl) === 3, 'friends tab lists only the friend list (got ' . count($fl) . ')');
638expect($fl[0]['id'] === 'auth:1012' && $fl[0]['points'] === 120 && $fl[0]['name'] === 'Player 12', 'friend with a profile uses stored name and points');
639expect($fl[1]['id'] === 'auth:1005' && $fl[1]['points'] === 50, 'second friend by points');
640expect($fl[2]['id'] === 'auth:3001' && $fl[2]['points'] === 0 && $fl[2]['name'] === 'Never Played', 'friend without a Meteors profile is shown with 0 points');
641expect($fl[2]['avatar'] === 'https://auth.timfalken.com/avatar/3001', 'avatar from the auth friends list');
642expect($fl[0]['you'] === false, 'you are not flagged on the friends list unless you are on it');
643expect($lb->friendsLeaderboard([], 10, 'auth:1012') === [], 'empty friend list → empty board');
644
645$apiSrc = (string) file_get_contents(dirname(__DIR__) . '/api.php');
646expect(strpos($apiSrc, "action === 'leaderboard'") !== false, 'api.php has a leaderboard action');
647expect(strpos($apiSrc, "authRequest('/api/friends'") !== false, 'friends tab uses GET /api/friends on auth.timfalken.com');
648
568echo "\nConfig helpers\n";
649echo "\nConfig helpers\n";
569
650
570
651
src/avatar.js added +114 −0
@@ -0,0 +1,114 @@
1 'use strict';
2
3 /**
4 * Player avatars, same idea as Allianties: a coloured initials circle,
5 * with the auth profile picture on top when it loads. A failed picture
6 * is dropped; the initials stay.
7 */
8 var Avatar = {
9 failed: {},
10 loaded: {},
11
12 initials: function (name)
13 {
14 if (!name) { return '?'; }
15 var parts = String(name).trim().split(/[\s._-]+/).filter(function (s) { return s.length > 0; });
16 if (!parts.length) { return '?'; }
17 var first = Array.from(parts[0]);
18 var s = first[0];
19 if (parts.length > 1) { s += Array.from(parts[parts.length - 1])[0]; }
20 else if (first.length > 1 && /[a-z]/i.test(first[1])) { s += first[1]; }
21 return s.toUpperCase();
22 },
23
24 usableUrl: function (url)
25 {
26 if (typeof url !== 'string') { return null; }
27 url = url.trim();
28 if (!url) { return null; }
29 if (!/^(https?:\/\/|data:image\/|\/|\.{0,2}\/?[\w-])/i.test(url)) { return null; }
30 if (/^(javascript|vbscript):/i.test(url)) { return null; }
31 if (Avatar.failed[url]) { return null; }
32 return url;
33 },
34
35 colorFor: function (id)
36 {
37 var palette = ['#e85d5d', '#4fa3e8', '#5dd39e', '#e8c547', '#b07ce8', '#e8873a', '#3ad1d1', '#e86fb8'];
38 var h = 0;
39 String(id || '').split('').forEach(function (c) { h = (h * 31 + c.charCodeAt(0)) >>> 0; });
40 return palette[h % palette.length];
41 },
42
43 textColor: function (hex)
44 {
45 var m = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(String(hex || ''));
46 if (!m) { return '#fff'; }
47 var v = m[1];
48 if (v.length === 3) { v = v[0] + v[0] + v[1] + v[1] + v[2] + v[2]; }
49 var r = parseInt(v.slice(0, 2), 16), g = parseInt(v.slice(2, 4), 16), b = parseInt(v.slice(4, 6), 16);
50 var lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
51 return lum > 0.6 ? '#111' : '#fff';
52 },
53
54 piece: function (player, opts)
55 {
56 opts = opts || {};
57 var doc = opts.doc || document;
58 var color = player.color || Avatar.colorFor(player.id || player.name);
59 var el = doc.createElement('span');
60 el.className = 'player-avatar' + (player.alive === false ? ' dead' : '');
61 el.setAttribute('role', 'img');
62 el.setAttribute('aria-label', player.name || '?');
63 el.title = player.name || '';
64 el.style.borderColor = color;
65 el.style.backgroundColor = color;
66 el.style.color = Avatar.textColor(color);
67 if (opts.size)
68 {
69 var size = opts.size;
70 el.style.width = size + 'px';
71 el.style.height = size + 'px';
72 el.style.fontSize = Math.max(10, Math.round(size * 0.4)) + 'px';
73 }
74 var txt = doc.createElement('span');
75 txt.className = 'player-avatar-initials';
76 txt.textContent = Avatar.initials(player.name);
77 el.appendChild(txt);
78 var url = Avatar.usableUrl(player.avatar);
79 if (url)
80 {
81 var img = doc.createElement('img');
82 img.alt = '';
83 img.className = 'player-avatar-img';
84 img.decoding = 'async';
85 img.referrerPolicy = 'no-referrer';
86 img.addEventListener('error', function ()
87 {
88 Avatar.failed[url] = true;
89 el.classList.remove('has-img');
90 if (img.parentNode) { img.parentNode.removeChild(img); }
91 });
92 img.addEventListener('load', function ()
93 {
94 if (!img.naturalWidth)
95 {
96 Avatar.failed[url] = true;
97 if (img.parentNode) { img.parentNode.removeChild(img); }
98 return;
99 }
100 Avatar.loaded[url] = true;
101 el.classList.add('has-img');
102 });
103 if (Avatar.loaded[url]) { el.classList.add('has-img'); }
104 img.src = url;
105 el.appendChild(img);
106 }
107 return el;
108 }
109 };
110
111 if (typeof module !== 'undefined' && module.exports)
112 { module.exports = Avatar; }
113 else if (typeof globalThis !== 'undefined')
114 { globalThis.Avatar = Avatar; }
@@ -0,0 +1,114 @@
1'use strict';
2
3/**
4 * Player avatars, same idea as Allianties: a coloured initials circle,
5 * with the auth profile picture on top when it loads. A failed picture
6 * is dropped; the initials stay.
7 */
8var Avatar = {
9 failed: {},
10 loaded: {},
11
12 initials: function (name)
13 {
14 if (!name) { return '?'; }
15 var parts = String(name).trim().split(/[\s._-]+/).filter(function (s) { return s.length > 0; });
16 if (!parts.length) { return '?'; }
17 var first = Array.from(parts[0]);
18 var s = first[0];
19 if (parts.length > 1) { s += Array.from(parts[parts.length - 1])[0]; }
20 else if (first.length > 1 && /[a-z]/i.test(first[1])) { s += first[1]; }
21 return s.toUpperCase();
22 },
23
24 usableUrl: function (url)
25 {
26 if (typeof url !== 'string') { return null; }
27 url = url.trim();
28 if (!url) { return null; }
29 if (!/^(https?:\/\/|data:image\/|\/|\.{0,2}\/?[\w-])/i.test(url)) { return null; }
30 if (/^(javascript|vbscript):/i.test(url)) { return null; }
31 if (Avatar.failed[url]) { return null; }
32 return url;
33 },
34
35 colorFor: function (id)
36 {
37 var palette = ['#e85d5d', '#4fa3e8', '#5dd39e', '#e8c547', '#b07ce8', '#e8873a', '#3ad1d1', '#e86fb8'];
38 var h = 0;
39 String(id || '').split('').forEach(function (c) { h = (h * 31 + c.charCodeAt(0)) >>> 0; });
40 return palette[h % palette.length];
41 },
42
43 textColor: function (hex)
44 {
45 var m = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(String(hex || ''));
46 if (!m) { return '#fff'; }
47 var v = m[1];
48 if (v.length === 3) { v = v[0] + v[0] + v[1] + v[1] + v[2] + v[2]; }
49 var r = parseInt(v.slice(0, 2), 16), g = parseInt(v.slice(2, 4), 16), b = parseInt(v.slice(4, 6), 16);
50 var lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
51 return lum > 0.6 ? '#111' : '#fff';
52 },
53
54 piece: function (player, opts)
55 {
56 opts = opts || {};
57 var doc = opts.doc || document;
58 var color = player.color || Avatar.colorFor(player.id || player.name);
59 var el = doc.createElement('span');
60 el.className = 'player-avatar' + (player.alive === false ? ' dead' : '');
61 el.setAttribute('role', 'img');
62 el.setAttribute('aria-label', player.name || '?');
63 el.title = player.name || '';
64 el.style.borderColor = color;
65 el.style.backgroundColor = color;
66 el.style.color = Avatar.textColor(color);
67 if (opts.size)
68 {
69 var size = opts.size;
70 el.style.width = size + 'px';
71 el.style.height = size + 'px';
72 el.style.fontSize = Math.max(10, Math.round(size * 0.4)) + 'px';
73 }
74 var txt = doc.createElement('span');
75 txt.className = 'player-avatar-initials';
76 txt.textContent = Avatar.initials(player.name);
77 el.appendChild(txt);
78 var url = Avatar.usableUrl(player.avatar);
79 if (url)
80 {
81 var img = doc.createElement('img');
82 img.alt = '';
83 img.className = 'player-avatar-img';
84 img.decoding = 'async';
85 img.referrerPolicy = 'no-referrer';
86 img.addEventListener('error', function ()
87 {
88 Avatar.failed[url] = true;
89 el.classList.remove('has-img');
90 if (img.parentNode) { img.parentNode.removeChild(img); }
91 });
92 img.addEventListener('load', function ()
93 {
94 if (!img.naturalWidth)
95 {
96 Avatar.failed[url] = true;
97 if (img.parentNode) { img.parentNode.removeChild(img); }
98 return;
99 }
100 Avatar.loaded[url] = true;
101 el.classList.add('has-img');
102 });
103 if (Avatar.loaded[url]) { el.classList.add('has-img'); }
104 img.src = url;
105 el.appendChild(img);
106 }
107 return el;
108 }
109};
110
111if (typeof module !== 'undefined' && module.exports)
112{ module.exports = Avatar; }
113else if (typeof globalThis !== 'undefined')
114{ globalThis.Avatar = Avatar; }
src/build.sh +1 −0
@@ -27,6 +27,7 @@ FILES=(
27 27 "$SRC_DIR/reward.js"
28 28 "$SRC_DIR/designer.js"
29 29 "$SRC_DIR/loginPrompt.js"
30 "$SRC_DIR/avatar.js"
30 31 "$SRC_DIR/main.js"
31 32 )
32 33
@@ -27,6 +27,7 @@ FILES=(
27 "$SRC_DIR/reward.js"
27 "$SRC_DIR/reward.js"
28 "$SRC_DIR/designer.js"
28 "$SRC_DIR/designer.js"
29 "$SRC_DIR/loginPrompt.js"
29 "$SRC_DIR/loginPrompt.js"
30 "$SRC_DIR/avatar.js"
30 "$SRC_DIR/main.js"
31 "$SRC_DIR/main.js"
31)
32)
32
33
src/main.js +157 −0
@@ -124,6 +124,7 @@ window.onload = function ()
124 124 { refreshAllUi(); });
125 125 }
126 126 bindOnlineUi();
127 bindLeaderboard();
127 128 bindOfflineUi();
128 129 bindPlanetSelect();
129 130 restoreSelectedPlanet();
@@ -2859,6 +2860,160 @@ function applyProfileLocale ()
2859 2860 { Online.setLocale(I18n.locale); }
2860 2861 }
2861 2862
2863 /* ---------- t1247 leaderboard -------------------------------------- */
2864
2865 function bindLeaderboard ()
2866 {
2867 var btn = document.getElementById('btn-leaderboard');
2868 if (btn)
2869 { btn.addEventListener('click', function () { openLeaderboard(); }); }
2870 var back = document.getElementById('btn-lb-back');
2871 if (back)
2872 { back.addEventListener('click', closeLeaderboard); }
2873 var globalTab = document.getElementById('lb-tab-global');
2874 var friendsTab = document.getElementById('lb-tab-friends');
2875 if (globalTab)
2876 { globalTab.addEventListener('click', function () { setLeaderboardTab('global'); }); }
2877 if (friendsTab)
2878 { friendsTab.addEventListener('click', function () { setLeaderboardTab('friends'); }); }
2879 }
2880
2881 function openLeaderboard (tab)
2882 {
2883 hideEl('menu');
2884 hideEl('online-panel');
2885 hideEl('planet-select');
2886 hideEl('login-prompt');
2887 app.mode = 'leaderboard';
2888 app.leaderboardTab = tab || app.leaderboardTab || 'global';
2889 showEl('leaderboard');
2890 setLeaderboardTab(app.leaderboardTab);
2891 }
2892
2893 function closeLeaderboard ()
2894 {
2895 hideEl('leaderboard');
2896 app.mode = 'menu';
2897 showEl('menu');
2898 }
2899
2900 function setLeaderboardTab (tab)
2901 {
2902 tab = tab === 'friends' ? 'friends' : 'global';
2903 app.leaderboardTab = tab;
2904 var globalTab = document.getElementById('lb-tab-global');
2905 var friendsTab = document.getElementById('lb-tab-friends');
2906 if (globalTab)
2907 { globalTab.setAttribute('aria-selected', tab === 'global' ? 'true' : 'false'); }
2908 if (friendsTab)
2909 { friendsTab.setAttribute('aria-selected', tab === 'friends' ? 'true' : 'false'); }
2910 loadLeaderboard(tab);
2911 }
2912
2913 function loadLeaderboard (tab)
2914 {
2915 tab = tab || app.leaderboardTab || 'global';
2916 var login = document.getElementById('lb-login');
2917 var list = document.getElementById('lb-list');
2918 var empty = document.getElementById('lb-empty');
2919 var err = document.getElementById('lb-error');
2920 if (err)
2921 { err.hidden = true; err.textContent = ''; }
2922 if (empty)
2923 { empty.hidden = true; }
2924 if (list)
2925 { list.innerHTML = ''; }
2926 var loggedIn = typeof Online !== 'undefined' && !!Online.me;
2927 if (tab === 'friends' && !loggedIn)
2928 {
2929 if (login)
2930 { login.hidden = false; }
2931 return;
2932 }
2933 if (login)
2934 { login.hidden = true; }
2935 if (typeof Online === 'undefined' || !Online.leaderboard)
2936 {
2937 showLeaderboardError((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
2938 return;
2939 }
2940 Online.leaderboard(tab).then(function (data)
2941 {
2942 if (app.mode !== 'leaderboard' || app.leaderboardTab !== tab)
2943 { return; }
2944 if (!data || data.ok === false)
2945 {
2946 var msg = (data && data.error)
2947 ? ((typeof I18n !== 'undefined') ? I18n.error(data.error) : data.error)
2948 : ((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
2949 showLeaderboardError(msg);
2950 return;
2951 }
2952 if (tab === 'friends' && data.login_required)
2953 {
2954 if (login)
2955 { login.hidden = false; }
2956 return;
2957 }
2958 renderLeaderboard(data.players || [], tab);
2959 });
2960 }
2961
2962 function showLeaderboardError (text)
2963 {
2964 var err = document.getElementById('lb-error');
2965 if (!err)
2966 { return; }
2967 err.hidden = !text;
2968 err.textContent = text || '';
2969 }
2970
2971 function renderLeaderboard (players, tab)
2972 {
2973 var list = document.getElementById('lb-list');
2974 var empty = document.getElementById('lb-empty');
2975 var login = document.getElementById('lb-login');
2976 if (login)
2977 { login.hidden = true; }
2978 if (!list)
2979 { return; }
2980 list.innerHTML = '';
2981 if (!players || !players.length)
2982 {
2983 if (empty)
2984 { empty.hidden = false; }
2985 return;
2986 }
2987 if (empty)
2988 { empty.hidden = true; }
2989 var meId = (typeof Online !== 'undefined' && Online.me) ? Online.me.id : null;
2990 for (var i = 0; i < players.length; i++)
2991 {
2992 var p = players[i];
2993 var li = document.createElement('li');
2994 var you = !!(p.you || (meId && p.id === meId));
2995 li.className = 'lb-row' + (you ? ' you' : '');
2996 var rank = document.createElement('span');
2997 rank.className = 'lb-rank';
2998 rank.textContent = String(p.rank || (i + 1));
2999 li.appendChild(rank);
3000 if (typeof Avatar !== 'undefined' && Avatar.piece)
3001 { li.appendChild(Avatar.piece({ id: p.id, name: p.name, avatar: p.avatar }, { size: 40 })); }
3002 var name = document.createElement('span');
3003 name.className = 'lb-name';
3004 name.textContent = p.name || '';
3005 li.appendChild(name);
3006 var pts = document.createElement('span');
3007 pts.className = 'lb-points';
3008 var n = p.points || 0;
3009 pts.textContent = (typeof I18n !== 'undefined')
3010 ? I18n.t('leaderboard.points', { n: n }, n + ' points')
3011 : (n + ' points');
3012 li.appendChild(pts);
3013 list.appendChild(li);
3014 }
3015 }
3016
2862 3017 function refreshAllUi ()
2863 3018 {
2864 3019 if (typeof I18n !== 'undefined')
@@ -2893,4 +3048,6 @@ function refreshAllUi ()
2893 3048 if (typeof refreshOfflineHud === 'function')
2894 3049 { refreshOfflineHud(); }
2895 3050 }
3051 if (app && app.mode === 'leaderboard' && typeof loadLeaderboard === 'function')
3052 { loadLeaderboard(app.leaderboardTab); }
2896 3053 }
@@ -124,6 +124,7 @@ window.onload = function ()
124 { refreshAllUi(); });
124 { refreshAllUi(); });
125 }
125 }
126 bindOnlineUi();
126 bindOnlineUi();
127 bindLeaderboard();
127 bindOfflineUi();
128 bindOfflineUi();
128 bindPlanetSelect();
129 bindPlanetSelect();
129 restoreSelectedPlanet();
130 restoreSelectedPlanet();
@@ -2859,6 +2860,160 @@ function applyProfileLocale ()
2859 { Online.setLocale(I18n.locale); }
2860 { Online.setLocale(I18n.locale); }
2860}
2861}
2861
2862
2863/* ---------- t1247 leaderboard -------------------------------------- */
2864
2865function bindLeaderboard ()
2866{
2867 var btn = document.getElementById('btn-leaderboard');
2868 if (btn)
2869 { btn.addEventListener('click', function () { openLeaderboard(); }); }
2870 var back = document.getElementById('btn-lb-back');
2871 if (back)
2872 { back.addEventListener('click', closeLeaderboard); }
2873 var globalTab = document.getElementById('lb-tab-global');
2874 var friendsTab = document.getElementById('lb-tab-friends');
2875 if (globalTab)
2876 { globalTab.addEventListener('click', function () { setLeaderboardTab('global'); }); }
2877 if (friendsTab)
2878 { friendsTab.addEventListener('click', function () { setLeaderboardTab('friends'); }); }
2879}
2880
2881function openLeaderboard (tab)
2882{
2883 hideEl('menu');
2884 hideEl('online-panel');
2885 hideEl('planet-select');
2886 hideEl('login-prompt');
2887 app.mode = 'leaderboard';
2888 app.leaderboardTab = tab || app.leaderboardTab || 'global';
2889 showEl('leaderboard');
2890 setLeaderboardTab(app.leaderboardTab);
2891}
2892
2893function closeLeaderboard ()
2894{
2895 hideEl('leaderboard');
2896 app.mode = 'menu';
2897 showEl('menu');
2898}
2899
2900function setLeaderboardTab (tab)
2901{
2902 tab = tab === 'friends' ? 'friends' : 'global';
2903 app.leaderboardTab = tab;
2904 var globalTab = document.getElementById('lb-tab-global');
2905 var friendsTab = document.getElementById('lb-tab-friends');
2906 if (globalTab)
2907 { globalTab.setAttribute('aria-selected', tab === 'global' ? 'true' : 'false'); }
2908 if (friendsTab)
2909 { friendsTab.setAttribute('aria-selected', tab === 'friends' ? 'true' : 'false'); }
2910 loadLeaderboard(tab);
2911}
2912
2913function loadLeaderboard (tab)
2914{
2915 tab = tab || app.leaderboardTab || 'global';
2916 var login = document.getElementById('lb-login');
2917 var list = document.getElementById('lb-list');
2918 var empty = document.getElementById('lb-empty');
2919 var err = document.getElementById('lb-error');
2920 if (err)
2921 { err.hidden = true; err.textContent = ''; }
2922 if (empty)
2923 { empty.hidden = true; }
2924 if (list)
2925 { list.innerHTML = ''; }
2926 var loggedIn = typeof Online !== 'undefined' && !!Online.me;
2927 if (tab === 'friends' && !loggedIn)
2928 {
2929 if (login)
2930 { login.hidden = false; }
2931 return;
2932 }
2933 if (login)
2934 { login.hidden = true; }
2935 if (typeof Online === 'undefined' || !Online.leaderboard)
2936 {
2937 showLeaderboardError((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
2938 return;
2939 }
2940 Online.leaderboard(tab).then(function (data)
2941 {
2942 if (app.mode !== 'leaderboard' || app.leaderboardTab !== tab)
2943 { return; }
2944 if (!data || data.ok === false)
2945 {
2946 var msg = (data && data.error)
2947 ? ((typeof I18n !== 'undefined') ? I18n.error(data.error) : data.error)
2948 : ((typeof I18n !== 'undefined') ? I18n.t('leaderboard.loadError') : 'The leaderboard could not be loaded.');
2949 showLeaderboardError(msg);
2950 return;
2951 }
2952 if (tab === 'friends' && data.login_required)
2953 {
2954 if (login)
2955 { login.hidden = false; }
2956 return;
2957 }
2958 renderLeaderboard(data.players || [], tab);
2959 });
2960}
2961
2962function showLeaderboardError (text)
2963{
2964 var err = document.getElementById('lb-error');
2965 if (!err)
2966 { return; }
2967 err.hidden = !text;
2968 err.textContent = text || '';
2969}
2970
2971function renderLeaderboard (players, tab)
2972{
2973 var list = document.getElementById('lb-list');
2974 var empty = document.getElementById('lb-empty');
2975 var login = document.getElementById('lb-login');
2976 if (login)
2977 { login.hidden = true; }
2978 if (!list)
2979 { return; }
2980 list.innerHTML = '';
2981 if (!players || !players.length)
2982 {
2983 if (empty)
2984 { empty.hidden = false; }
2985 return;
2986 }
2987 if (empty)
2988 { empty.hidden = true; }
2989 var meId = (typeof Online !== 'undefined' && Online.me) ? Online.me.id : null;
2990 for (var i = 0; i < players.length; i++)
2991 {
2992 var p = players[i];
2993 var li = document.createElement('li');
2994 var you = !!(p.you || (meId && p.id === meId));
2995 li.className = 'lb-row' + (you ? ' you' : '');
2996 var rank = document.createElement('span');
2997 rank.className = 'lb-rank';
2998 rank.textContent = String(p.rank || (i + 1));
2999 li.appendChild(rank);
3000 if (typeof Avatar !== 'undefined' && Avatar.piece)
3001 { li.appendChild(Avatar.piece({ id: p.id, name: p.name, avatar: p.avatar }, { size: 40 })); }
3002 var name = document.createElement('span');
3003 name.className = 'lb-name';
3004 name.textContent = p.name || '';
3005 li.appendChild(name);
3006 var pts = document.createElement('span');
3007 pts.className = 'lb-points';
3008 var n = p.points || 0;
3009 pts.textContent = (typeof I18n !== 'undefined')
3010 ? I18n.t('leaderboard.points', { n: n }, n + ' points')
3011 : (n + ' points');
3012 li.appendChild(pts);
3013 list.appendChild(li);
3014 }
3015}
3016
2862function refreshAllUi ()
3017function refreshAllUi ()
2863{
3018{
2864 if (typeof I18n !== 'undefined')
3019 if (typeof I18n !== 'undefined')
@@ -2893,4 +3048,6 @@ function refreshAllUi ()
2893 if (typeof refreshOfflineHud === 'function')
3048 if (typeof refreshOfflineHud === 'function')
2894 { refreshOfflineHud(); }
3049 { refreshOfflineHud(); }
2895 }
3050 }
3051 if (app && app.mode === 'leaderboard' && typeof loadLeaderboard === 'function')
3052 { loadLeaderboard(app.leaderboardTab); }
2896}
3053}
src/online.js +32 −0
@@ -377,6 +377,38 @@ Online.loginUrl = function ()
377 377 return 'auth.php?return=online';
378 378 };
379 379
380 /** t1247: global or friends leaderboard (GET, no CSRF). */
381 Online.leaderboard = function (scope)
382 {
383 var self = this;
384 var url = 'api.php?action=leaderboard&scope=' + encodeURIComponent(scope === 'friends' ? 'friends' : 'global');
385 return fetch(url, {
386 method: 'GET',
387 credentials: 'same-origin',
388 headers: this._headers(false)
389 }).then(function (res)
390 {
391 return res.json().then(function (data)
392 {
393 data = data || {};
394 if (!res.ok && !data.error)
395 {
396 data.error = (typeof I18n !== 'undefined'
397 ? I18n.t('error.serverStatus', { status: res.status })
398 : ('De server gaf ' + res.status));
399 data.ok = false;
400 }
401 return data;
402 }, function ()
403 {
404 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.badResponse') : 'Geen geldig antwoord van de server.') };
405 });
406 }).catch(function ()
407 {
408 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.connection') : 'Geen verbinding met de server.') };
409 });
410 };
411
380 412 Online.logoutUrl = function ()
381 413 {
382 414 return 'logout.php';
@@ -377,6 +377,38 @@ Online.loginUrl = function ()
377 return 'auth.php?return=online';
377 return 'auth.php?return=online';
378};
378};
379
379
380/** t1247: global or friends leaderboard (GET, no CSRF). */
381Online.leaderboard = function (scope)
382{
383 var self = this;
384 var url = 'api.php?action=leaderboard&scope=' + encodeURIComponent(scope === 'friends' ? 'friends' : 'global');
385 return fetch(url, {
386 method: 'GET',
387 credentials: 'same-origin',
388 headers: this._headers(false)
389 }).then(function (res)
390 {
391 return res.json().then(function (data)
392 {
393 data = data || {};
394 if (!res.ok && !data.error)
395 {
396 data.error = (typeof I18n !== 'undefined'
397 ? I18n.t('error.serverStatus', { status: res.status })
398 : ('De server gaf ' + res.status));
399 data.ok = false;
400 }
401 return data;
402 }, function ()
403 {
404 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.badResponse') : 'Geen geldig antwoord van de server.') };
405 });
406 }).catch(function ()
407 {
408 return { ok: false, error: (typeof I18n !== 'undefined' ? I18n.t('error.connection') : 'Geen verbinding met de server.') };
409 });
410};
411
380Online.logoutUrl = function ()
412Online.logoutUrl = function ()
381{
413{
382 return 'logout.php';
414 return 'logout.php';
test/leaderboard.test.js added +83 −0
@@ -0,0 +1,83 @@
1 'use strict';
2
3 const { describe, it } = require('node:test');
4 const assert = require('node:assert/strict');
5 const fs = require('fs');
6 const path = require('path');
7 const Avatar = require('../src/avatar.js');
8 const catalog = require('../server/lib/i18n.json');
9
10 const root = path.join(__dirname, '..');
11 const html = fs.readFileSync(path.join(root, 'build/index.html'), 'utf8');
12 const css = fs.readFileSync(path.join(root, 'build/style.css'), 'utf8');
13 const main = fs.readFileSync(path.join(root, 'src/main.js'), 'utf8');
14 const online = fs.readFileSync(path.join(root, 'src/online.js'), 'utf8');
15 const api = fs.readFileSync(path.join(root, 'server/api.php'), 'utf8');
16 const buildSh = fs.readFileSync(path.join(root, 'src/build.sh'), 'utf8');
17
18 describe('Leaderboard wiring (t1247)', () =>
19 {
20 it('places the Leaderboard button under Play online', () =>
21 {
22 const onlineAt = html.indexOf('id="btn-online"');
23 const boardAt = html.indexOf('id="btn-leaderboard"');
24 const designerAt = html.indexOf('id="btn-designer"');
25 assert.ok(onlineAt >= 0 && boardAt > onlineAt && designerAt > boardAt, 'button order');
26 assert.match(html, /id="btn-leaderboard"[^>]*data-i18n="menu\.leaderboard"/);
27 });
28
29 it('has a two-tab leaderboard screen with login prompt for guests', () =>
30 {
31 assert.match(html, /id="leaderboard"[^>]*class="screen"/);
32 assert.match(html, /id="lb-tab-global"[^>]*data-i18n="leaderboard\.global"/);
33 assert.match(html, /id="lb-tab-friends"[^>]*data-i18n="leaderboard\.friends"/);
34 assert.match(html, /id="lb-login"/);
35 assert.match(html, /id="lb-login-link"[^>]*href="auth\.php"/);
36 assert.match(html, /id="lb-list"/);
37 assert.match(css, /#leaderboard\[hidden\]/);
38 assert.match(css, /\.lb-row\.you/);
39 assert.match(css, /\.player-avatar/);
40 });
41
42 it('loads the public API and highlights the current player', () =>
43 {
44 assert.match(online, /Online\.leaderboard\s*=\s*function/);
45 assert.match(online, /action=leaderboard/);
46 assert.match(main, /function openLeaderboard/);
47 assert.match(main, /function renderLeaderboard/);
48 assert.match(main, /p\.you \|\| \(meId && p\.id === meId\)/);
49 assert.match(main, /Avatar\.piece/);
50 assert.match(main, /tab === 'friends' && !loggedIn/);
51 assert.match(api, /action === 'leaderboard'/);
52 assert.match(api, /authRequest\('\/api\/friends'/);
53 assert.match(buildSh, /avatar\.js/);
54 });
55
56 it('translates the leaderboard in every language', () =>
57 {
58 const want = { en: 'Leaderboard', nl: 'Ranglijst', de: 'Rangliste', fr: 'Classement', es: 'Clasificación' };
59 for (const loc of catalog.localeIds)
60 {
61 const L = catalog.locales[loc];
62 assert.ok(L['menu.leaderboard'], loc);
63 assert.ok(L['leaderboard.friends'], loc);
64 assert.ok(L['leaderboard.loginPrompt'], loc);
65 assert.match(L['leaderboard.points'], /\{n\}/, loc + ' points placeholder');
66 if (want[loc])
67 { assert.equal(L['menu.leaderboard'], want[loc]); }
68 }
69 });
70 });
71
72 describe('Avatar helpers (t1247)', () =>
73 {
74 it('builds initials and rejects a javascript picture URL', () =>
75 {
76 assert.equal(Avatar.initials('Tim Falken'), 'TF');
77 assert.equal(Avatar.initials('timfa'), 'TI');
78 assert.equal(Avatar.initials(''), '?');
79 assert.equal(Avatar.usableUrl('https://auth.timfalken.com/avatar/1'), 'https://auth.timfalken.com/avatar/1');
80 assert.equal(Avatar.usableUrl('javascript:alert(1)'), null);
81 assert.equal(Avatar.usableUrl(''), null);
82 });
83 });
@@ -0,0 +1,83 @@
1'use strict';
2
3const { describe, it } = require('node:test');
4const assert = require('node:assert/strict');
5const fs = require('fs');
6const path = require('path');
7const Avatar = require('../src/avatar.js');
8const catalog = require('../server/lib/i18n.json');
9
10const root = path.join(__dirname, '..');
11const html = fs.readFileSync(path.join(root, 'build/index.html'), 'utf8');
12const css = fs.readFileSync(path.join(root, 'build/style.css'), 'utf8');
13const main = fs.readFileSync(path.join(root, 'src/main.js'), 'utf8');
14const online = fs.readFileSync(path.join(root, 'src/online.js'), 'utf8');
15const api = fs.readFileSync(path.join(root, 'server/api.php'), 'utf8');
16const buildSh = fs.readFileSync(path.join(root, 'src/build.sh'), 'utf8');
17
18describe('Leaderboard wiring (t1247)', () =>
19{
20 it('places the Leaderboard button under Play online', () =>
21 {
22 const onlineAt = html.indexOf('id="btn-online"');
23 const boardAt = html.indexOf('id="btn-leaderboard"');
24 const designerAt = html.indexOf('id="btn-designer"');
25 assert.ok(onlineAt >= 0 && boardAt > onlineAt && designerAt > boardAt, 'button order');
26 assert.match(html, /id="btn-leaderboard"[^>]*data-i18n="menu\.leaderboard"/);
27 });
28
29 it('has a two-tab leaderboard screen with login prompt for guests', () =>
30 {
31 assert.match(html, /id="leaderboard"[^>]*class="screen"/);
32 assert.match(html, /id="lb-tab-global"[^>]*data-i18n="leaderboard\.global"/);
33 assert.match(html, /id="lb-tab-friends"[^>]*data-i18n="leaderboard\.friends"/);
34 assert.match(html, /id="lb-login"/);
35 assert.match(html, /id="lb-login-link"[^>]*href="auth\.php"/);
36 assert.match(html, /id="lb-list"/);
37 assert.match(css, /#leaderboard\[hidden\]/);
38 assert.match(css, /\.lb-row\.you/);
39 assert.match(css, /\.player-avatar/);
40 });
41
42 it('loads the public API and highlights the current player', () =>
43 {
44 assert.match(online, /Online\.leaderboard\s*=\s*function/);
45 assert.match(online, /action=leaderboard/);
46 assert.match(main, /function openLeaderboard/);
47 assert.match(main, /function renderLeaderboard/);
48 assert.match(main, /p\.you \|\| \(meId && p\.id === meId\)/);
49 assert.match(main, /Avatar\.piece/);
50 assert.match(main, /tab === 'friends' && !loggedIn/);
51 assert.match(api, /action === 'leaderboard'/);
52 assert.match(api, /authRequest\('\/api\/friends'/);
53 assert.match(buildSh, /avatar\.js/);
54 });
55
56 it('translates the leaderboard in every language', () =>
57 {
58 const want = { en: 'Leaderboard', nl: 'Ranglijst', de: 'Rangliste', fr: 'Classement', es: 'Clasificación' };
59 for (const loc of catalog.localeIds)
60 {
61 const L = catalog.locales[loc];
62 assert.ok(L['menu.leaderboard'], loc);
63 assert.ok(L['leaderboard.friends'], loc);
64 assert.ok(L['leaderboard.loginPrompt'], loc);
65 assert.match(L['leaderboard.points'], /\{n\}/, loc + ' points placeholder');
66 if (want[loc])
67 { assert.equal(L['menu.leaderboard'], want[loc]); }
68 }
69 });
70});
71
72describe('Avatar helpers (t1247)', () =>
73{
74 it('builds initials and rejects a javascript picture URL', () =>
75 {
76 assert.equal(Avatar.initials('Tim Falken'), 'TF');
77 assert.equal(Avatar.initials('timfa'), 'TI');
78 assert.equal(Avatar.initials(''), '?');
79 assert.equal(Avatar.usableUrl('https://auth.timfalken.com/avatar/1'), 'https://auth.timfalken.com/avatar/1');
80 assert.equal(Avatar.usableUrl('javascript:alert(1)'), null);
81 assert.equal(Avatar.usableUrl(''), null);
82 });
83});
test/t1247-leaderboard-playwright.py added +164 −0
@@ -0,0 +1,164 @@
1 #!/usr/bin/env python3
2 """t1247: leaderboard under Play online, global top 10 and friends tab.
3
4 Usage: python3 test/t1247-leaderboard-playwright.py URL TAG
5 Logged-out checks run against the live site too. With a local PHP
6 server (auth.php?test=1) the friends tab and highlight are also checked.
7 """
8 import sys
9 from pathlib import Path
10 from playwright.sync_api import sync_playwright
11
12 URL = sys.argv[1] if len(sys.argv) > 1 else "https://projects.timfalken.com/meteors/"
13 if not URL.endswith("/"):
14 URL += "/"
15 TAG = sys.argv[2] if len(sys.argv) > 2 else "live"
16 LOCAL = "127.0.0.1" in URL or "localhost" in URL
17 SHOTS = Path("/workspace/meteors-shots")
18 SHOTS.mkdir(parents=True, exist_ok=True)
19 fails = []
20
21 def check(c, m):
22 print(("OK " if c else "FAIL ") + m)
23 if not c:
24 fails.append(m)
25
26 def shot(page, name):
27 page.screenshot(path=str(SHOTS / f"t1247-{TAG}-{name}.png"))
28
29 def skip_login_prompt(ctx):
30 ctx.add_init_script("try { sessionStorage.setItem('meteors-login-prompt', '1'); } catch (e) {}")
31
32 def ready(page):
33 page.wait_for_function("() => window.app && (app.loginPromptReady === true || document.getElementById('btn-leaderboard'))", timeout=20000)
34
35 def guest(br, name, vp, mobile):
36 ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
37 skip_login_prompt(ctx)
38 page = ctx.new_page()
39 errs = []
40 page.on("pageerror", lambda e: errs.append(str(e)))
41 page.goto(URL + "index.html", wait_until="networkidle")
42 ready(page)
43 page.wait_for_timeout(200)
44 order = page.evaluate("""() => {
45 const ids = ['btn-play','btn-survival','btn-online','btn-leaderboard'];
46 return ids.map((id) => {
47 const e = document.getElementById(id);
48 if (!e) return null;
49 const r = e.getBoundingClientRect();
50 return { id, y: r.top, h: r.height, w: r.width, right: r.right };
51 });
52 }""")
53 online, board = order[2], order[3]
54 check(online and board and board["y"] > online["y"] - 1, f"{name}: Leaderboard sits under Play online ({order})")
55 check(board and board["h"] >= 40, f"{name}: Leaderboard button is at least 40px tall ({board})")
56 if mobile:
57 page.locator("#btn-leaderboard").tap()
58 else:
59 page.locator("#btn-leaderboard").click()
60 page.wait_for_selector("#leaderboard:not([hidden])", timeout=8000)
61 check(page.evaluate("() => app.mode === 'leaderboard'"), f"{name}: opens the leaderboard screen")
62 selected = page.locator("#lb-tab-global").get_attribute("aria-selected")
63 check(selected == "true", f"{name}: starts on the Top 10 tab ({selected!r})")
64 page.wait_for_function("""() => {
65 const list = document.getElementById('lb-list');
66 const empty = document.getElementById('lb-empty');
67 const err = document.getElementById('lb-error');
68 return (list && list.children.length > 0) || (empty && !empty.hidden) || (err && !err.hidden);
69 }""", timeout=10000)
70 check(page.evaluate("() => document.getElementById('lb-login').hidden"), f"{name}: guests see the global list, not a login wall")
71 rows = page.evaluate("() => [...document.querySelectorAll('#lb-list .lb-row')].map(r => ({ rank: r.querySelector('.lb-rank')?.textContent, name: r.querySelector('.lb-name')?.textContent, pts: r.querySelector('.lb-points')?.textContent, you: r.classList.contains('you'), hasAvatar: !!r.querySelector('.player-avatar') }))")
72 if rows:
73 check(all(r["hasAvatar"] and r["name"] for r in rows), f"{name}: each row has an avatar and a name {rows[:2]}")
74 check(len(rows) <= 10, f"{name}: at most 10 rows ({len(rows)})")
75 ranks = [int(r["rank"]) for r in rows]
76 check(ranks == list(range(1, len(rows) + 1)), f"{name}: ranks are 1..n ({ranks})")
77 else:
78 check(page.evaluate("() => !document.getElementById('lb-empty').hidden"), f"{name}: empty state when there are no scores")
79 # Fits the viewport
80 overflow = page.evaluate("""() => {
81 const r = document.getElementById('leaderboard').getBoundingClientRect();
82 return { w: innerWidth, h: innerHeight, right: r.right, tabs: document.getElementById('lb-tabs').getBoundingClientRect().width };
83 }""")
84 check(overflow["tabs"] <= overflow["w"] + 1, f"{name}: tabs fit the width {overflow}")
85 shot(page, f"{name}-global")
86
87 if mobile:
88 page.locator("#lb-tab-friends").tap()
89 else:
90 page.locator("#lb-tab-friends").click()
91 page.wait_for_timeout(400)
92 check(page.locator("#lb-tab-friends").get_attribute("aria-selected") == "true", f"{name}: Friends tab selected")
93 check(page.evaluate("() => !document.getElementById('lb-login').hidden"), f"{name}: guests are asked to log in on the Friends tab")
94 href = page.locator("#lb-login-link").get_attribute("href")
95 check(href == "auth.php", f"{name}: friends login uses auth.php ({href!r})")
96 shot(page, f"{name}-friends-guest")
97
98 # Back to the main menu
99 if mobile:
100 page.locator("#btn-lb-back").tap()
101 else:
102 page.locator("#btn-lb-back").click()
103 page.wait_for_function("() => !document.getElementById('menu').hidden && app.mode === 'menu'", timeout=5000)
104 check(not errs, f"{name}: no page errors {errs[:2]}")
105 ctx.close()
106
107 def logged_in(br, name, vp, mobile):
108 ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
109 skip_login_prompt(ctx)
110 page = ctx.new_page()
111 errs = []
112 page.on("pageerror", lambda e: errs.append(str(e)))
113 page.goto(URL + "auth.php?test=1&next=index.html", wait_until="domcontentloaded")
114 page.goto(URL + "index.html", wait_until="networkidle")
115 page.wait_for_function("() => typeof Online !== 'undefined' && Online.me", timeout=15000)
116 # Earn a few points so this player can appear (and be highlighted) on the global list.
117 page.evaluate("""async () => {
118 const begin = await Online.playBegin('solo');
119 if (begin && begin.token) await Online.playFinish(begin.token, 15);
120 }""")
121 page.wait_for_timeout(400)
122 if mobile:
123 page.locator("#btn-leaderboard").tap()
124 else:
125 page.locator("#btn-leaderboard").click()
126 page.wait_for_selector("#leaderboard:not([hidden])")
127 page.wait_for_function("() => document.querySelectorAll('#lb-list .lb-row').length > 0 || !document.getElementById('lb-empty').hidden", timeout=10000)
128 me = page.evaluate("""() => {
129 const row = document.querySelector('#lb-list .lb-row.you');
130 return row ? { name: row.querySelector('.lb-name')?.textContent, hasYou: true } : { hasYou: false, names: [...document.querySelectorAll('#lb-name, #lb-list .lb-name')].map(e => e.textContent) };
131 }""")
132 check(me.get("hasYou") and "test_user_1" in (me.get("name") or ""), f"{name}: current player is highlighted ({me})")
133 shot(page, f"{name}-global-loggedin")
134
135 if mobile:
136 page.locator("#lb-tab-friends").tap()
137 else:
138 page.locator("#lb-tab-friends").click()
139 page.wait_for_function("""() => {
140 const login = document.getElementById('lb-login');
141 const list = document.getElementById('lb-list');
142 const empty = document.getElementById('lb-empty');
143 const err = document.getElementById('lb-error');
144 return (login && login.hidden) && ((list && list.children.length > 0) || (empty && !empty.hidden) || (err && !err.hidden));
145 }""", timeout=10000)
146 check(page.evaluate("() => document.getElementById('lb-login').hidden"), f"{name}: logged-in friends tab does not ask to log in")
147 names = page.evaluate("() => [...document.querySelectorAll('#lb-list .lb-name')].map(e => e.textContent)")
148 check("test_user_2" in names, f"{name}: local friends tab lists test_user_2 ({names})")
149 shot(page, f"{name}-friends-loggedin")
150 check(not errs, f"{name}: logged-in no page errors {errs[:2]}")
151 ctx.close()
152
153 with sync_playwright() as pw:
154 br = pw.chromium.launch(args=["--use-gl=angle", "--use-angle=swiftshader"])
155 for name, vp, mobile in (("desktop", {"width": 1280, "height": 800}, False), ("mobile", {"width": 390, "height": 844}, True)):
156 guest(br, name, vp, mobile)
157 if LOCAL:
158 logged_in(br, name, vp, mobile)
159 br.close()
160
161 print("ALL OK" if not fails else f"{len(fails)} FAIL")
162 for f in fails:
163 print(" -", f)
164 sys.exit(1 if fails else 0)
@@ -0,0 +1,164 @@
1#!/usr/bin/env python3
2"""t1247: leaderboard under Play online, global top 10 and friends tab.
3
4Usage: python3 test/t1247-leaderboard-playwright.py URL TAG
5Logged-out checks run against the live site too. With a local PHP
6server (auth.php?test=1) the friends tab and highlight are also checked.
7"""
8import sys
9from pathlib import Path
10from playwright.sync_api import sync_playwright
11
12URL = sys.argv[1] if len(sys.argv) > 1 else "https://projects.timfalken.com/meteors/"
13if not URL.endswith("/"):
14 URL += "/"
15TAG = sys.argv[2] if len(sys.argv) > 2 else "live"
16LOCAL = "127.0.0.1" in URL or "localhost" in URL
17SHOTS = Path("/workspace/meteors-shots")
18SHOTS.mkdir(parents=True, exist_ok=True)
19fails = []
20
21def check(c, m):
22 print(("OK " if c else "FAIL ") + m)
23 if not c:
24 fails.append(m)
25
26def shot(page, name):
27 page.screenshot(path=str(SHOTS / f"t1247-{TAG}-{name}.png"))
28
29def skip_login_prompt(ctx):
30 ctx.add_init_script("try { sessionStorage.setItem('meteors-login-prompt', '1'); } catch (e) {}")
31
32def ready(page):
33 page.wait_for_function("() => window.app && (app.loginPromptReady === true || document.getElementById('btn-leaderboard'))", timeout=20000)
34
35def guest(br, name, vp, mobile):
36 ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
37 skip_login_prompt(ctx)
38 page = ctx.new_page()
39 errs = []
40 page.on("pageerror", lambda e: errs.append(str(e)))
41 page.goto(URL + "index.html", wait_until="networkidle")
42 ready(page)
43 page.wait_for_timeout(200)
44 order = page.evaluate("""() => {
45 const ids = ['btn-play','btn-survival','btn-online','btn-leaderboard'];
46 return ids.map((id) => {
47 const e = document.getElementById(id);
48 if (!e) return null;
49 const r = e.getBoundingClientRect();
50 return { id, y: r.top, h: r.height, w: r.width, right: r.right };
51 });
52 }""")
53 online, board = order[2], order[3]
54 check(online and board and board["y"] > online["y"] - 1, f"{name}: Leaderboard sits under Play online ({order})")
55 check(board and board["h"] >= 40, f"{name}: Leaderboard button is at least 40px tall ({board})")
56 if mobile:
57 page.locator("#btn-leaderboard").tap()
58 else:
59 page.locator("#btn-leaderboard").click()
60 page.wait_for_selector("#leaderboard:not([hidden])", timeout=8000)
61 check(page.evaluate("() => app.mode === 'leaderboard'"), f"{name}: opens the leaderboard screen")
62 selected = page.locator("#lb-tab-global").get_attribute("aria-selected")
63 check(selected == "true", f"{name}: starts on the Top 10 tab ({selected!r})")
64 page.wait_for_function("""() => {
65 const list = document.getElementById('lb-list');
66 const empty = document.getElementById('lb-empty');
67 const err = document.getElementById('lb-error');
68 return (list && list.children.length > 0) || (empty && !empty.hidden) || (err && !err.hidden);
69 }""", timeout=10000)
70 check(page.evaluate("() => document.getElementById('lb-login').hidden"), f"{name}: guests see the global list, not a login wall")
71 rows = page.evaluate("() => [...document.querySelectorAll('#lb-list .lb-row')].map(r => ({ rank: r.querySelector('.lb-rank')?.textContent, name: r.querySelector('.lb-name')?.textContent, pts: r.querySelector('.lb-points')?.textContent, you: r.classList.contains('you'), hasAvatar: !!r.querySelector('.player-avatar') }))")
72 if rows:
73 check(all(r["hasAvatar"] and r["name"] for r in rows), f"{name}: each row has an avatar and a name {rows[:2]}")
74 check(len(rows) <= 10, f"{name}: at most 10 rows ({len(rows)})")
75 ranks = [int(r["rank"]) for r in rows]
76 check(ranks == list(range(1, len(rows) + 1)), f"{name}: ranks are 1..n ({ranks})")
77 else:
78 check(page.evaluate("() => !document.getElementById('lb-empty').hidden"), f"{name}: empty state when there are no scores")
79 # Fits the viewport
80 overflow = page.evaluate("""() => {
81 const r = document.getElementById('leaderboard').getBoundingClientRect();
82 return { w: innerWidth, h: innerHeight, right: r.right, tabs: document.getElementById('lb-tabs').getBoundingClientRect().width };
83 }""")
84 check(overflow["tabs"] <= overflow["w"] + 1, f"{name}: tabs fit the width {overflow}")
85 shot(page, f"{name}-global")
86
87 if mobile:
88 page.locator("#lb-tab-friends").tap()
89 else:
90 page.locator("#lb-tab-friends").click()
91 page.wait_for_timeout(400)
92 check(page.locator("#lb-tab-friends").get_attribute("aria-selected") == "true", f"{name}: Friends tab selected")
93 check(page.evaluate("() => !document.getElementById('lb-login').hidden"), f"{name}: guests are asked to log in on the Friends tab")
94 href = page.locator("#lb-login-link").get_attribute("href")
95 check(href == "auth.php", f"{name}: friends login uses auth.php ({href!r})")
96 shot(page, f"{name}-friends-guest")
97
98 # Back to the main menu
99 if mobile:
100 page.locator("#btn-lb-back").tap()
101 else:
102 page.locator("#btn-lb-back").click()
103 page.wait_for_function("() => !document.getElementById('menu').hidden && app.mode === 'menu'", timeout=5000)
104 check(not errs, f"{name}: no page errors {errs[:2]}")
105 ctx.close()
106
107def logged_in(br, name, vp, mobile):
108 ctx = br.new_context(viewport=vp, is_mobile=mobile, has_touch=mobile, device_scale_factor=2 if mobile else 1)
109 skip_login_prompt(ctx)
110 page = ctx.new_page()
111 errs = []
112 page.on("pageerror", lambda e: errs.append(str(e)))
113 page.goto(URL + "auth.php?test=1&next=index.html", wait_until="domcontentloaded")
114 page.goto(URL + "index.html", wait_until="networkidle")
115 page.wait_for_function("() => typeof Online !== 'undefined' && Online.me", timeout=15000)
116 # Earn a few points so this player can appear (and be highlighted) on the global list.
117 page.evaluate("""async () => {
118 const begin = await Online.playBegin('solo');
119 if (begin && begin.token) await Online.playFinish(begin.token, 15);
120 }""")
121 page.wait_for_timeout(400)
122 if mobile:
123 page.locator("#btn-leaderboard").tap()
124 else:
125 page.locator("#btn-leaderboard").click()
126 page.wait_for_selector("#leaderboard:not([hidden])")
127 page.wait_for_function("() => document.querySelectorAll('#lb-list .lb-row').length > 0 || !document.getElementById('lb-empty').hidden", timeout=10000)
128 me = page.evaluate("""() => {
129 const row = document.querySelector('#lb-list .lb-row.you');
130 return row ? { name: row.querySelector('.lb-name')?.textContent, hasYou: true } : { hasYou: false, names: [...document.querySelectorAll('#lb-name, #lb-list .lb-name')].map(e => e.textContent) };
131 }""")
132 check(me.get("hasYou") and "test_user_1" in (me.get("name") or ""), f"{name}: current player is highlighted ({me})")
133 shot(page, f"{name}-global-loggedin")
134
135 if mobile:
136 page.locator("#lb-tab-friends").tap()
137 else:
138 page.locator("#lb-tab-friends").click()
139 page.wait_for_function("""() => {
140 const login = document.getElementById('lb-login');
141 const list = document.getElementById('lb-list');
142 const empty = document.getElementById('lb-empty');
143 const err = document.getElementById('lb-error');
144 return (login && login.hidden) && ((list && list.children.length > 0) || (empty && !empty.hidden) || (err && !err.hidden));
145 }""", timeout=10000)
146 check(page.evaluate("() => document.getElementById('lb-login').hidden"), f"{name}: logged-in friends tab does not ask to log in")
147 names = page.evaluate("() => [...document.querySelectorAll('#lb-list .lb-name')].map(e => e.textContent)")
148 check("test_user_2" in names, f"{name}: local friends tab lists test_user_2 ({names})")
149 shot(page, f"{name}-friends-loggedin")
150 check(not errs, f"{name}: logged-in no page errors {errs[:2]}")
151 ctx.close()
152
153with sync_playwright() as pw:
154 br = pw.chromium.launch(args=["--use-gl=angle", "--use-angle=swiftshader"])
155 for name, vp, mobile in (("desktop", {"width": 1280, "height": 800}, False), ("mobile", {"width": 390, "height": 844}, True)):
156 guest(br, name, vp, mobile)
157 if LOCAL:
158 logged_in(br, name, vp, mobile)
159 br.close()
160
161print("ALL OK" if not fails else f"{len(fails)} FAIL")
162for f in fails:
163 print(" -", f)
164sys.exit(1 if fails else 0)