linting

Author: versx

.eslintrc.js

@@ -15,7 +15,10 @@ module.exports = {
     'rules': {
         'indent': [
             'error',
-            4
+            4,
+            {
+                'SwitchCase': 1
+            }
         ],
         'linebreak-style': [
             'error',

src/config.example.json

@@ -136,8 +136,8 @@
                 "roles": []
             },
             "pvp": {
-            	"enabled": true,
-            	"roles": []
+                "enabled": true,
+                "roles": []
             },
             "s2cells": {
                 "enabled": true,

src/data/map.js

@@ -1060,6 +1060,7 @@ const getNests = async (minLat, maxLat, minLon, maxLon, nestFilterExclude = null
     return null;
 };
 
+/* eslint-disable no-case-declarations */
 const getSearchData = async (lat, lon, id, value, iconStyle) => {
     let sql = '';
     let args = [lat, lon, lat];
@@ -1209,6 +1210,7 @@ const getSearchData = async (lat, lon, id, value, iconStyle) => {
     }
     return null;
 };
+/* eslint-enable no-case-declarations */
 
 const getPolygon = (s2cellId) => {
     let s2cell = new S2.S2Cell(new S2.S2CellId(BigInt(s2cellId).toString()));
@@ -1405,4 +1407,4 @@ module.exports = {
     getAvailableRaidBosses,
     getAvailableQuests,
     getAvailableNestPokemon
-};
+};

src/geofenceToGeoJSON.js

@@ -34,7 +34,7 @@ fs.readdir(geofencesFolder, (err, files) => {
                 return;
             }
             console.log('Converting ini geofence file to geoJSON format', file);
-            const fences = data.match(/\[([^\]]+)\]([^\[]*)/g);
+            const fences = data.match(/\[([^\]]+)\]([^[]*)/g);
             fences.forEach(fence => {
                 const geofence = {
                     type: 'Feature',
@@ -47,7 +47,7 @@ fs.readdir(geofencesFolder, (err, files) => {
                     }
                 };
                 geofence.properties.name = fence.match(/\[([^\]]+)\]/)[1];
-                geofence.geometry.coordinates[0] = fence.match(/[0-9\-\.]+,\s*[0-9\-\.]+/g).map(point => [parseFloat(point.split(',')[1]), parseFloat(point.split(',')[0])]);
+                geofence.geometry.coordinates[0] = fence.match(/[0-9\-.]+,\s*[0-9\-.]+/g).map(point => [parseFloat(point.split(',')[1]), parseFloat(point.split(',')[0])]);
                 geofence.geometry.coordinates[0].push(geofence.geometry.coordinates[0][0]);
 
                 geoJSON.features.push(geofence);

src/index.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const compression = require('compression');
 const express = require('express');
-const cookieSession = require('cookie-session')
+const cookieSession = require('cookie-session');
 const app = express();
 const mustacheExpress = require('mustache-express');
 const i18n = require('i18n');
@@ -29,7 +29,9 @@ const rateLimitOptions = {
         type: 'error',
         message: `Too many requests from this IP, please try again in ${config.ratelimit.time} minutes.`
     },
+    /* eslint-disable no-unused-vars */
     onLimitReached: (req, res, options) => {
+    /* eslint-enable no-unused-vars */
         //console.error('Rate limit reached! Redirect to landing page.');
         //res.status(options.message.status).send(options.message.message);
         // TODO: Fix redirect
@@ -93,16 +95,16 @@ if (config.discord.enabled) {
     /* eslint-disable no-unused-vars */
     app.use((err, req, res, next) => {
         switch (err.message) {
-        case 'NoCodeProvided':
-            return res.status(400).send({
-                status: 'ERROR',
-                error: err.message,
-            });
-        default:
-            return res.status(500).send({
-                status: 'ERROR',
-                error: err.message,
-            });
+            case 'NoCodeProvided':
+                return res.status(400).send({
+                    status: 'ERROR',
+                    error: err.message,
+                });
+            default:
+                return res.status(500).send({
+                    status: 'ERROR',
+                    error: err.message,
+                });
         }
     });
     /* eslint-enable no-unused-vars */

src/routes/api.js

@@ -34,7 +34,7 @@ router.get('/get_settings', async (req, res) => {
 const getSettings = () => {
     let data = {};
     let settingsData = [];
-    const settingColorString = i18n.__('settings_color');
+    //const settingColorString = i18n.__('settings_color');
     const pokemonSettingsString = i18n.__('settings_pokemon');
     const pokemonGlowString = i18n.__('settings_pokemon_glow');
     const clusterPokemonString = i18n.__('settings_cluster_pokemon');
@@ -43,11 +43,13 @@ const getSettings = () => {
     const pokestopSettingsString = i18n.__('settings_pokestop');
     const clusterPokestopsString = i18n.__('settings_cluster_pokestops');
 
-    let glowColorLabel = `
+    /*
+    const glowColorLabel = `
     <label class="btn btn-sm btn-size select-button-new" data-id="pokemon-glow" data-type="pokemon-glow" data-info="color">
         <input type="radio" name="options" id="color" autocomplete="off">${settingColorString}
     </label>
     `;
+    */
     settingsData.push({
         'id': {
             'formatted': utils.zeroPad(0, 3),

src/services/discord.js

@@ -12,8 +12,7 @@ const client = new Discord.Client();
 if (config.discord.enabled) {
     client.on('ready', () => {
         console.log(`Logged in as ${client.user.tag}!`);
-            client.user.setPresence({ activity: { name: config.discord.status, type: 3 }
-        });
+        client.user.setPresence({ activity: { name: config.discord.status, type: 3 } });
     });
 
     client.login(config.discord.botToken);