Merge pull request #166 from 0x2142/fix-topscore-in-notifs

fix issue with score percent in notifs being 0%

events/events.go

@@ -11,6 +11,12 @@ import (
 
 // processEvent handles preparing event for alerting
 func processEvent(event models.Event) {
+	// For events collected via API, top-level top_score value is no longer used
+	// So need to replace it with data.top_score value
+	if event.TopScore == 0 {
+		event.TopScore = event.Data.TopScore
+	}
+
 	// Convert to human-readable timestamp
 	eventTime := time.Unix(int64(event.StartTime), 0)
 	log.Info().

events/filters.go

@@ -87,12 +87,6 @@ func checkFilters(event models.Event) bool {
 		return false
 	}
 
-	// For Web API query, top-level top_score value is no longer used
-	// So need to replace it with data.top_score value
-	if event.TopScore == 0 {
-		event.TopScore = event.Data.TopScore
-	}
-
 	// Check label score
 	if !aboveMinScore(event.ID, event.TopScore) {
 		return false

events/reviews.go

@@ -55,16 +55,23 @@ func processReview(review models.Review) {
 		var detection models.Event
 		json.Unmarshal(response, &detection)
 
-		// Store first detection for this review, alerts will be based on this event's data
-		if firstDetection.ID == "" {
-			firstDetection = detection
+		// For events collected via API, top-level top_score value is no longer used
+		// So need to replace it with data.top_score value
+		if detection.TopScore == 0 {
+			detection.TopScore = detection.Data.TopScore
 		}
+
 		// Check that event passes configured filters
 		detection.CurrentZones = detection.Zones
 		if !checkFilters(detection) {
 			reviewFiltered = true
 			break
 		}
+
+		// Store first detection for this review, alerts will be based on this event's data
+		if firstDetection.ID == "" {
+			firstDetection = detection
+		}
 	}
 	// If any detection would be filtered, skip notifying on this review
 	if reviewFiltered {