diff --git a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt index fcdc5e6..9dba1b2 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2024 moonleay + * Copyright (C) 2023 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,9 +32,9 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import net.moonleay.lilJudd.buttons.component.EditButtonManager import net.moonleay.lilJudd.data.CredentialManager -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3ApiCache -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType +import net.moonleay.lilJudd.data.api.Splatoon3ApiCache +import net.moonleay.lilJudd.data.api.type.ApiDataType +import net.moonleay.lilJudd.data.api.type.ApiRequestType import net.moonleay.lilJudd.data.database.DB import net.moonleay.lilJudd.extensions.* import net.moonleay.lilJudd.features.AvailabilityManager @@ -74,11 +74,6 @@ object Bot { exitProcess(3) } - if (CredentialManager.apiDomain == "empty" || CredentialManager.apiToken == "empty") { - Logger.out("The config does not contain the whole API credentials.") - exitProcess(3) - } - // Connect to the database DB.connect( CredentialManager.dbDomain, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt b/src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt index e406414..0320d82 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/CredentialManager.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2024 moonleay + * Copyright (C) 2023 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +29,6 @@ object CredentialManager { lateinit var dbName: String lateinit var dbUser: String lateinit var dbPassword: String - lateinit var apiDomain: String - lateinit var apiToken: String ///Load the needed credentials, generate a config if there is none fun load() { @@ -53,8 +51,6 @@ object CredentialManager { dbName = prop.getProperty("dbName") dbUser = prop.getProperty("dbUser") dbPassword = prop.getProperty("dbPassword") - apiDomain = prop.getProperty("apiDomain") - apiToken = prop.getProperty("apiToken") input.close() } catch (e: IOException) { e.printStackTrace() @@ -87,8 +83,6 @@ object CredentialManager { prop.setProperty("dbName", "empty") prop.setProperty("dbUser", "empty") prop.setProperty("dbPassword", "empty") - prop.setProperty("apiDomain", "empty") - prop.setProperty("apiToken", "empty") prop.store(output, null) output.close() diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt similarity index 97% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt index 8f097c3..92ad889 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink +package net.moonleay.lilJudd.data.api -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.ModeData +import net.moonleay.lilJudd.data.api.entry.schedule.ModeData import net.moonleay.lilJudd.util.TimeUtil object Splatoon3Api { diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt similarity index 95% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt index 30a9129..daba96d 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink +package net.moonleay.lilJudd.data.api import io.ktor.http.* import kotlinx.serialization.json.* -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop.CoopGearData -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.* -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestColor -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestData -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamData -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamResults -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.BrandData -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.GearAbilityData -import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.SplatnetItemData -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType +import net.moonleay.lilJudd.data.api.entry.coop.CoopGearData +import net.moonleay.lilJudd.data.api.entry.schedule.* +import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestColor +import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestData +import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamData +import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamResults +import net.moonleay.lilJudd.data.api.entry.splatnet.BrandData +import net.moonleay.lilJudd.data.api.entry.splatnet.GearAbilityData +import net.moonleay.lilJudd.data.api.entry.splatnet.SplatnetItemData +import net.moonleay.lilJudd.data.api.type.ApiDataType +import net.moonleay.lilJudd.data.api.type.ApiRequestType import net.moonleay.lilJudd.util.Logger import net.moonleay.lilJudd.util.NetUtil import net.moonleay.liljudd.build.BuildConstants @@ -49,14 +49,13 @@ object Splatoon3ApiCache { internal var cachedChallengesData = mutableListOf() internal var cachedShiftData = mutableListOf() internal var cachedBigRunShiftData = mutableListOf() - internal var cachedCoopRewardsData = - mutableListOf() + internal var cachedCoopRewardsData = mutableListOf() internal var cachedSplatnetItemData = mutableListOf() internal var cachedSplatnetLimitedItemData = mutableListOf() internal lateinit var splatnetShopBrandData: BrandData internal lateinit var splatnetShopNextBrandData: BrandData 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") when (dataType) { ApiDataType.SCHEDULES -> { @@ -226,12 +225,11 @@ object Splatoon3ApiCache { val obj = it as JsonObject val imageURL = Url(obj.jsonObject["originalImage"]!!.jsonObject["url"]!!.jsonPrimitive.content) val id = obj.jsonObject["vsStageId"]!!.jsonPrimitive.int - cachedMapData[id] = - MapData( - id, - imageURL, - it.jsonObject["name"]!!.jsonPrimitive.content - ) + cachedMapData[id] = MapData( + id, + imageURL, + it.jsonObject["name"]!!.jsonPrimitive.content + ) } Logger.out("Updated maplist data") } catch (e: Exception) { diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt index 817a80a..4f46642 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop +package net.moonleay.lilJudd.data.api.entry.coop import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt index 87efd9d..c288fe9 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule +package net.moonleay.lilJudd.data.api.entry.schedule data class ChallengeModeData( val leagueMatchEventId: String, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt index b64755d..422783c 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule +package net.moonleay.lilJudd.data.api.entry.schedule import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt index c3ad3dc..8295a1a 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule +package net.moonleay.lilJudd.data.api.entry.schedule data class ModeData( val startTime: String, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt index f6f29f1..a4d28ae 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule +package net.moonleay.lilJudd.data.api.entry.schedule import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt index dc66844..53edb96 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule +package net.moonleay.lilJudd.data.api.entry.schedule data class TimePeriodData( val startTime: String, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt index 025ef87..997a24b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule +package net.moonleay.lilJudd.data.api.entry.schedule import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt index 9f61bd7..391ccb3 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest +package net.moonleay.lilJudd.data.api.entry.splatfest data class SplatfestColor( val a: Int, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt index fb11b19..f52b9b4 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest +package net.moonleay.lilJudd.data.api.entry.splatfest import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt index b29ee85..9ea2e72 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest +package net.moonleay.lilJudd.data.api.entry.splatfest data class SplatfestTeamData( val teamName: String, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt index ff7b531..4888adc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest +package net.moonleay.lilJudd.data.api.entry.splatfest data class SplatfestTeamResults( val isWinner: Boolean, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt index 2c80240..6781172 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet +package net.moonleay.lilJudd.data.api.entry.splatnet import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt similarity index 92% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt index 81f2ee7..713d946 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet +package net.moonleay.lilJudd.data.api.entry.splatnet import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt index 72268dd..43df20b 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet +package net.moonleay.lilJudd.data.api.entry.splatnet import io.ktor.http.* diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/liljudd/LilJuddApi.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/liljudd/LilJuddApi.kt deleted file mode 100644 index d6379fa..0000000 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/liljudd/LilJuddApi.kt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * lilJudd - * Copyright (C) 2024 moonleay - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.moonleay.lilJudd.data.api.liljudd - -import net.moonleay.lilJudd.data.CredentialManager - -object LilJuddApi { - val CONFIG_BASE = "${CredentialManager.apiDomain}/config/" - val MATCH_BASE = "${CredentialManager.apiDomain}/match/" - val TIMEPLANNINGMESSAGES_BASE = "${CredentialManager.apiDomain}/tp_messages/" - - // GET https://liljudd.ink/api/config// - // DELETE https://liljudd.ink/api/config// - // GET https://liljudd.ink/api/tp_messages// - // PUT https://liljudd.ink/api/tp_messages// - // POST https://liljudd.ink/api/match/// - // PUT https://liljudd.ink/api/match//// - // GET https://liljudd.ink/api/match// - -} diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt similarity index 93% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt index 7cb7361..7123b0d 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.type +package net.moonleay.lilJudd.data.api.type enum class ApiDataType { SCHEDULES, diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt similarity index 94% rename from src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt rename to src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt index 03a9add..da20371 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.moonleay.lilJudd.data.api.splatoon3ink.type +package net.moonleay.lilJudd.data.api.type enum class ApiRequestType(val nameToDisplay: String) { AUTOMATIC_CACHE_UPDATE("automatic request to update the cache"), diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiFestivalAndCoopUpdateScheduler.kt b/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiFestivalAndCoopUpdateScheduler.kt index 07f4a4b..ff299fc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiFestivalAndCoopUpdateScheduler.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiFestivalAndCoopUpdateScheduler.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2024 moonleay + * Copyright (C) 2023 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ package net.moonleay.lilJudd.jobs import dev.inmo.krontab.KronScheduler import kotlinx.coroutines.Job -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3ApiCache -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType +import net.moonleay.lilJudd.data.api.Splatoon3ApiCache +import net.moonleay.lilJudd.data.api.type.ApiDataType +import net.moonleay.lilJudd.data.api.type.ApiRequestType import net.moonleay.lilJudd.jobs.component.CronjobType import net.moonleay.lilJudd.jobs.component.ICronjob import net.moonleay.lilJudd.util.Logger diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt b/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt index 2a47939..5c38b15 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiScheduleUpdateScheduler.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2024 moonleay + * Copyright (C) 2023 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ package net.moonleay.lilJudd.jobs import dev.inmo.krontab.KronScheduler import kotlinx.coroutines.Job -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3ApiCache -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType +import net.moonleay.lilJudd.data.api.Splatoon3ApiCache +import net.moonleay.lilJudd.data.api.type.ApiDataType +import net.moonleay.lilJudd.data.api.type.ApiRequestType import net.moonleay.lilJudd.jobs.component.CronjobType import net.moonleay.lilJudd.jobs.component.ICronjob import net.moonleay.lilJudd.util.Logger diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiSplatnetGearUpdateScheduler.kt b/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiSplatnetGearUpdateScheduler.kt index 7bbc020..51048f2 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiSplatnetGearUpdateScheduler.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/jobs/Splatoon3ApiSplatnetGearUpdateScheduler.kt @@ -1,6 +1,6 @@ /* * lilJudd - * Copyright (C) 2024 moonleay + * Copyright (C) 2023 moonleay * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ package net.moonleay.lilJudd.jobs import dev.inmo.krontab.KronScheduler import kotlinx.coroutines.Job -import net.moonleay.lilJudd.data.api.splatoon3ink.Splatoon3ApiCache -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType -import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType +import net.moonleay.lilJudd.data.api.Splatoon3ApiCache +import net.moonleay.lilJudd.data.api.type.ApiDataType +import net.moonleay.lilJudd.data.api.type.ApiRequestType import net.moonleay.lilJudd.jobs.component.CronjobType import net.moonleay.lilJudd.jobs.component.ICronjob import net.moonleay.lilJudd.util.Logger