Hide quests if older than last midnight

Pokekeqz · Feb 13, 2019 · e330f3a · e330f3a
1 parent b52913f
commit e330f3a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,8 +38,6 @@ config/*
 cron/*
 !cron/example.PMSF
 !cron/nest_cron.php
-!cron/quest_cron.php
-!cron/quest_rdm_cron.php
 !cron/raid_cron.php
 !cron/silph.php
 /static/dist/

diff --git a/README.md b/README.md
@@ -33,11 +33,6 @@ $fork = "default" OR $fork = "beta";
 
 * MAD Map a Droid 
 ```
-Free version:
-$map = "monocle";
-$fork = "pmsf";
-
-MITM version:
 $map = "monocle";
 $fork = "mad";
 

diff --git a/cron/quest_cron.php b/cron/quest_cron.php
diff --git a/cron/quest_rdm_cron.php b/cron/quest_rdm_cron.php
diff --git a/static/js/map.js b/static/js/map.js
@@ -1145,13 +1145,16 @@ function pokestopLabel(item) {
         '<center>' + '<div class="pokestop-label">' +
         '<b>' + item['pokestop_name'] + '</b>' +
         '</div>'
-    if (!noQuests && item['quest_type'] !== 0) {
+    var d = new Date()
+    var lastMidnight = d.setHours(0,0,0,0) / 1000
+    if (!noQuests && item['quest_type'] !== null && lastMidnight < Number(item['quest_timestamp'])) {
         str +=
             '<div><center>' +
             '<img height="70px" style="padding: 5px;" src="static/forts/Pstop-quest-large.png">' +
             stopImage +
             getReward(item) +
-            '</center></div>'
+            '</center></div>' +
+            getQuest(item)
     } else {
         str =
             '<div class="pokestop-label">' +
@@ -1166,9 +1169,6 @@ function pokestopLabel(item) {
             '</center>' +
             '</div>'
     }
-    if (!noQuests && item['quest_type'] !== 0) {
-        str += getQuest(item)
-    }
     if (!noDeletePokestops) {
         str += '<i class="fa fa-trash-o delete-pokestop" onclick="deletePokestop(event);" data-id="' + item['pokestop_id'] + '"></i>'
     }
@@ -1691,7 +1691,9 @@ function updateGymIcons() {
 function getPokestopMarkerIcon(item) {
     var stopMarker = ''
     var html = ''
-    if (!noQuests && item['quest_reward_type'] !== null) {
+    var d = new Date()
+    var lastMidnight = d.setHours(0,0,0,0) / 1000
+    if (!noQuests && item['quest_reward_type'] !== null && lastMidnight < Number(item['quest_timestamp'])) {
         if (item['quest_reward_type'] === 7) {
             var pokemonIdStr = ''
             if (item['quest_pokemon_id'] <= 9) {
@@ -1774,12 +1776,8 @@ function getPokestopMarkerIcon(item) {
 function setupPokestopMarker(item) {
     var pokestopMarkerIcon = getPokestopMarkerIcon(item)
     var marker
-    if (!noQuests && item['quest_reward_type'] !== null) {
-        if (item['quest_pokemon_shiny'] === 'true') {
-            marker = L.marker([item['latitude'], item['longitude']], {icon: pokestopMarkerIcon, zIndexOffset: 1050}).bindPopup(pokestopLabel(item), {className: 'leaflet-popup-content-wrapper shiny', autoPan: false, closeOnClick: false, autoClose: false})
-        } else {
-            marker = L.marker([item['latitude'], item['longitude']], {icon: pokestopMarkerIcon, zIndexOffset: 1050}).bindPopup(pokestopLabel(item), {className: 'leaflet-popup-content-wrapper normal', autoPan: false, closeOnClick: false, autoClose: false})
-        }
+    if (item['quest_pokemon_shiny'] === 'true') {
+        marker = L.marker([item['latitude'], item['longitude']], {icon: pokestopMarkerIcon, zIndexOffset: 1050}).bindPopup(pokestopLabel(item), {className: 'leaflet-popup-content-wrapper shiny', autoPan: false, closeOnClick: false, autoClose: false})
     } else {
         marker = L.marker([item['latitude'], item['longitude']], {icon: pokestopMarkerIcon, zIndexOffset: 1050}).bindPopup(pokestopLabel(item), {className: 'leaflet-popup-content-wrapper normal', autoPan: false, closeOnClick: false, autoClose: false})
     }