diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 14bb4b4..aedb380 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,7 +2,7 @@ blank_issues_enabled: false contact_links: - name: Chat with other players on Signal url: https://signal.group/#CjQKIJwvEt5fYt1pvw7J2pV664CyUyGJXmAJLV8ia3nUdAD7EhA_FzdxflEzkNmcvDHdVgLQ - about: Screenshots, chat and peering-policy flame wars. Bugs, ideas and anything meaningful still go here as issues. + about: Screenshots, chat and peering-policy flame wars. Bugs and ideas go here as issues, so they don't scroll away. - name: How the internet really works url: https://tkjaer.github.io/how-the-internet-works/ about: Curious how the real thing works? This interactive map explains it far better than any game. diff --git a/CHANGELOG.md b/CHANGELOG.md index 0094b5d..d10d894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- Found a bug or have an idea? The menu and How to play now link straight to the forms on GitHub, where every report is tracked. The Signal group stays for chatting. + ## [1.35.0] — 2026-10-27 - Series of Tubes now speaks Spanish. The game follows your browser's language the first time, and you can switch to Spanish under Settings or on the title screen. diff --git a/site/i18n/es.js b/site/i18n/es.js index 16f2a3c..6cac197 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -2349,8 +2349,11 @@ "mergers.net_charges_for_peering":"{net} cobra por el peering, así que cuenta con una cuota mensual.", "mergers.net_has_swallowed_old":"{net} se ha tragado a {old}.", "mergers.now_part_of_net":"Ahora forma parte de {net}: haz peering con ellos.", +"modal_and_names.found_a_bug_or_have_an":"¿Has encontrado un fallo o tienes una idea?", "modal_and_names.join_the_noc_chat":"Únete al chat del NOC", -"modal_and_names.our_signal_group_swap_screenshots":"Nuestro grupo de Signal: intercambia capturas, informa de fallos y discute sobre política de peering con otros jugadores. Menos retroexcavadoras que en la vida real.", +"modal_and_names.open":"Abrir →", +"modal_and_names.our_signal_group_screenshots_chat":"Nuestro grupo de Signal: intercambia capturas y discute sobre política de peering con otros jugadores. Menos retroexcavadoras que en la vida real.", +"modal_and_names.tell_us_on_github_a_short":"Cuéntanoslo en GitHub: un formulario corto para fallos, ideas, equilibrio y traducciones. Los leemos todos.", "modal_and_names.the_real_thing_by_thomas_kj":"Lo de verdad, de Thomas Kjær Aabo: un mapa interactivo con zoom de cómo viajan realmente tus paquetes, del Wi-Fi a la fibra submarina, hoy, en 2010 y en 1995. Este juego se lo inventa sobre la marcha. Ese lo hace bien.", "modal_and_names.the_real_thing_follow_a_packet":"Lo de verdad: sigue un paquete del Wi-Fi a la fibra submarina.", "modals.lay_your_own_subsea_cable":"Tender tu propio cable submarino…", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index 4e674bf..056d5e4 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -2349,8 +2349,11 @@ "mergers.net_charges_for_peering":"{net} fait payer le peering : attends-toi à un coût mensuel.", "mergers.net_has_swallowed_old":"{net} a avalé {old}.", "mergers.now_part_of_net":"Fait désormais partie de {net} : fais du peering avec eux à la place.", +"modal_and_names.found_a_bug_or_have_an":"Un bug ou une idée ?", "modal_and_names.join_the_noc_chat":"Rejoins le chat du NOC", -"modal_and_names.our_signal_group_swap_screenshots":"Notre groupe Signal : échange des captures d’écran, signale des bugs et dispute-toi sur les politiques de peering avec d’autres joueurs. Moins de pelleteuses qu’en vrai.", +"modal_and_names.open":"Ouvrir →", +"modal_and_names.our_signal_group_screenshots_chat":"Notre groupe Signal : échange des captures d’écran et dispute-toi sur les politiques de peering avec d’autres joueurs. Moins de pelleteuses qu’en vrai.", +"modal_and_names.tell_us_on_github_a_short":"Dis-le-nous sur GitHub : un court formulaire pour les bugs, les idées, l’équilibrage et les traductions. On les lit tous.", "modal_and_names.the_real_thing_by_thomas_kj":"La version réelle, par Thomas Kjær Aabo : une carte interactive et zoomable du vrai trajet de tes paquets, du Wi-Fi à la fibre sous-marine, aujourd’hui, en 2010 et en 1995. Ce jeu invente au fur et à mesure. Celle-là, elle a tout bon.", "modal_and_names.the_real_thing_follow_a_packet":"La version réelle : suis un paquet du Wi-Fi à la fibre sous-marine.", "modals.lay_your_own_subsea_cable":"Pose ton propre câble sous-marin…", diff --git a/site/i18n/it.js b/site/i18n/it.js index 83a3693..beb0e19 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -2349,8 +2349,11 @@ "mergers.net_charges_for_peering":"{net} fa pagare il peering, quindi aspettati un canone mensile.", "mergers.net_has_swallowed_old":"{net} si è mangiata {old}.", "mergers.now_part_of_net":"Ora fa parte di {net}: fai peering con loro.", +"modal_and_names.found_a_bug_or_have_an":"Hai trovato un bug o hai un'idea?", "modal_and_names.join_the_noc_chat":"Entra nella chat del NOC", -"modal_and_names.our_signal_group_swap_screenshots":"Il nostro gruppo Signal: scambia screenshot, segnala bug e litiga sulle politiche di peering con altri giocatori. Meno ruspe che nella realtà.", +"modal_and_names.open":"Apri →", +"modal_and_names.our_signal_group_screenshots_chat":"Il nostro gruppo Signal: scambia screenshot e litiga sulle politiche di peering con altri giocatori. Meno ruspe che nella realtà.", +"modal_and_names.tell_us_on_github_a_short":"Raccontacelo su GitHub: un breve modulo per bug, idee per nuove funzioni, bilanciamento e traduzioni. Li leggiamo tutti.", "modal_and_names.the_real_thing_by_thomas_kj":"La versione vera, di Thomas Kjær Aabo: una mappa interattiva e zoomabile di come viaggiano davvero i tuoi pacchetti, dal Wi-Fi alla fibra sottomarina, oggi, nel 2010 e nel 1995 (in inglese, danese e tedesco). Questo gioco se lo inventa strada facendo. Quello ci azzecca.", "modal_and_names.the_real_thing_follow_a_packet":"La versione vera: segui un pacchetto dal Wi-Fi alla fibra sottomarina.", "modals.lay_your_own_subsea_cable":"Posa il tuo cavo sottomarino…", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index cd40592..0fc014c 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -2349,8 +2349,11 @@ "mergers.net_charges_for_peering":"{net} cobra pelo peering, então conte com uma mensalidade.", "mergers.net_has_swallowed_old":"{net} engoliu {old}.", "mergers.now_part_of_net":"Agora faz parte de {net}: faça peering com eles.", +"modal_and_names.found_a_bug_or_have_an":"Achou um bug ou teve uma ideia?", "modal_and_names.join_the_noc_chat":"Entre no chat do NOC", -"modal_and_names.our_signal_group_swap_screenshots":"Nosso grupo no Signal: troque capturas de tela, reporte bugs e discuta política de peering com outros jogadores. Menos retroescavadeiras que na vida real.", +"modal_and_names.open":"Abrir →", +"modal_and_names.our_signal_group_screenshots_chat":"Nosso grupo no Signal: troque capturas de tela e discuta política de peering com outros jogadores. Menos retroescavadeiras que na vida real.", +"modal_and_names.tell_us_on_github_a_short":"Conte para a gente no GitHub: um formulário curto para bugs, ideias de recursos, balanceamento e traduções. Lemos todos.", "modal_and_names.the_real_thing_by_thomas_kj":"A coisa de verdade, por Thomas Kjær Aabo: um mapa interativo com zoom de como seus pacotes viajam de fato, do Wi-Fi à fibra submarina, hoje, em 2010 e em 1995. Este jogo inventa tudo pelo caminho. Aquele acerta.", "modal_and_names.the_real_thing_follow_a_packet":"A coisa de verdade: siga um pacote do Wi-Fi até a fibra submarina.", "modals.lay_your_own_subsea_cable":"Lançar seu próprio cabo submarino…", diff --git a/src/game/90-actions/89-game-and-settings.js b/src/game/90-actions/89-game-and-settings.js index d4b8822..6e59382 100644 --- a/src/game/90-actions/89-game-and-settings.js +++ b/src/game/90-actions/89-game-and-settings.js @@ -24,7 +24,7 @@ Object.assign(ACT,{ ${RELEASE_NOTES.length?btn(tr('common.what_s_new_in_v',{v:esc(APP_VERSION)}),'whatsNewShow',{},'ghost'):''} ${btn(tr('common.settings'),'settings',{},'ghost')} ${btn(tr('common.start_a_new_network'),'resetAsk',{},'red')} - ${chatHtml()}`);}, + ${chatHtml()}${issueHtml()}`);}, settings:()=>{UI.setOpen=true;openModal(settingsHtml());}, settingsClose:()=>{UI.setOpen=false;if(!S||!UI.started)showTitle();else closeModal();}, prefSet:({v})=>{const [k,b]=String(v).split(':');if(!own(PREF_DEF,k))return;setPref(k,b==='1');sfx('click');refreshSettings();}, diff --git a/src/game/95-modals/30-modal-and-names.js b/src/game/95-modals/30-modal-and-names.js index b9c9894..258d523 100644 --- a/src/game/95-modals/30-modal-and-names.js +++ b/src/game/95-modals/30-modal-and-names.js @@ -20,5 +20,8 @@ const HTIW='https://tkjaer.github.io/how-the-internet-works/'; // The real thing: an interactive, zoomable guide to how packets actually travel. Go read it. // Where players hang out: the community Signal group. const SIGNAL='https://signal.group/#CjQKIJwvEt5fYt1pvw7J2pV664CyUyGJXmAJLV8ia3nUdAD7EhA_FzdxflEzkNmcvDHdVgLQ'; -const chatHtml=()=>`${tr('modal_and_names.join_the_noc_chat')}${tr('common.join')}`; +const chatHtml=()=>`${tr('modal_and_names.join_the_noc_chat')}${tr('common.join')}`; +// Bugs and ideas go to GitHub, where they get tracked; the chat is for chatting. Its forms sort them by kind. +const ISSUES='https://github.com/fjaeckel/seriesoftubes/issues/new/choose'; +const issueHtml=()=>`${tr('modal_and_names.found_a_bug_or_have_an')}${tr('modal_and_names.open')}`; const plugHtml=(big)=>`How the Internet Works${tr('common.explore')}`; diff --git a/src/game/95-modals/60-help.js b/src/game/95-modals/60-help.js index 282f511..e8e5e51 100644 --- a/src/game/95-modals/60-help.js +++ b/src/game/95-modals/60-help.js @@ -18,7 +18,7 @@ function showHelp(){
${tr('help.name_as_asn_is_transit_free',{name:esc(S.name),asn:S.asn,days:S.day,n:S.stats.incidents})}
${btn(tr('common.keep_building'),'keepPlaying',{},'pink big')}`);sfx('coin');} function showLose(){openModal(`${tr('help.the_bank_repossessed_your_routers',{name:esc(S.name),days:S.day,peak:fmtG(S.stats.peak)})}
${btn(tr('common.try_again'),'newgame',{},'pink big')}`);try{localStorage.removeItem('sot-save-v1');}catch(e){}} diff --git a/src/i18n/en.js b/src/i18n/en.js index b26cc57..78b4a71 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -2350,8 +2350,11 @@ "mergers.net_charges_for_peering":"{net} charges for peering, so expect a monthly fee.", "mergers.net_has_swallowed_old":"{net} has swallowed {old}.", "mergers.now_part_of_net":"Now part of {net}: peer with them instead.", +"modal_and_names.found_a_bug_or_have_an":"Found a bug or have an idea?", "modal_and_names.join_the_noc_chat":"Join the NOC chat", -"modal_and_names.our_signal_group_swap_screenshots":"Our Signal group: swap screenshots, report bugs and argue about peering policy with other players. Fewer backhoes than the real thing.", +"modal_and_names.open":"Open →", +"modal_and_names.our_signal_group_screenshots_chat":"Our Signal group: swap screenshots and argue about peering policy with other players. Fewer backhoes than the real thing.", +"modal_and_names.tell_us_on_github_a_short":"Tell us on GitHub: a short form for bug reports, feature ideas, balance and translations. Every one gets read.", "modal_and_names.the_real_thing_by_thomas_kj":"The real thing, by Thomas Kjær Aabo: a zoomable, interactive map of how your packets actually travel, from Wi-Fi to undersea fiber, today, in 2010 and in 1995. This game makes it up as it goes. That one gets it right.", "modal_and_names.the_real_thing_follow_a_packet":"The real thing: follow a packet from Wi-Fi to undersea fiber.", "modals.lay_your_own_subsea_cable":"Lay your own subsea cable…", diff --git a/tests/report-link.test.js b/tests/report-link.test.js new file mode 100644 index 0000000..cd0e2a6 --- /dev/null +++ b/tests/report-link.test.js @@ -0,0 +1,29 @@ +const test = require('node:test'); +const assert = require('node:assert/strict'); +const { load } = require('./harness'); + +const ISSUES = 'https://github.com/fjaeckel/seriesoftubes/issues/new/choose'; + +test('bugs and ideas point to GitHub from the menu and How to play, and the chat no longer asks for bug reports', () => { + for (const lang of ['en', 'it', 'pt', 'fr', 'es']) { + const { ev, errors } = load(lang === 'en' ? {} : { lang }); + ev('ACT.start({})'); + for (const [where, setup] of [['menu', 'ACT.menu()'], ['help', 'showHelp()']]) { + const cards = JSON.parse(ev(`(()=>{${setup};return JSON.stringify([...document.querySelectorAll('#modal a[href="${ISSUES}"]')].map(a=>[a.target,a.rel,a.textContent.trim()]));})()`)); + assert.equal(cards.length, 1, `${lang}: one GitHub card in ${where}`); + assert.deepEqual(cards[0].slice(0, 2), ['_blank', 'noopener'], `${lang}: opens in a new tab`); + if (lang !== 'en') assert.doesNotMatch(cards[0][2], /Found a bug/, `${lang}: translated`); + const chat = ev(`[...document.querySelectorAll('#modal a.chat')].map(a=>a.textContent).join(' ')`); + assert.doesNotMatch(chat, /report bugs|segnala bug|reporte bugs|signale des bugs|informa de fallos/, `${lang}: the chat card is for chatting`); + } + assert.deepEqual(errors, []); + } +}); + +test('the GitHub card fits a phone', () => { + const { ev, errors } = load(); + ev("ACT.start({});window.innerWidth=360;ACT.menu()"); + assert.ok(ev('isPhone()')); + assert.ok(ev(`!!document.querySelector('#modal a.plug[href="${ISSUES}"] .go')`), 'same card layout as the chat card'); + assert.deepEqual(errors, []); +});