Backend: Add Minister to MayorAPI (#2313)

2 files changed, 13 insertions, 0 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
index c484f4071..53539adb4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt
@@ -86,6 +86,8 @@ object MayorAPI {
 
     var currentMayor: Mayor? = null
         private set
+    var currentMinister: Mayor? = null
+        private set
     private var lastMayor: Mayor? = null
     var jerryExtraMayor: Pair<Mayor?, SimpleTimeMark> = null to SimpleTimeMark.farPast()
         private set
@@ -216,6 +218,7 @@ object MayorAPI {
             val currentMayorName = data.mayor.name
             if (lastMayor?.name != currentMayorName) {
                 currentMayor = setAssumeMayorJson(currentMayorName, data.mayor.perks)
+                currentMinister = setAssumeMayorJson(data.mayor.minister.name, data.mayor.minister.perk)
             }
         }
     }
@@ -246,6 +249,8 @@ object MayorAPI {
             add("Active Perks: ${currentMayor?.activePerks}")
             add("Last Update: $lastUpdate (${lastUpdate.passedSince()} ago)")
             add("Time Till Next Mayor: ${nextMayorTimestamp.timeUntil()}")
+            add("Current Minister: ${currentMinister?.name ?: "Unknown"}")
+            add("Current Minister Perk: ${currentMinister?.activePerks}")
             if (jerryExtraMayor.first != null) {
                 add("Jerry Mayor: ${jerryExtraMayor.first?.name} expiring at: ${jerryExtraMayor.second.timeUntil()}")
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
index d8f0df279..f54c7daf4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/MayorJson.kt
@@ -11,6 +11,7 @@ data class MayorInfo(
     @Expose val key: String,
     @Expose val name: String,
     @Expose val perks: List<MayorPerk>,
+    @Expose val minister: Minister,
     @Expose val election: MayorElection,
 )
 
@@ -26,7 +27,14 @@ data class MayorCandidate(
     @Expose val votes: Int,
 )
 
+data class Minister(
+    @Expose val key: String,
+    @Expose val name: String,
+    @Expose val perk: List<MayorPerk>,
+)
+
 data class MayorPerk(
     @Expose val name: String,
     @Expose val description: String,
+    @Expose val minister: Boolean = false,
 )