DiscordBots/lilJudd
DiscordBots/lilJudd
1
0
Fork 1
Code Issues Pull requests Projects Releases 15 Packages Wiki Activity Actions

refactor: splatoon3ink api

Browse source 
Signed-off-by: moonleay <contact@moonleay.net>
This commit is contained in:
moonleay 2023-12-31 22:02:59 +01:00
parent d8753a8c1f
commit f3b28ac392
Signed by: moonleay
GPG key ID: 82667543CCD715FB
18 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt
View file

@ -16,9 +16,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api package net.moonleay.lilJudd.data.api.splatoon3ink
import net.moonleay.lilJudd.data.api.entry.schedule.ModeData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.ModeData
import net.moonleay.lilJudd.util.TimeUtil import net.moonleay.lilJudd.util.TimeUtil
object Splatoon3Api { object Splatoon3Api {

40
src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt
View file

@ -16,21 +16,21 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api package net.moonleay.lilJudd.data.api.splatoon3ink
import io.ktor.http.* import io.ktor.http.*
import kotlinx.serialization.json.* import kotlinx.serialization.json.*
import net.moonleay.lilJudd.data.api.entry.coop.CoopGearData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop.CoopGearData
import net.moonleay.lilJudd.data.api.entry.schedule.* import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.*
import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestColor import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestColor
import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestData
import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamData
import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamResults import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamResults
import net.moonleay.lilJudd.data.api.entry.splatnet.BrandData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.BrandData
import net.moonleay.lilJudd.data.api.entry.splatnet.GearAbilityData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.GearAbilityData
import net.moonleay.lilJudd.data.api.entry.splatnet.SplatnetItemData import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.SplatnetItemData
import net.moonleay.lilJudd.data.api.type.ApiDataType import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType
import net.moonleay.lilJudd.data.api.type.ApiRequestType import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType
import net.moonleay.lilJudd.util.Logger import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.NetUtil import net.moonleay.lilJudd.util.NetUtil
import net.moonleay.liljudd.build.BuildConstants import net.moonleay.liljudd.build.BuildConstants
@ -49,13 +49,14 @@ object Splatoon3ApiCache {
internal var cachedChallengesData = mutableListOf<ChallengeModeData>() internal var cachedChallengesData = mutableListOf<ChallengeModeData>()
internal var cachedShiftData = mutableListOf<ShiftData>() internal var cachedShiftData = mutableListOf<ShiftData>()
internal var cachedBigRunShiftData = mutableListOf<ShiftData>() internal var cachedBigRunShiftData = mutableListOf<ShiftData>()
internal var cachedCoopRewardsData = mutableListOf<CoopGearData>() internal var cachedCoopRewardsData =
mutableListOf<CoopGearData>()
internal var cachedSplatnetItemData = mutableListOf<SplatnetItemData>() internal var cachedSplatnetItemData = mutableListOf<SplatnetItemData>()
internal var cachedSplatnetLimitedItemData = mutableListOf<SplatnetItemData>() internal var cachedSplatnetLimitedItemData = mutableListOf<SplatnetItemData>()
internal lateinit var splatnetShopBrandData: BrandData internal lateinit var splatnetShopBrandData: BrandData
internal lateinit var splatnetShopNextBrandData: BrandData internal lateinit var splatnetShopNextBrandData: BrandData
fun updateData(dataType: ApiDataType, requestType: ApiRequestType) { fun updateData(dataType: ApiDataType, requestType: ApiRequestType) {
Logger.out("Updating data for $dataType with USER-AGENT: $user_agent") Logger.out("Updating data for $dataType with USER-AGENT: ${user_agent}")
Logger.out("Reason for update: $requestType") Logger.out("Reason for update: $requestType")
when (dataType) { when (dataType) {
ApiDataType.SCHEDULES -> { ApiDataType.SCHEDULES -> {
@ -225,11 +226,12 @@ object Splatoon3ApiCache {
val obj = it as JsonObject val obj = it as JsonObject
val imageURL = Url(obj.jsonObject["originalImage"]!!.jsonObject["url"]!!.jsonPrimitive.content) val imageURL = Url(obj.jsonObject["originalImage"]!!.jsonObject["url"]!!.jsonPrimitive.content)
val id = obj.jsonObject["vsStageId"]!!.jsonPrimitive.int val id = obj.jsonObject["vsStageId"]!!.jsonPrimitive.int
cachedMapData[id] = MapData( cachedMapData[id] =
id, MapData(
imageURL, id,
it.jsonObject["name"]!!.jsonPrimitive.content imageURL,
) it.jsonObject["name"]!!.jsonPrimitive.content
)
} }
Logger.out("Updated maplist data") Logger.out("Updated maplist data")
} catch (e: Exception) { } catch (e: Exception) {

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.coop package net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.schedule package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
data class ChallengeModeData( data class ChallengeModeData(
val leagueMatchEventId: String, val leagueMatchEventId: String,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.schedule package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.schedule package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
data class ModeData( data class ModeData(
val startTime: String, val startTime: String,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.schedule package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.schedule package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
data class TimePeriodData( data class TimePeriodData(
val startTime: String, val startTime: String,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.schedule package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatfest package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
data class SplatfestColor( data class SplatfestColor(
val a: Int, val a: Int,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatfest package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatfest package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
data class SplatfestTeamData( data class SplatfestTeamData(
val teamName: String, val teamName: String,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatfest package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
data class SplatfestTeamResults( data class SplatfestTeamResults(
val isWinner: Boolean, val isWinner: Boolean,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatnet package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatnet package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.entry.splatnet package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
import io.ktor.http.* import io.ktor.http.*

2
src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.type package net.moonleay.lilJudd.data.api.splatoon3ink.type
enum class ApiDataType { enum class ApiDataType {
SCHEDULES, SCHEDULES,

2
src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt → src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package net.moonleay.lilJudd.data.api.type package net.moonleay.lilJudd.data.api.splatoon3ink.type
enum class ApiRequestType(val nameToDisplay: String) { enum class ApiRequestType(val nameToDisplay: String) {
AUTOMATIC_CACHE_UPDATE("automatic request to update the cache"), AUTOMATIC_CACHE_UPDATE("automatic request to update the cache"),