Merge pull request #56 from versx/guild-map-settings

Map Settings per Guild
versx · Jun 1, 2021 · 903e6c3 · 903e6c3
2 parents 661ef22 + e8a5ceb
commit 903e6c3
Show file tree

Hide file tree

Showing 18 changed files with 230 additions and 23 deletions.
diff --git a/src/config.example.json b/src/config.example.json
@@ -43,15 +43,21 @@
                 "roles": [
                     "000000000000000000"
                 ],
-                "geofences": []
+                "geofences": [],
+                "startLat": 4,
+                "startLon": -100,
+                "startZoom": 11
             },
             {
                 "name": "Guild Name2",
                 "id": "222222222222222222",
                 "roles": [
                     "000000000000000000"
                 ],
-                "geofences": []
+                "geofences": [],
+                "startLat": 5,
+                "startLon": -200,
+                "startZoom": 11
             }
         ],
         "userIdWhitelist": []
@@ -66,9 +72,6 @@
         { "name": "Shuffle" }
     ],
     "map": {
-        "startLat": 4,
-        "startLon": -100,
-        "startZoom": 10,
         "minZoom": 8,
         "maxZoom": 18,
         "tileserver": "https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}{r}.png;Map tiles by Carto, under CC BY 3.0. Data by  <a href='https://www.openstreetmap.org/'>OpenStreetMap</a>, under ODbL."

diff --git a/src/data/default.js b/src/data/default.js
@@ -31,9 +31,6 @@ data.sizes = [
     { name: 'Big', value: 5, },
 ];
 // Leaflet map properties
-data.start_lat = config.map.startLat;
-data.start_lon = config.map.startLon;
-data.start_zoom = config.map.startZoom;
 data.min_zoom = config.map.minZoom;
 data.max_zoom = config.map.maxZoom;
 data.tileserver = config.map.tileserver;

diff --git a/src/models/subscription.js b/src/models/subscription.js
@@ -100,7 +100,7 @@ Subscription.init({
     status: {
         type: DataTypes.SMALLINT(5).UNSIGNED,
         require: true,
-        defaultValue: 0,
+        defaultValue: NotificationStatusType.All,
     },
     iconStyle: {
         type: DataTypes.TEXT,

diff --git a/src/routes/api.js b/src/routes/api.js
@@ -336,6 +336,23 @@ router.post('/server/:guild_id/user/:user_id', async (req, res) => {
                 },
             });
             break;
+        case 'get_map_settings':
+            const guild = config.discord.guilds.find(x => x.id === guild_id);
+            if (!guild) {
+                // Failed to get guild map settings
+                return null;
+            }
+            res.json({
+                data: {
+                    start_lat: guild.startLat,
+                    start_lon: guild.startLon,
+                    start_zoom: guild.startZoom,
+                    min_zoom: config.map.minZoom,
+                    max_zoom: config.map.maxZoom,
+                    tileserver: config.map.tileserver,
+                },
+            });
+            break;
     }
 });
 

diff --git a/src/views/invasions/edit.mustache b/src/views/invasions/edit.mustache
@@ -77,5 +77,19 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", {{{cities}}});
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                {{{cities}}}
+            );
+        },
+    });
 </script>
diff --git a/src/views/invasions/new.mustache b/src/views/invasions/new.mustache
@@ -101,7 +101,20 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
 
     fetchLocations($('#server_selector').val(), '{{user_id}}', function(result) {
         for (const location of result.data.locations) {

diff --git a/src/views/locations/edit.mustache b/src/views/locations/edit.mustache
@@ -34,5 +34,20 @@
 <script type='text/javascript'>
     $('#guild_id').val(guildId);
     $('#server_selector').prop('disabled', true);
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", "{{location}}", "{{distance}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                "{{location}}",
+                "{{distance}}"
+            );
+        },
+    });
 </script>
diff --git a/src/views/locations/new.mustache b/src/views/locations/new.mustache
@@ -34,5 +34,18 @@
 <script type='text/javascript'>
     $('#guild_id').val(guildId);
     $('#server_selector').prop('disabled', true);
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
 </script>
diff --git a/src/views/lures/edit.mustache b/src/views/lures/edit.mustache
@@ -72,5 +72,19 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", {{{cities}}});
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                {{{cities}}}
+            );
+        },
+    });
 </script>
diff --git a/src/views/lures/new.mustache b/src/views/lures/new.mustache
@@ -76,7 +76,20 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
 
     fetchLocations($('#server_selector').val(), '{{user_id}}', function(result) {
         for (const location of result.data.locations) {

diff --git a/src/views/pokemon/edit.mustache b/src/views/pokemon/edit.mustache
@@ -131,5 +131,19 @@
     $('#iv_list').change(function() {
         $('#iv').prop('disabled', this.value.length > 0);
     });
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", {{{cities}}});
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                {{{cities}}}
+            );
+        },
+    });
 </script>
diff --git a/src/views/pokemon/new.mustache b/src/views/pokemon/new.mustache
@@ -154,7 +154,20 @@
     $('#iv_list').change(function() {
         $('#iv').prop('disabled', this.value.length > 0);
     });
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
 
     fetchLocations($('#server_selector').val(), '{{user_id}}', function(result) {
         for (const location of result.data.locations) {

diff --git a/src/views/pvp/edit.mustache b/src/views/pvp/edit.mustache
@@ -97,5 +97,19 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", {{{cities}}});
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                {{{cities}}}
+            );
+        },
+    });
 </script>
diff --git a/src/views/pvp/new.mustache b/src/views/pvp/new.mustache
@@ -124,7 +124,20 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
 
     fetchLocations($('#server_selector').val(), '{{user_id}}', function(result) {
         for (const location of result.data.locations) {

diff --git a/src/views/quests/edit.mustache b/src/views/quests/edit.mustache
@@ -72,5 +72,19 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", {{{cities}}});
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                {{{cities}}}
+            );
+        },
+    });
 </script>
diff --git a/src/views/quests/new.mustache b/src/views/quests/new.mustache
@@ -83,7 +83,20 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
 
     fetchLocations($('#server_selector').val(), '{{user_id}}', function(result) {
         for (const location of result.data.locations) {

diff --git a/src/views/raids/edit.mustache b/src/views/raids/edit.mustache
@@ -79,5 +79,19 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}", {{{cities}}});
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver,
+                {{{cities}}}
+            );
+        },
+    });
 </script>
diff --git a/src/views/raids/new.mustache b/src/views/raids/new.mustache
@@ -104,7 +104,20 @@
     if (guilds) {
         guilds.forEach(guild => guild.hidden = false);
     }
-    initMap([{{start_lat}}, {{start_lon}}], {{start_zoom}}, {{min_zoom}}, {{max_zoom}}, "{{{tileserver}}}");
+    $.ajax({
+        url: '/api/server/' + $('#server_selector').val() + '/user/{{user_id}}?type=get_map_settings',
+        method: 'POST',
+        type: 'json',
+        success: function(result) {
+            initMap(
+                [result.data.start_lat, result.data.start_lon],
+                result.data.start_zoom,
+                result.data.min_zoom,
+                result.data.max_zoom,
+                result.data.tileserver
+            );
+        },
+    });
     
     fetchLocations($('#server_selector').val(), '{{user_id}}', function(result) {
         for (const location of result.data.locations) {