Merge branch 'master' into landing-page

versx · web-flow · commit dbd85c6d8b5b · 2021-01-20T11:39:11.000-08:00
diff --git a/src/configs/default.json b/src/configs/default.json
@@ -104,6 +104,7 @@
             "database": "rdmdb",
             "charset": "utf8mb4",
             "sessionTable": "sessions",
+            "arScanColumn": false,
             "useFor": []
         },
         "manualdb": {
diff --git a/src/data/map.js b/src/data/map.js
@@ -13,6 +13,7 @@ const db = new MySQLConnector(config.db.scanner);
 const dbManual = new MySQLConnector(config.db.manualdb);
 
 const masterfile = require('../../static/data/masterfile.json');
+const arScanEligible = config.db.scanner.arScanColumn ? ', ar_scan_eligible' : '';
 
 const dbSelection = (category) => {
     let dbSelection;
@@ -383,7 +384,7 @@ const getGyms = async (minLat, maxLat, minLon, maxLon, updated = 0, showRaids =
             raid_spawn_timestamp, raid_battle_timestamp, raid_pokemon_id, enabled, availble_slots, updated,
             raid_level, ex_raid_eligible, in_battle, raid_pokemon_move_1, raid_pokemon_move_2, raid_pokemon_form,
             raid_pokemon_cp, raid_pokemon_gender, raid_is_exclusive, cell_id, total_cp, sponsor_id,
-            raid_pokemon_evolution, raid_pokemon_costume
+            raid_pokemon_evolution, raid_pokemon_costume${arScanEligible}
     FROM gym
     WHERE lat >= ? AND lat <= ? AND lon >= ? AND lon <= ? AND updated > ? AND deleted = false
         ${excludeLevelSQL} AND (
@@ -423,6 +424,12 @@ const getGyms = async (minLat, maxLat, minLon, maxLon, updated = 0, showRaids =
                 raidBattleTimestamp = null;
                 raidPokemonId = null;
             }
+
+            let arScanEligible = null;
+            if (config.db.scanner.arScanColumn) {
+                arScanEligible = result.ar_scan_eligible;
+            }
+            
             gyms.push({
                 id: result.id,
                 lat: result.lat,
@@ -453,6 +460,7 @@ const getGyms = async (minLat, maxLat, minLon, maxLon, updated = 0, showRaids =
                 sponsor_id: result.sponsor_id,
                 raid_pokemon_evolution: result.raid_pokemon_evolution,
                 raid_pokemon_costume: result.raid_pokemon_costume,
+                ar_scan_eligible: arScanEligible,
             });
         }
     }
@@ -666,7 +674,7 @@ const getPokestops = async (minLat, maxLat, minLon, maxLon, updated = 0, showPok
     SELECT id, lat, lon, name, url, enabled, lure_expire_timestamp, last_modified_timestamp, updated,
             quest_type, quest_timestamp, quest_target, CAST(quest_conditions AS CHAR) AS quest_conditions,
             CAST(quest_rewards AS CHAR) AS quest_rewards, quest_template, cell_id, lure_id, pokestop_display,
-            incident_expire_timestamp, grunt_type, sponsor_id
+            incident_expire_timestamp, grunt_type, sponsor_id${arScanEligible}
     FROM pokestop
     WHERE lat >= ? AND lat <= ? AND lon >= ? AND lon <= ? AND updated > ? AND deleted = false AND
         (false ${excludeTypeSQL} ${excludePokemonSQL} ${excludeEvolutionSQL} ${excludeItemSQL} ${excludePokestopSQL} ${excludeInvasionSQL})
@@ -723,6 +731,11 @@ const getPokestops = async (minLat, maxLat, minLon, maxLon, updated = 0, showPok
                 gruntType = null;
             }
 
+            let arScanEligible = null;
+            if (config.db.scanner.arScanColumn) {
+                arScanEligible = result.ar_scan_eligible;
+            }
+
             pokestops.push({
                 id: result.id,
                 lat: result.lat,
@@ -744,7 +757,8 @@ const getPokestops = async (minLat, maxLat, minLon, maxLon, updated = 0, showPok
                 pokestop_display: pokestopDisplay,
                 incident_expire_timestamp: incidentExpireTimestamp,
                 grunt_type: gruntType,
-                sponsor_id: result.sponsor_id
+                sponsor_id: result.sponsor_id,
+                ar_scan_eligible: arScanEligible,
             });
         }
     }
diff --git a/src/routes/discord.js b/src/routes/discord.js
@@ -3,7 +3,6 @@
 const express = require('express');
 const axios = require('axios');
 const router = express.Router();
-
 const DiscordClient = require('../services/discord.js');
 //const utils = require('../services/utils.js');
 
@@ -17,6 +16,7 @@ const catchAsyncErrors = fn => ((req, res, next) => {
     }
 });
 
+
 router.get('/login', (req, res) => {
     const scope = 'guilds%20identify%20email';
     res.redirect(`https://discordapp.com/api/oauth2/authorize?client_id=${config.discord.clientId}&scope=${scope}&response_type=code&redirect_uri=${redirect}`);
@@ -47,25 +47,86 @@ router.get('/callback', catchAsyncErrors(async (req, res) => {
         const valid = perms.map !== false;
         req.session.valid = valid;
         req.session.save();
+
+        const ip = req.headers['cf-connecting-ip'] || ((req.headers['x-forwarded-for'] || '').split(', ')[0]) || (req.connection.remoteAddress || req.connection.localAddress).match('[0-9]+.[0-9].+[0-9]+.[0-9]+$')[0];
+        const url = `http://ip-api.com/json/${ip}?fields=66846719&lang=${config.locale || 'en'}`;
+        const geoResponse = await axios.get(url);
+        const geo = geoResponse.data;
+        const embed = {
+            color: 0xFF0000,
+            title: 'Failure',
+            author: {
+                name: `${user.username}#${user.discriminator}`,
+                icon_url: `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`,
+            },
+            description: 'User Failed Authentication',
+            thumbnail: {
+                url: `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`,
+            },
+            fields: [
+                {
+                    name: 'Discord Id',
+                    value: `<@${user.id}>`,
+                },
+                { 
+                    name: 'Client Info',  
+                    value: req.headers['user-agent'] 
+                },
+                { 
+                    name: 'Ip Address',
+                    value: `||${ip}||` 
+                },
+                {
+                    name: 'Geo Lookup',
+                    value: `${geo['city']}, ${geo['regionName']}, ${geo['zip']}` 
+                },
+                {
+                    name: 'Google Map',
+                    value: `https://www.google.com/maps?q=${geo['lat']},${geo['lon']}` 
+                },
+                {
+                    name: 'Network Provider',
+                    value: `${geo['isp']}, ${geo['as']}`
+                },
+                {
+                    name: 'Mobile',
+                    value: `${geo['mobile']}`,
+                    inline: true
+                },
+                {
+                    name: 'Proxy',
+                    value: `${geo['proxy']}`,
+                    inline: true
+                },
+                {
+                    name: 'Hosting',
+                    value: `${geo['hosting']}`,
+                    inline: true
+                },
+            ],
+            timestamp: new Date(),
+        };
+        let redirect;
         if (valid) {
             console.log(user.id, 'Authenticated successfully.');
-            await DiscordClient.sendMessage(config.discord.logChannelId, `${user.username}#${user.discriminator} (${user.id}) Authenticated successfully.`);
-            res.redirect(`/?token=${response.data.access_token}`);
+            embed.title = 'Success';
+            embed.description = 'User Successfully Authenticated';
+            embed.color = 0x00FF00;
+            redirect = `/?token=${response.data.access_token}`;
         } else if (blocked) {
             // User is in blocked Discord server(s)
             console.warn(user.id, 'Blocked due to', blocked);
-            await DiscordClient.sendMessage(config.discord.logChannelId, `${user.username}#${user.discriminator} (${user.id}) Blocked due to ${blocked}.`);
-            res.redirect('/blocked');
+            embed.title 'Blocked';
+            embed.description = 'User Blocked Due to ' + blocked;
+            embed.color = 0xFF0000;
+            redirect = '/blocked';
         } else {
             // Not in Discord server(s) and/or have required roles to view map
             console.warn(user.id, 'Not authorized to access map');
-            await DiscordClient.sendMessage(config.discord.logChannelId, `${user.username}#${user.discriminator} (${user.id}) Not authorized to access map.`);
-            if (config.homePage) {
-                res.redirect('/home');
-            } else {
-                res.redirect('/login');
-            }
+            redirect = config.homePage ? '/home' : '/login';
         }
+        await DiscordClient.sendMessage(config.discord.logChannelId, {embed: embed});
+        res.redirect(redirect);
     }).catch(error => {
         console.error(error);
         //throw new Error('UnableToFetchToken');
diff --git a/static/img/misc/ar.png b/static/img/misc/ar.png
diff --git a/static/js/index.js b/static/js/index.js
@@ -3180,6 +3180,10 @@ function getPokestopPopupContent (pokestop) {
         });
     }
 
+    if (pokestop.ar_scan_eligible) {
+        content += '<img src="/img/misc/ar.png" height="26" width="26"><br><br>'
+    }
+
     const updatedDate = new Date(pokestop.updated * 1000);
     if (updatedDate) {
         content += '<div class="last-updated"><b>Last Updated:</b> ' + updatedDate.toLocaleDateString() + ' ' + updatedDate.toLocaleTimeString() + ' (' + getTimeSince(updatedDate) + ')</div>';
@@ -3417,6 +3421,11 @@ function getGymPopupContent (gym) {
             content += `<b>Worst CP:</b> ${getCpAtLevel(gym.raid_pokemon_id, gym.raid_pokemon_form, 20, false)} / Weather: ${getCpAtLevel(gym.raid_pokemon_id, gym.raid_pokemon_form, 25, false)}<br><br>`;
         }
     }
+    
+    if (gym.ar_scan_eligible) {
+        content += '<img src="/img/misc/ar.png" height="26" width="26"><br><br>';
+    }
+
     content += '</div>';
 
     const updatedDate = new Date(gym.updated * 1000);
