Update to rc7

CHANGELOG.md

@@ -10,7 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [2021-01-28] Add average cache hitrate panel [@_tde9]
 
 ### Changed
-- [2021-01-29] Add HikariCP connection pool [@carbotaniuman].
 
 ### Deprecated
 
@@ -21,6 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [2.0.0-rc7] - 2021-01-31
+### Changed
+- [2021-01-29] Add HikariCP connection pool [@carbotaniuman].
+
 ## [2.0.0-rc6] - 2021-01-28
 ### Fixed
 - [2021-01-27] Upped max Apache threadpool size [@carbotaniuman].
@@ -321,7 +324,8 @@ This release contains many breaking changes! Of note are the changes to the cach
 ### Fixed
 - [2020-06-11] Tweaked logging configuration to reduce log file sizes by [@carbotaniuman].
 
-[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc6...HEAD
+[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc7...HEAD
+[2.0.0-rc6]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc6...2.0.0-rc7
 [2.0.0-rc6]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc5...2.0.0-rc6
 [2.0.0-rc5]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc4...2.0.0-rc5
 [2.0.0-rc4]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc3...2.0.0-rc4

src/main/kotlin/mdnet/Constants.kt

@@ -21,7 +21,7 @@ package mdnet
 import java.time.Duration
 
 object Constants {
-    const val CLIENT_BUILD = 24
+    const val CLIENT_BUILD = 25
 
     @JvmField val MAX_AGE_CACHE: Duration = Duration.ofDays(14)
 

src/main/kotlin/mdnet/server/ImageServer.kt

@@ -250,7 +250,7 @@ fun getServer(
     val verifier = tokenVerifier(
         tokenKey = remoteSettings.tokenKey,
         shouldVerify = { chapter, _ ->
-            !remoteSettings.forceDisableTokens && !(chapter == "1b682e7b24ae7dbdc5064eeeb8e8e353" || chapter == "8172a46adc798f4f4ace6663322a383e")
+            !remoteSettings.disableTokens && !(chapter == "1b682e7b24ae7dbdc5064eeeb8e8e353" || chapter == "8172a46adc798f4f4ace6663322a383e")
         }
     )
 

src/main/kotlin/mdnet/settings/PingResult.kt

@@ -39,7 +39,7 @@ data class RemoteSettings(
     @field:Secret val tokenKey: ByteArray,
     val compromised: Boolean,
     val paused: Boolean,
-    val forceDisableTokens: Boolean = false,
+    val disableTokens: Boolean = false,
     val tls: TlsCert?
 ) : PingResult() {
     override fun equals(other: Any?): Boolean {
@@ -54,7 +54,7 @@ data class RemoteSettings(
         if (!tokenKey.contentEquals(other.tokenKey)) return false
         if (compromised != other.compromised) return false
         if (paused != other.paused) return false
-        if (forceDisableTokens != other.forceDisableTokens) return false
+        if (disableTokens != other.disableTokens) return false
         if (tls != other.tls) return false
 
         return true
@@ -67,7 +67,7 @@ data class RemoteSettings(
         result = 31 * result + tokenKey.contentHashCode()
         result = 31 * result + compromised.hashCode()
         result = 31 * result + paused.hashCode()
-        result = 31 * result + forceDisableTokens.hashCode()
+        result = 31 * result + disableTokens.hashCode()
         result = 31 * result + (tls?.hashCode() ?: 0)
         return result
     }