Merge pull request #157 from WatWowMap/pogo-data-generator

Update Generators

README.md

@@ -59,6 +59,7 @@ Pokemon GO Map frontend built with React. Currently in beta testing!
 **The dev yarn scripts do not generate the masterfile and locales like the production scripts do, you must generate them manually using these:**
 
 - `yarn generate` if you want to experiment with the masterfile generator
+- `yarn create-locales` if you want to generate locales manually
 - `yarn build` to only build and not run the server
 - `yarn server` to only start the server without recompiling webpack
 - `yarn console` repl server for running code/playing with the ORM

package.json

@@ -7,13 +7,13 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "start": "yarn upgrade pogo-translations && node server/createLocales.js && webpack --env prod && node server/generateMasterfile.js && node server/src/index.js",
-    "server": "node server/generateMasterfile.js && node server/src/index.js",
+    "start": "yarn create-locales && webpack --env prod && yarn generate && yarn server",
+    "server": "yarn generate && node server/src/index.js",
     "dev": "nodemon server/src/index.js --watch server",
-    "build": "yarn upgrade pogo-translations && node server/createLocales.js && webpack --env prod",
+    "build": "yarn create-locales && webpack --env prod",
     "watch": "webpack --watch --env dev",
-    "generate": "node server/generateMasterfile.js",
-    "create-locales": "yarn upgrade pogo-translations && node server/createLocales.js",
+    "generate": "node -e 'require(\"./server/src/services/generateMasterfile\").generate()'",
+    "create-locales": "node -e 'require(\"./server/src/services/createLocales\").locales()'",
     "console": "node --experimental-repl-await ./server/src/console.js",
     "migrate:make": "knex --knexfile server/knexfile.cjs migrate:make",
     "migrate:latest": "knex --knexfile server/knexfile.cjs migrate:latest",
@@ -89,7 +89,6 @@
     "ohbem": "^1.1.0",
     "passport": "^0.4.1",
     "passport-discord": "https://github.com/tonestrike/passport-discord.git",
-    "pogo-translations": "git+https://github.com/bschultz/pogo-translations.git",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-i18next": "^11.9.0",

public/base-locales/ko.json

@@ -0,0 +1 @@
+{}

public/base-locales/pt-br.json

@@ -0,0 +1 @@
+{}

public/base-locales/ru.json

@@ -0,0 +1 @@
+{}

public/base-locales/th.json

@@ -0,0 +1 @@
+{}

public/base-locales/zh-tw.json

@@ -0,0 +1 @@
+{}

server/src/index.js

@@ -9,9 +9,10 @@ const i18next = require('i18next')
 const Backend = require('i18next-fs-backend')
 require('./db/initialization')
 
-const { sessionStore } = require('./services/session-store.js')
-const rootRouter = require('./routes/rootRouter.js')
-const config = require('./services/config.js')
+const { Pokemon } = require('./models/index')
+const { sessionStore } = require('./services/session-store')
+const rootRouter = require('./routes/rootRouter')
+const config = require('./services/config')
 
 const app = express()
 
@@ -68,7 +69,7 @@ if (config.discord.enabled) {
 i18next.use(Backend).init({
   lng: 'en',
   fallbackLng: 'en',
-  preload: ['en', 'de', 'es', 'fr', 'pl'],
+  preload: config.localeSelection,
   ns: ['translation'],
   defaultNS: 'translation',
   backend: { loadPath: 'public/locales/{{lng}}/{{ns}}.json' },
@@ -79,6 +80,10 @@ i18next.use(Backend).init({
 
 app.use(rootRouter, requestRateLimiter)
 
+if (config.database.settings.reactMapHandlesPvp) {
+  Pokemon.initOhbem()
+}
+
 app.listen(config.port, config.interface, () => {
   // eslint-disable-next-line no-console
   console.log(`Server is now listening at http://${config.interface}:${config.port}`)

server/src/models/Gym.js

@@ -166,15 +166,10 @@ class Gym extends Model {
 
       for (let i = 0; i < length; i += 1) {
         const gym = queryResults[i]
-        if (gym.raid_pokemon_form === 0 && gym.raid_pokemon_id > 0) {
-          const formId = masterfile[gym.raid_pokemon_id].default_form_id
-          if (formId) gym.raid_pokemon_form = formId
-        }
         if (!gyms) {
           gym.team_id = 0
         }
-        if (!gym.raid_pokemon_id
-          && args.filters[`e${gym.raid_level}`]) {
+        if (!gym.raid_pokemon_id && args.filters[`e${gym.raid_level}`]) {
           filteredResults.push(gym)
         } else if (args.filters[`${gym.raid_pokemon_id}-${gym.raid_pokemon_form}`]) {
           filteredResults.push(gym)
@@ -217,10 +212,6 @@ class Gym extends Model {
       if (pokemon.raid_pokemon_id === 0) {
         return `e${pokemon.raid_level}`
       }
-      if (pokemon.raid_pokemon_form === 0) {
-        const formId = masterfile[pokemon.raid_pokemon_id].default_form_id
-        if (formId) pokemon.raid_pokemon_form = formId
-      }
       return `${pokemon.raid_pokemon_id}-${pokemon.raid_pokemon_form}`
     })
   }

server/src/models/Nest.js

@@ -35,7 +35,7 @@ class Nest extends Model {
       const returnedResults = []
       queryResults.forEach(pkmn => {
         if (pkmn.pokemon_form == 0 || pkmn.pokemon_form === null) {
-          const formId = masterfile[pkmn.pokemon_id].default_form_id
+          const formId = masterfile[pkmn.pokemon_id].defaultFormId
           if (formId) pkmn.pokemon_form = formId
         }
         if (args.filters[`${pkmn.pokemon_id}-${pkmn.pokemon_form}`]) {
@@ -55,7 +55,7 @@ class Nest extends Model {
 
     return results.map(pokemon => {
       if (pokemon.pokemon_form == 0 || pokemon.pokemon_form === null) {
-        return `${pokemon.pokemon_id}-${masterfile[pokemon.pokemon_id].default_form_id || 0}`
+        return `${pokemon.pokemon_id}-${masterfile[pokemon.pokemon_id].defaultFormId || 0}`
       }
       return `${pokemon.pokemon_id}-${pokemon.pokemon_form || 0}`
     })