Merge pull request #46 from versx/distance-rework

Multiple Locations Support + Individual Location Subscriptions
versx · May 28, 2021 · 8ebc4e7 · 8ebc4e7
2 parents 663c55f + fd0cd24
commit 8ebc4e7
Show file tree

Hide file tree

Showing 68 changed files with 1,685 additions and 331 deletions.
diff --git a/src/data/map.js b/src/data/map.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const Localizer = require('../services/locale.js');
+const Location = require('../models/location.js');
 const MapPokestop = require('../models/map/pokestop.js');
 const config = require('../config.json');
 
@@ -33,6 +34,21 @@ const buildCityList = (guilds) => {
     return cities;
 };
 
+const buildLocationsList = async (guilds, userId) => {
+    const locs = [];
+    const locations = await Location.getAllByUserId(userId);
+    for (let i = 0; i < locations.length; i++) {
+        const location = locations[i];
+        if (guilds.includes(location.guildId)) {
+            locs.push({
+                'name': location.name,
+                'guild': location.guildId,
+            });
+        }
+    }
+    return locs;
+};
+
 const getQuestRewards = async () => {
     const quests = await MapPokestop.getAll();
     const rewards = [];
@@ -71,6 +87,7 @@ const getLureTypes = () => {
 module.exports = {
     getPokemonNameIdsList,
     buildCityList,
+    buildLocationsList,
     getQuestRewards,
     getInvasionTypes,
     getLureTypes,

diff --git a/src/index.js b/src/index.js
@@ -19,10 +19,6 @@ const uiRoutes = require('./routes/ui.js');
 const { sessionStore, } = require('./services/session-store.js');
 const utils = require('./services/utils.js');
 
-const Localizer = require('./services/locale.js');
-const forms = Localizer.getFormNames();
-console.log('forms:', forms);
-
 // TODO: Convert to typescript
 // TODO: Import/export options
 // TODO: Copy subscriptions to other discord server options
@@ -109,7 +105,7 @@ console.log('forms:', forms);
             await Session.clearOthers(req.session.user_id, req.sessionID);
         }
         */
-        if (config.discord.enabled && !req.session.valid) {
+        if (!req.session.valid && req.path !== '/login') {
             console.error('Invalid user authenticated', req.session.user_id);
             req.session.current_path = req.path;
             res.redirect('/login');
@@ -121,32 +117,32 @@ console.log('forms:', forms);
             return next();
         }
 
-        if (req.session.logged_in) {
-            defaultData.logged_in = req.session.logged_in;
-            defaultData.username = req.session.username || 'root';
-            defaultData.user_id = req.session.user_id;
-            let valid = false;
-            const guilds = req.session.guilds;
-            const roles = req.session.roles;
-            defaultData.servers.forEach(server => {
-                if (roles[server.id]) {
-                    const userRoles = roles[server.id];
-                    const requiredRoles = config.discord.guilds.filter(x => x.id === server.id);
-                    if (requiredRoles.length > 0) {
-                        if (guilds.includes(server.id) && utils.hasRole(userRoles, requiredRoles[0].roles)) {
-                            valid = true;
-                        }
+        if (!req.session.logged_in) {
+            res.redirect('/login');
+        }
+        defaultData.logged_in = req.session.logged_in;
+        defaultData.username = req.session.username || 'root';
+        defaultData.user_id = req.session.user_id;
+        let valid = false;
+        const guilds = req.session.guilds;
+        const roles = req.session.roles;
+        defaultData.servers.forEach(server => {
+            if (roles[server.id]) {
+                const userRoles = roles[server.id];
+                const requiredRoles = config.discord.guilds.filter(x => x.id === server.id);
+                if (requiredRoles.length > 0) {
+                    if (guilds.includes(server.id) && utils.hasRole(userRoles, requiredRoles[0].roles)) {
+                        valid = true;
                     }
                 }
-            });
-            if (!req.session.valid || !valid) {
-                console.error('Invalid user authentication, no valid roles for user', req.session.user_id);
-                res.redirect('/login');
-                return;
             }
-            return next();
+        });
+        if (!req.session.valid || !valid) {
+            console.error('Invalid user authentication, no valid roles for user', req.session.user_id);
+            res.redirect('/login');
+            return;
         }
-        res.redirect('/login');
+        return next();
     });
 
     // API routes

diff --git a/src/models/gym.js b/src/models/gym.js
@@ -107,7 +107,11 @@ Gym.init({
                 ? data
                 : JSON.parse(data || '[]');
         },
-    }
+    },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,

diff --git a/src/models/invasion.js b/src/models/invasion.js
@@ -120,6 +120,10 @@ Invasion.init({
                 : JSON.parse(data || '[]');
         },
     },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,

diff --git a/src/models/location.js b/src/models/location.js
@@ -0,0 +1,126 @@
+'use strict';
+
+const { DataTypes, Model, } = require('sequelize');
+const sequelize = require('../services/sequelize.js')(true);
+
+class Location extends Model {
+
+    static getCount(guildId, userId) {
+        return Location.count({
+            where: {
+                guildId: guildId,
+                userId: userId,
+            }
+        });
+    }
+
+    static getAllByUserId(userId) {
+        return Location.findAll({
+            where: {
+                userId: userId,
+            }
+        });
+    }
+
+    static getAll(guildId, userId) {
+        return Location.findAll({
+            where: {
+                guildId: guildId,
+                userId: userId,
+            }
+        });
+    }
+
+    static getByName(guildId, userId, name) {
+        return Location.findOne({
+            where: {
+                guildId: guildId,
+                userId: userId,
+                name: name,
+            }
+        });
+    }
+
+    static getById(id) {
+        return Location.findByPk(id);
+    }
+
+    static delete(guildId, userId, name) {
+        return Location.destroy({
+            where: {
+                guildId: guildId,
+                userId: userId,
+                name: name,
+            }
+        });
+    }
+
+    static deleteById(id) {
+        return Location.destroy({
+            where: {
+                id: id,
+            }
+        });
+    }
+
+    static deleteAll(guildId, userId) {
+        return Location.destroy({
+            where: {
+                guildId: guildId,
+                userId: userId,
+            }
+        });
+    }
+}
+
+Location.init({
+    id: {
+        type: DataTypes.INTEGER(11).UNSIGNED,
+        primaryKey: true,
+        autoIncrement: true,
+        defaultValue: 0,
+    },
+    subscriptionId: {
+        type: DataTypes.INTEGER(11).UNSIGNED,
+        allowNull: false,
+        defaultValue: 0,
+    },
+    guildId: {
+        type: DataTypes.BIGINT(20).UNSIGNED,
+        allowNull: false,
+    },
+    userId: {
+        type: DataTypes.BIGINT(20).UNSIGNED,
+        allowNull: false,
+    },
+    name: {
+        type: DataTypes.STRING(128),
+        allowNull: false,
+        unique: true,
+    },
+    distance: {
+        type: DataTypes.INTEGER(11),
+        defaultValue: 0,
+    },
+    latitude: {
+        type: DataTypes.DOUBLE(18, 14),
+        defaultValue: 0,
+    },
+    longitude: {
+        type: DataTypes.DOUBLE(18, 14),
+        defaultValue: 0,
+    },
+}, {
+    sequelize,
+    timestamps: false,
+    underscored: true,
+    indexes: [
+        {
+            name: 'FK_location_subscriptions_subscription_id',
+            fields: ['subscription_id'],
+        },
+    ],
+    tableName: 'locations',
+});
+
+module.exports = Location;
diff --git a/src/models/lure.js b/src/models/lure.js
@@ -109,6 +109,10 @@ Lure.init({
                 : JSON.parse(data || '[]');
         },
     },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,

diff --git a/src/models/pokemon.js b/src/models/pokemon.js
@@ -169,6 +169,10 @@ Pokemon.init({
         }
         */
     },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,

diff --git a/src/models/pvp.js b/src/models/pvp.js
@@ -161,6 +161,10 @@ PVP.init({
         }
         */
     },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,

diff --git a/src/models/quest.js b/src/models/quest.js
@@ -100,6 +100,10 @@ Quest.init({
                 : JSON.parse(data || '[]');
         }
     },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,

diff --git a/src/models/raid.js b/src/models/raid.js
@@ -143,6 +143,10 @@ Raid.init({
                 : JSON.parse(data || '[]');
         },
     },
+    location: {
+        type: DataTypes.STRING(32),
+        defaultValue: null,
+    },
 }, {
     sequelize,
     timestamps: false,