Merge branch 'main' into feautre/login-cancelled-modal

Author: dthlss26

.github/workflows/pr-stale.yml

@@ -8,7 +8,6 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     permissions:
-      issues: write
       pull-requests: write
     steps:
       - uses: actions/stale@8f717f0dfca33b78d3c933452e42558e4456c8e7
@@ -21,6 +20,6 @@ jobs:
           exempt-pr-assignees: evanpelle
           exempt-pr-labels: "will not stale"
           stale-pr-label: "Stale"
-          stale-pr-message: "This pull request is stale because it has been open for 14 days with no activity. If you want to keep this pull request open, add a comment or update the branch."
-          close-pr-message: "This pull request has been closed because twenty-eight days have passed without activity. If someone wants to keep working on it, feel free to take the code."
+          stale-pr-message: "This pull request is stale because it has been open for fourteen days with no activity. If you want to keep this pull request open, add a comment or update the branch."
+          close-pr-message: "This pull request has been closed because fourteen days have passed without activity. If you want to continue work on the code, comment or create a new PR."
           close-pr-label: "Orphaned"

.gitignore

@@ -10,3 +10,4 @@ resources/.DS_Store
 .DS_Store
 .clinic/
 CLAUDE.md
+.idea/

API.md

@@ -0,0 +1,94 @@
+## API Usage
+
+### List Game Metadata
+
+Get game IDs and basic metadata for games that started within a specified time range. Results are sorted by start time and paginated.
+
+**Constraints:**
+
+- Maximum time range: 2 days
+- Maximum limit per request: 1000 games
+
+**Endpoint:**
+
+```
+GET https://api.openfront.io/public/games
+```
+
+**Query Parameters:**
+
+- `start` (required): ISO 8601 timestamp
+- `end` (required): ISO 8601 timestamp
+- `type` (optional): Game type, must be one of `[Private, Public, Singleplayer]`
+- `limit` (optional): Number of results (max 1000, default 50)
+- `offset` (optional): Pagination offset
+
+**Example Request:**
+
+```bash
+curl "https://api.openfront.io/public/games?start=2025-10-25T00:00:00Z&end=2025-10-26T23:59:59Z&type=Singleplayer&limit=10&offset=5"
+```
+
+**Response:**
+
+```json
+[
+  {
+    "game": "ABSgwin6",
+    "start": "2025-10-25T00:00:10.526Z",
+    "end": "2025-10-25T00:19:45.187Z",
+    "type": "Singleplayer",
+    "mode": "Free For All",
+    "difficulty": "Medium"
+  },
+  ...
+]
+```
+
+The response includes a `Content-Range` header indicating pagination (e.g., `games 5-15/399`).
+
+---
+
+### Get Game Info
+
+Retrieve detailed information about a specific game.
+
+**Endpoint:**
+
+```
+GET https://api.openfront.io/public/game/:gameId
+```
+
+**Query Parameters:**
+
+- `turns` (optional): Set to `false` to exclude turn data and reduce response size
+
+**Examples:**
+
+```bash
+# Full game data
+curl "https://api.openfront.io/public/game/ABSgwin6"
+
+# Without turn data
+curl "https://api.openfront.io/public/game/ABSgwin6?turns=false"
+```
+
+**Note:** Public player IDs are stripped from game records for privacy.
+
+---
+
+### Get Player Info
+
+Retrieve information and stats for a specific player.
+
+**Endpoint:**
+
+```
+GET https://api.openfront.io/public/player/:playerId
+```
+
+**Example:**
+
+```bash
+curl "https://api.openfront.io/public/player/HabCsQYR"
+```

LICENSE

@@ -663,21 +663,22 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 === ADDITIONAL TERMS (AGPL v3 Section 7) ===
 
 Attribution Requirement:
-All modified versions of this web game must prominently display one of the 
-following on the main menu and/or initial title screen:
+
+All versions of this software, including modified versions, must display 
+attribution to the original OpenFront project prominently on the main menu 
+or initial title screen where it is clearly visible to users.
+
+The attribution must include one of the following text statements:
 - "Based on OpenFront"
 - "Derived from OpenFront"
 - "Powered by OpenFront"
 - "Fork of OpenFront"
 
-Display Requirements:
-- Positioned directly beneath the game's title
-- Minimum 12-point font size (or proportional equivalent)
-- Sufficient contrast for clear readability
-- Visible without scrolling or navigation
-- Must remain visible until user chooses to proceed (no auto-skip)
-- May include a link to https://openfront.io
-
-Modified versions may add their own game title (e.g., 
-"SuperGame - Based on OpenFront") but may not use "OpenFront" 
-as the primary title or imply official endorsement.
+This attribution text must be reasonably prominent and clearly readable.
+A link to https://openfront.io may be included alongside the attribution.
+
+Modified versions may use their own game title and branding, but may not 
+use "OpenFront" as the primary title or imply official endorsement.
+
+These attribution requirements are additional terms under Section 7 of 
+the GNU Affero General Public License v3, which governs this software.

LICENSING.md

@@ -72,6 +72,13 @@ This document provides comprehensive licensing information for the OpenFront.io
   - Added additional Section 7 attribution requirements to the LICENSE
   - Removed trademark notice from LICENSE file as it's unnecessary
 
+### Phase 7: Update AGPL Additional Attribution Terms
+
+- **Starting After:** f161c94ff475092811fc49be79138fc37a446179
+- **Date:** October 18, 2025
+- **Changes:**
+  - Updated Section 7 attribution requirements in the LICENSE
+
 ## Important Notes
 
 ### For Code:

README.md

@@ -151,11 +151,14 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 Translators are welcome! Please feel free to help translate into your language.
 How to help?
 
-1. Request to join the dev [Discord](https://discord.gg/K9zernJB5z) (in the application form, say you want to help translate)
-1. Go to the project's Crowdin translation page: [https://crowdin.com/project/openfront-mls](https://crowdin.com/project/openfront-mls)
-1. Login if you already have an account/ Sign up if you don't have one
-1. Select the language you want to translate in/ If your language isn't on the list, click the "Request New Language" button and enter the language you want added there.
-1. Translate the strings
+1. Join the translation [Discord](https://discord.gg/3zZzacjWFr)
+2. Go to the project's Crowdin translation page: [https://crowdin.com/project/openfront-mls](https://crowdin.com/project/openfront-mls)
+3. Login if you already have an account / Sign up if you don't have one
+4. Join the project
+5. Select the language you want to translate in. If your language isn't on the list, click the "Request New Language" button and enter the language you want added there.
+6. Translate the strings
+
+Feel free to ask questions in the translation Discord server!
 
 ### Project Governance
 

jest.config.ts

@@ -11,12 +11,16 @@ export default {
   },
   transform: {
     "^.+\\.tsx?$": ["@swc/jest"],
+    "^.+\\.mjs$": ["@swc/jest"],
+    "^.+\\.js$": ["@swc/jest"],
   },
-  transformIgnorePatterns: ["node_modules/(?!(node:)/)"],
+  transformIgnorePatterns: [
+    "node_modules/(?!(nanoid|@jsep|fastpriorityqueue|@datastructures-js)/)",
+  ],
   collectCoverageFrom: ["src/**/*.ts", "!src/**/*.d.ts"],
   coverageThreshold: {
     global: {
-      statements: 21.5,
+      statements: 21,
       branches: 16,
       lines: 21.0,
       functions: 20.5,

map-generator/assets/maps/achiran/image.png

@@ -0,0 +1,29 @@
+{
+  "name": "Achiran",
+  "nations": [
+    {
+      "coordinates": [785, 985],
+      "flag": "ie",
+      "name": "Inishmore",
+      "strength": 1
+    },
+    {
+      "coordinates": [1360, 1360],
+      "flag": "ie",
+      "name": "Inishmann",
+      "strength": 2
+    },
+    {
+      "coordinates": [1630, 1515],
+      "flag": "ie",
+      "name": "Inisheer",
+      "strength": 1
+    },
+    {
+      "coordinates": [1400, 480],
+      "flag": "ie",
+      "name": "Achill",
+      "strength": 2
+    }
+  ]
+}