Merge pull request #104 from UnownHash/small-fixes

small fixes
UnownHash · Apr 15, 2023 · 5f1b50f · 5f1b50f
2 parents 9a729d3 + d165050
commit 5f1b50f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/db/pokestop.go b/db/pokestop.go
@@ -111,7 +111,7 @@ func GetQuestStatus(db DbDetails, fence geo.Geofence) (QuestStatus, error) {
 		"SELECT COUNT(*) AS total, "+
 			"COUNT(CASE WHEN quest_type IS NOT NULL THEN 1 END) AS ar_quests, "+
 			"COUNT(CASE WHEN alternative_quest_type IS NOT NULL THEN 1 END) AS no_ar_quests FROM pokestop "+
-			"WHERE lat > ? AND lon > ? AND lat < ? AND lon < ? AND enabled = 1 "+
+			"WHERE lat > ? AND lon > ? AND lat < ? AND lon < ? AND enabled = 1 AND deleted = 0 "+
 			"AND ST_CONTAINS(ST_GEOMFROMTEXT('POLYGON(("+fence.ToPolygonString()+"))'), point(lat,lon)) ",
 		bbox.MinimumLatitude, bbox.MinimumLongitude, bbox.MaximumLatitude, bbox.MaximumLongitude,
 	)

diff --git a/decoder/incident.go b/decoder/incident.go
@@ -232,6 +232,8 @@ func (incident *Incident) updateFromOpenInvasionCombatSessionOut(protoRes *pogo.
 }
 
 func (incident *Incident) updateFromStartIncidentOut(proto *pogo.StartIncidentOutProto) {
-	incident.Character = int16(proto.Incident.Step[0].GetInvasionBattle().GetCharacter())
+	incident.Character = int16(proto.GetIncident().GetStep()[0].GetPokestopDialogue().GetDialogueLine()[0].GetCharacter())
 	incident.Confirmed = true
+	incident.StartTime = int64(proto.Incident.GetCompletionDisplay().GetIncidentStartMs() / 1000)
+	incident.ExpirationTime = int64(proto.Incident.GetCompletionDisplay().GetIncidentExpirationMs() / 1000)
 }