Merge branch 'develop' into better-multi-domain

Dockerfile

@@ -16,5 +16,5 @@ COPY yarn.lock .
 RUN apk add git
 RUN npm install -g yarn
 COPY . .
-RUN yarn install --ignore-optional
+RUN yarn install
 RUN yarn build

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.27.0",
+  "version": "1.27.2",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -68,7 +68,7 @@
     "@turf/helpers": "^6.5.0",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.20.2",
-    "chalkercli": "^1.6.4",
+    "chalkercli": "https://github.com/TurtIeSocks/chalkercli.git",
     "chokidar": "^3.5.3",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
@@ -124,6 +124,7 @@
     "@rm/types": "*",
     "@sentry/vite-plugin": "2.2.1",
     "@types/dlv": "^1.1.2",
+    "@types/node": "^18",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.0.9",
     "@vitejs/plugin-react": "4.0.0",
@@ -136,7 +137,7 @@
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "monaco-editor": "^0.41.0",
-    "nodemon": "^2.0.22",
+    "nodemon": "^3.0.2",
     "prettier": "^2.8.8",
     "rollup-plugin-delete": "^2.0.0",
     "vite": "4.3.9",

packages/config/.configref

@@ -1 +1 @@
-23093
+23123

packages/locales/lib/generate.js

@@ -3,16 +3,17 @@
 /* eslint-disable guard-for-in */
 
 require('dotenv').config()
-const { Configuration, OpenAIApi } = require('openai')
+const { OpenAI } = require('openai')
 
 const { log, HELPERS } = require('@rm/logger')
 
 const { readAndParseJson, readLocaleDirectory, writeAll } = require('./utils')
 
-const configuration = new Configuration({
-  apiKey: process.env.OPENAI_API_KEY,
-})
-const openai = new OpenAIApi(configuration)
+const openAI = process.env.OPENAI_API_KEY
+  ? new OpenAI({
+      apiKey: process.env.OPENAI_API_KEY,
+    })
+  : null
 
 /**
  * @typedef {Record<string, string>} I18nObject
@@ -101,7 +102,7 @@ function matchJSON(str) {
  * @returns
  */
 async function sendToGPT(locale, missingKeys) {
-  return openai.createChatCompletion({
+  return openAI.chat.completions.create({
     model: 'gpt-3.5-turbo',
     messages: [
       {
@@ -139,7 +140,9 @@ async function generate() {
 
         /** @type {I18nObject} */
         const missingKeys = Object.fromEntries(
-          Object.entries(englishRef).filter(([key]) => !(key in merged)),
+          Object.entries(englishRef).filter(
+            ([key]) => !(key in merged) && !key.startsWith('locale_selection_'),
+          ),
         )
 
         if (Object.keys(missingKeys).length === 0) return
@@ -157,7 +160,7 @@ async function generate() {
           const result = await Promise.all(
             chunks.map(async (x) => {
               const raw = await sendToGPT(locale, x)
-              const { content } = raw.data.choices[0].message
+              const { content } = raw.choices[0].message
               const clean = matchJSON(`${content}`)
               try {
                 return JSON.parse(clean)

packages/locales/lib/generated/de.json

@@ -72,14 +72,6 @@
   "drawer_temporary": "Vorübergehend",
   "drawer_persistent": "dauerhaft",
   "locale_selection": "Sprache wählen",
-  "locale_selection_en": "Englisch",
-  "locale_selection_de": "Deutsch",
-  "locale_selection_nl": "Nederlands",
-  "locale_selection_es": "Spanisch",
-  "locale_selection_pl": "Polnisch",
-  "locale_selection_fr": "Französisch",
-  "locale_selection_it": "Italienisch",
-  "locale_selection_ja": "日本語",
   "import": "Importieren",
   "export": "Exportieren",
   "logout": "Abmelden",
@@ -540,12 +532,6 @@
   "search_quests": "Suche nach Quests",
   "search_lures": "Suche nach Lockmodulen",
   "search_invasions": "Suche nach Invasionen",
-  "locale_selection_ko": "한국어",
-  "locale_selection_zh-tw": "中文",
-  "locale_selection_ru": "Русский",
-  "locale_selection_pt-br": "Portugiesisch",
-  "locale_selection_sv": "Schwedisch",
-  "locale_selection_th": "ไทย",
   "no_alerts": "Keine Benachrichtigungen gefunden",
   "points": "Punkte",
   "day": "Tag",
@@ -626,9 +612,6 @@
   "mutation_auth_error": "Die Anfrage war nicht erfolgreich, da Du nicht angemeldet warst.",
   "submitted_by": "Eingereicht von",
   "slider_size": "Größe",
-  "locale_selection_hi": "हिन्दी",
-  "locale_selection_id": "Bahasa Indonesia",
-  "locale_selection_tr": "Türkçe",
   "s2cells_options": "S2 Zellen Optionen",
   "global_search_pokemon": "Gib den Pokemon-Namen ein...",
   "remove_webhook_entry": "Entferne von {{name}}",
@@ -679,5 +662,13 @@
   "webhook_footer_feedback_width": 4,
   "cooldown": "Abkühlen",
   "saved": "Gespeichert",
-  "offline_mode": "Offline-Modus"
+  "offline_mode": "Offline-Modus",
+  "include_sponsored": "Gesponserte einbeziehen",
+  "showcase_color": "Ausstellungs-Farbe",
+  "partner_color": "Partner-Farbe",
+  "disable": "{{- name}} deaktivieren",
+  "profiling": "Profiling",
+  "showcase_block": "Aufgrund einer Ausstellung blockiert",
+  "signed_in_as": "Angemeldet als",
+  "missing_map_perm": "Sie haben keine Berechtigung, die Karte anzuzeigen."
 }

packages/locales/lib/generated/es.json

@@ -78,23 +78,6 @@
   "drawer_temporary": "Temporal",
   "drawer_persistent": "Persistente",
   "locale_selection": "Selección de idioma",
-  "locale_selection_en": "Inglés",
-  "locale_selection_de": "Alemán",
-  "locale_selection_nl": "Holandés",
-  "locale_selection_es": "Español",
-  "locale_selection_pl": "Polaco",
-  "locale_selection_fr": "Francés",
-  "locale_selection_it": "Italiano",
-  "locale_selection_ja": "Japonés",
-  "locale_selection_ko": "Coreano",
-  "locale_selection_zh-tw": "Chino",
-  "locale_selection_ru": "Ruso",
-  "locale_selection_pt-br": "Portugués",
-  "locale_selection_sv": "Sueco",
-  "locale_selection_th": "Tailandés",
-  "locale_selection_hi": "Hindi",
-  "locale_selection_id": "Indonesio",
-  "locale_selection_tr": "Turco",
   "import": "Importar",
   "export": "Exportar",
   "logout": "Cerrar sesión",
@@ -671,5 +654,13 @@
   "done": "Hecho",
   "fast": "Rápido",
   "charged": "Cargado",
-  "offline_mode": "Modo sin conexión"
+  "offline_mode": "Modo sin conexión",
+  "include_sponsored": "Incluir Patrocinado",
+  "showcase_color": "Color de Destaque",
+  "partner_color": "Color de Socio",
+  "disable": "Deshabilitar {{- name}}",
+  "profiling": "Perfilado",
+  "showcase_block": "Bloqueado debido a un destacado",
+  "signed_in_as": "Iniciado como",
+  "missing_map_perm": "No tienes permiso para ver el mapa."
 }

packages/locales/lib/generated/fr.json

@@ -72,14 +72,6 @@
   "drawer_temporary": "Temporaire",
   "drawer_persistent": "Persistant",
   "locale_selection": "Sélection Langue",
-  "locale_selection_en": "English",
-  "locale_selection_de": "Deutsch",
-  "locale_selection_nl": "Nederlands",
-  "locale_selection_es": "Español",
-  "locale_selection_pl": "Polski",
-  "locale_selection_fr": "Français",
-  "locale_selection_it": "Italiano",
-  "locale_selection_ja": "日本語",
   "import": "Importer",
   "export": "Exporter",
   "logout": "Déconnecter",
@@ -517,12 +509,6 @@
   "search_quests": "Rechercher des quêtes",
   "search_lures": "Rechercher des leurres",
   "search_invasions": "Rechercher des invasions",
-  "locale_selection_ko": "한국어",
-  "locale_selection_zh-tw": "中文",
-  "locale_selection_ru": "Русский",
-  "locale_selection_pt-br": "Portugais",
-  "locale_selection_sv": "Suèdois",
-  "locale_selection_th": "ไทย",
   "lc_title": "Suivez votre position",
   "lc_metersUnit": "mètres",
   "lc_feetUnit": "pieds",
@@ -599,9 +585,6 @@
   "unknown_event": "Inconnu",
   "slider_size": "Taille",
   "s2cells": "Cellules S2",
-  "locale_selection_hi": "हिन्दी",
-  "locale_selection_id": "Bahasa Indonesia",
-  "locale_selection_tr": "Türkçe",
   "s2cells_options": "Options des cellules S2",
   "scanner_subtitle": "Formuler des demandes de scan sur mesure",
   "s2cells_subtitle": "Afficher les cellules S2 de différents niveaux sur la carte",
@@ -677,5 +660,13 @@
   "done": "Terminé",
   "fast": "Rapide",
   "charged": "Chargé",
-  "offline_mode": "Mode hors ligne"
+  "offline_mode": "Mode hors ligne",
+  "include_sponsored": "Inclure les parrainages",
+  "showcase_color": "Couleur de la vitrine",
+  "partner_color": "Couleur du partenaire",
+  "disable": "Désactiver {{- name}}",
+  "profiling": "Profilage",
+  "showcase_block": "Bloqué en raison d'une vitrine",
+  "signed_in_as": "Connecté en tant que",
+  "missing_map_perm": "Vous n'avez pas la permission de voir la carte."
 }

packages/locales/lib/generated/hi.json

@@ -78,23 +78,6 @@
   "drawer_temporary": "अस्थायी",
   "drawer_persistent": "स्थायी",
   "locale_selection": "स्थानीय चयन",
-  "locale_selection_en": "अंग्रेज़ी",
-  "locale_selection_de": "जर्मन",
-  "locale_selection_nl": "डच",
-  "locale_selection_es": "स्पेनिश",
-  "locale_selection_pl": "पोलिश",
-  "locale_selection_fr": "फ़्रेंच",
-  "locale_selection_it": "इतालवी",
-  "locale_selection_ja": "जापानी",
-  "locale_selection_ko": "कोरियाई",
-  "locale_selection_zh-tw": "चीनी",
-  "locale_selection_ru": "रूसी",
-  "locale_selection_pt-br": "पुर्तगाली",
-  "locale_selection_sv": "स्वीडिश",
-  "locale_selection_th": "थाई",
-  "locale_selection_hi": "हिंदी",
-  "locale_selection_id": "इंडोनेशियाई",
-  "locale_selection_tr": "तुर्की",
   "import": "आयात",
   "export": "निर्यात",
   "logout": "लॉगआउट",
@@ -671,5 +654,13 @@
   "done": "हो गया",
   "fast": "तेज़",
   "charged": "चार्ज़",
-  "offline_mode": "ऑफ़लाइन मोड"
+  "offline_mode": "ऑफ़लाइन मोड",
+  "include_sponsored": "स्पॉन्सर शामिल करें",
+  "showcase_color": "दिखावट रंग",
+  "partner_color": "सहयोगी रंग",
+  "disable": "{{- name}} को अक्षम करें",
+  "profiling": "प्रोफ़ाइलिंग",
+  "showcase_block": "दिखावट के कारण अवरोधित",
+  "signed_in_as": "साइन इन किए जैसा",
+  "missing_map_perm": "आपका मानचित्र देखने की अनुमति नहीं है।"
 }

packages/locales/lib/generated/id.json

@@ -78,23 +78,6 @@
   "drawer_temporary": "Sementara",
   "drawer_persistent": "Tetap",
   "locale_selection": "Pilihan Bahasa",
-  "locale_selection_en": "Inggris",
-  "locale_selection_de": "Deutsch",
-  "locale_selection_nl": "Nederlands",
-  "locale_selection_es": "Español",
-  "locale_selection_pl": "Polski",
-  "locale_selection_fr": "Français",
-  "locale_selection_it": "Italiano",
-  "locale_selection_ja": "日本語",
-  "locale_selection_ko": "한국어",
-  "locale_selection_zh-tw": "中文",
-  "locale_selection_ru": "Русский",
-  "locale_selection_pt-br": "Português",
-  "locale_selection_sv": "Svenska",
-  "locale_selection_th": "ไทย",
-  "locale_selection_hi": "हिन्दी",
-  "locale_selection_id": "Bahasa Indonesia",
-  "locale_selection_tr": "Türkçe",
   "import": "Impor",
   "export": "Ekspor",
   "logout": "Keluar",
@@ -672,5 +655,13 @@
   "done": "Selesai",
   "fast": "Cepat",
   "charged": "Diisi ulang",
-  "offline_mode": "Mode Offline"
+  "offline_mode": "Mode Offline",
+  "include_sponsored": "Tampilkan yang Disponsori",
+  "showcase_color": "Warna Showcase",
+  "partner_color": "Warna Mitra",
+  "disable": "Nonaktifkan {{- name}}",
+  "profiling": "Profiling",
+  "showcase_block": "Diblokir karena showcase",
+  "signed_in_as": "Masuk sebagai",
+  "missing_map_perm": "Anda tidak memiliki izin untuk melihat peta."
 }

packages/locales/lib/generated/it.json

@@ -78,23 +78,6 @@
   "drawer_temporary": "Temporaneo",
   "drawer_persistent": "Persistente",
   "locale_selection": "Selezione Lingua",
-  "locale_selection_en": "Inglese",
-  "locale_selection_de": "Tedesco",
-  "locale_selection_nl": "Olandese",
-  "locale_selection_es": "Spagnolo",
-  "locale_selection_pl": "Polacco",
-  "locale_selection_fr": "Francese",
-  "locale_selection_it": "Italiano",
-  "locale_selection_ja": "Giapponese",
-  "locale_selection_ko": "Coreano",
-  "locale_selection_zh-tw": "Cinese",
-  "locale_selection_ru": "Russo",
-  "locale_selection_pt-br": "Portoghese",
-  "locale_selection_sv": "Svedese",
-  "locale_selection_th": "Tailandese",
-  "locale_selection_hi": "Hindi",
-  "locale_selection_id": "Indonesiano",
-  "locale_selection_tr": "Turco",
   "import": "Importa",
   "export": "Esporta",
   "logout": "Esci",
@@ -686,5 +669,13 @@
   "done": "Concluído",
   "fast": "Rápido",
   "charged": "Carregado",
-  "offline_mode": "Modo Offline"
+  "offline_mode": "Modo Offline",
+  "include_sponsored": "Includi pubblicità",
+  "showcase_color": "Mostra colore in evidenza",
+  "partner_color": "Mostra colore partner",
+  "disable": "Disabilita {{- name}}",
+  "profiling": "Profilazione",
+  "showcase_block": "Bloccato a causa di un'anteprima",
+  "signed_in_as": "Connesso come",
+  "missing_map_perm": "Non hai il permesso di visualizzare la mappa."
 }