1 files changed, 16 insertions, 2 deletions
diff --git a/storage.go b/storage.go
index 9a8b8fc..738826e 100644
--- a/storage.go
+++ b/storage.go
@@ -78,12 +78,26 @@ func (s *Storage) AddBattle(battle *Battle) error {
 	if err != nil {
 		return err
 	}
-	battle.Name = fmt.Sprintf("Battle in %s", system.Name)
+	battle.Name = fmt.Sprintf("Fight in %s", system.Name)
+	battle.StartTime = details.Time
+	battle.EndTime = details.Time
+	for _, km := range battle.Killmails[1:] {
+		details, err := GetKillmail(km.Id, km.Hash)
+		if err != nil {
+			return err
+		}
+		if battle.StartTime.After(details.Time) {
+			battle.StartTime = details.Time
+		}
+		if battle.EndTime.Before(details.Time) {
+			battle.EndTime = details.Time
+		}
+	}
+
 	data, err := json.Marshal(battle)
 	if err != nil {
 		return err
 	}
-
 	return ioutil.WriteFile(s.Path+"/battles/"+battle.Id, data, 0644)
 }