aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-10-06 23:50:57 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-10-06 23:50:57 +0200
commitdc2ea3ff0b449489ee32bf066b9c8854791f5d86 (patch)
treea82d23c24572a348ac7028ebfc6f88fe9074b519 /src/main/java
parentc4077a9aa597ddec23f8d4649c07f6615d0ecfc2 (diff)
downloadskyhanni-dc2ea3ff0b449489ee32bf066b9c8854791f5d86.tar.gz
skyhanni-dc2ea3ff0b449489ee32bf066b9c8854791f5d86.tar.bz2
skyhanni-dc2ea3ff0b449489ee32bf066b9c8854791f5d86.zip
added support for custom_message
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
index 0fe893723..41d0f701c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RepoErrorData.kt
@@ -11,6 +11,7 @@ data class RepoErrorData(
@Expose @SerializedName("message_exact") private var rawMessageExact: List<String>?,
@Expose @SerializedName("message_starts_with") private var rawMessageStartsWith: List<String>?,
@Expose @SerializedName("replace_message") var replaceMessage: String?,
+ @Expose @SerializedName("custom_message") var customMessage: String?,
@Expose @SerializedName("affected_versions") var affectedVersions: List<String> = listOf(),
) {
val messageExact get() = rawMessageExact ?: emptyList()
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index fecdb6cdd..25b485c5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -190,6 +190,10 @@ object ErrorManager {
finalMessage = it
hideError = false
}
+ repoError.customMessage?.let {
+ ChatUtils.userError(it)
+ return null
+ }
break
}
}