Misc fixes

Author: Mygod

src/models/incident.js

@@ -51,7 +51,6 @@ class Incident extends Model {
                 longitude: pokestop.lon,
                 pokestop_name: pokestop.name || oldPokestop && oldPokestop.name || "Unknown",
                 url: pokestop.url || oldPokestop && oldPokestop.url,
-                lure_expiration: pokestop.lureExpireTimestamp || 0,
                 last_modified: pokestop.lastModifiedTimestamp || 0,
                 enabled: pokestop.enabled || true,
                 lure_id: pokestop.lureId || 0,

src/models/pokestop.js

@@ -309,13 +309,13 @@ class Pokestop extends Model {
                 if (this.lureExpireTimestamp !== 0) {
                     if (oldPokestop.lureId === this.lureId && (oldPokestop.lureExpireTimestamp === null ||
                         oldPokestop.lureExpireTimestamp >= this.updated)) {
-                        this.lureFirstSeenTimestamp = oldPokestop.firstSeenTimestamp;
+                        this.lureFirstSeenTimestamp = oldPokestop.lureFirstSeenTimestamp;
                         this.lureExpireTimestamp = oldPokestop.lureExpireTimestamp;
                     } else {
                         WebhookController.instance.addLureEvent(this.toJson('lure', oldPokestop));
                     }
                 }
-            } else {
+            } else if (this.lureExpireTimestamp !== 0) {
                 this.lureExpireTimestamp = this.estimateLureExpireLegacy(
                     oldPokestop.lureExpireTimestamp > 0 && this.lureId === oldPokestop.lureId
                         ? oldPokestop.lureExpireTimestamp - Pokestop.LureTime : this.lastModifiedTimestamp);