Removing some now unused and deprecated code

DreamExposure · Apr 11, 2024 · cf9e6ad · cf9e6ad
1 parent 7cfe966
commit cf9e6ad
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 61 deletions.
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/cache/DiscalCache.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/cache/DiscalCache.kt
@@ -2,16 +2,13 @@ package org.dreamexposure.discal.core.cache
 
 import discord4j.common.util.Snowflake
 import org.dreamexposure.discal.core.entities.Calendar
-import org.dreamexposure.discal.core.`object`.GuildSettings
 import reactor.core.publisher.Flux
 import java.time.Duration
 import java.util.concurrent.ConcurrentHashMap
 
 //TODO: Eventually use redis instead of in-memory so these can be shared across the whole discal network and need less time for eventual consistency.
 @Deprecated("Use proper caching impl")
 object DiscalCache {
-    //guild id -> settings
-    val guildSettings: MutableMap<Snowflake, GuildSettings> = ConcurrentHashMap()
     //guild id -> cal num -> calendar
     private val calendars: MutableMap<Snowflake, ConcurrentHashMap<Int, Calendar>> = ConcurrentHashMap()
 
@@ -24,7 +21,6 @@ object DiscalCache {
 
 
     fun invalidateAll() {
-        guildSettings.clear()
         calendars.clear()
     }
 

diff --git a/.../src/main/kotlin/org/dreamexposure/discal/core/enums/announcement/AnnouncementModifier.kt b/.../src/main/kotlin/org/dreamexposure/discal/core/enums/announcement/AnnouncementModifier.kt
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/enums/announcement/AnnouncementType.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/enums/announcement/AnnouncementType.kt
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/extensions/discord4j/Member.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/extensions/discord4j/Member.kt
@@ -2,10 +2,6 @@ package org.dreamexposure.discal.core.extensions.discord4j
 
 import discord4j.core.`object`.entity.Member
 import discord4j.rest.entity.RestMember
-import discord4j.rest.util.PermissionSet
-import java.util.function.Predicate
-
-fun Member.hasPermissions(pred: Predicate<PermissionSet>) = getRestMember().hasPermissions(pred)
 
 fun Member.hasElevatedPermissions() = getRestMember().hasElevatedPermissions()
 

diff --git a/server/src/main/kotlin/org/dreamexposure/discal/server/network/dbotsgg/UpdateDBotsData.kt b/server/src/main/kotlin/org/dreamexposure/discal/server/network/dbotsgg/UpdateDBotsData.kt
@@ -1,5 +1,6 @@
 package org.dreamexposure.discal.server.network.dbotsgg
 
+import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.dreamexposure.discal.core.config.Config
@@ -19,6 +20,7 @@ import java.time.Duration
 @ConditionalOnProperty("bot.integrations.update-bot-sites", havingValue = "true")
 class UpdateDBotsData(
     private val networkManager: NetworkManager,
+    private val httpClient: OkHttpClient
 ) : ApplicationRunner {
     private val token = Config.SECRET_INTEGRATION_D_BOTS_GG_TOKEN.getString()
 
@@ -36,7 +38,7 @@ class UpdateDBotsData(
                 .header("Content-Type", "application/json")
                 .build()
 
-            GlobalVal.HTTP_CLIENT.newCall(request).execute()
+            httpClient.newCall(request).execute()
         }.doOnNext { response ->
             if (response.code != GlobalVal.STATUS_SUCCESS) {
                 LOGGER.debug("Failed to update DBots.gg stats | Body: ${response.body?.string()}")

diff --git a/server/src/main/kotlin/org/dreamexposure/discal/server/utils/Authentication.kt b/server/src/main/kotlin/org/dreamexposure/discal/server/utils/Authentication.kt
@@ -95,7 +95,7 @@ object Authentication {
                 }
             }
         } else {
-            LOGGER.debug(DEFAULT, "Attempted to use API without auth | ${swe.request.remoteAddress}")
+            LOGGER.debug(DEFAULT, "Attempted to use API without auth | {}", swe.request.remoteAddress)
 
             return Mono.just(AuthenticationState(false)
                     .status(GlobalVal.STATUS_BAD_REQUEST)

diff --git a/web/src/main/kotlin/org/dreamexposure/discal/web/network/discord/DiscordLoginHandler.kt b/web/src/main/kotlin/org/dreamexposure/discal/web/network/discord/DiscordLoginHandler.kt
@@ -5,10 +5,10 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.dreamexposure.discal.core.config.Config
-import org.dreamexposure.discal.core.enums.announcement.AnnouncementType
 import org.dreamexposure.discal.core.enums.event.EventColor
 import org.dreamexposure.discal.core.enums.time.GoodTimezone
 import org.dreamexposure.discal.core.logger.LOGGER
+import org.dreamexposure.discal.core.`object`.new.Announcement
 import org.dreamexposure.discal.core.`object`.web.WebPartialGuild
 import org.dreamexposure.discal.core.utils.GlobalVal
 import org.dreamexposure.discal.web.handler.DiscordAccountHandler
@@ -96,9 +96,9 @@ class DiscordLoginHandler(
                             //Saving session and access info into memory...
                             val model = accountHandler.createDefaultModel()
                             model["logged_in"] = true
-                            model["good_timezones"] = GoodTimezone.values()
-                            model["announcement_types"] = AnnouncementType.values()
-                            model["event_colors"] = EventColor.values()
+                            model["good_timezones"] = GoodTimezone.entries
+                            model["announcement_types"] = Announcement.Type.entries
+                            model["event_colors"] = EventColor.entries
 
                             //User info
                             model["id"] = userInfo.getString("id")