Merge branch 'main' into translations

HyacinthBots · Nov 28, 2024 · 69e4975 · 69e4975
2 parents 0991d15 + b4c3fd9
commit 69e4975
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 37 deletions.
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/LilyBot.kt b/src/main/kotlin/org/hyacinthbots/lilybot/LilyBot.kt
@@ -51,7 +51,6 @@ import org.hyacinthbots.lilybot.extensions.utility.commands.PublicUtilities
 import org.hyacinthbots.lilybot.extensions.utility.commands.Reminders
 import org.hyacinthbots.lilybot.extensions.utility.commands.RoleMenu
 import org.hyacinthbots.lilybot.extensions.utility.commands.StartupHooks
-import org.hyacinthbots.lilybot.extensions.utility.commands.StatusPing
 import org.hyacinthbots.lilybot.extensions.utility.commands.Tags
 import org.hyacinthbots.lilybot.extensions.utility.events.UtilityEvents
 import org.hyacinthbots.lilybot.internal.BuildInfo
@@ -174,7 +173,6 @@ suspend fun main() {
 			add(::Report)
 			add(::RoleMenu)
 			add(::StartupHooks)
-			add(::StatusPing)
 			add(::Tags)
 			add(::ThreadControl)
 			add(::UtilityEvents)

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/extensions/utility/commands/Reminders.kt b/src/main/kotlin/org/hyacinthbots/lilybot/extensions/utility/commands/Reminders.kt
@@ -38,6 +38,9 @@ import dev.kordex.core.utils.dm
 import dev.kordex.core.utils.scheduling.Scheduler
 import dev.kordex.core.utils.scheduling.Task
 import dev.kordex.core.utils.toDuration
+import io.github.oshai.kotlinlogging.KotlinLogging
+import io.ktor.client.HttpClient
+import io.ktor.client.request.post
 import kotlinx.datetime.Clock
 import kotlinx.datetime.DateTimePeriod
 import kotlinx.datetime.TimeZone
@@ -47,10 +50,17 @@ import org.hyacinthbots.lilybot.database.entities.ReminderData
 import org.hyacinthbots.lilybot.utils.botHasChannelPerms
 import org.hyacinthbots.lilybot.utils.fitsEmbedField
 import org.hyacinthbots.lilybot.utils.interval
+import org.hyacinthbots.lilybot.utils.statusEnv
 
 class Reminders : Extension() {
 	override val name = "reminders"
 
+	/** Logger for status ping. */
+	private val statusLogger = KotlinLogging.logger("Status ping")
+
+	/** Client for status ping. */
+	private val statusClient = HttpClient {}
+
 	/** The scheduler that will track the time for reminder posting. */
 	private val reminderScheduler = Scheduler()
 
@@ -467,6 +477,13 @@ class Reminders : Extension() {
 	 * @since 4.2.0
 	 */
 	private suspend fun postReminders() {
+		// Start status ping
+
+		// Doing this status ping in here as this is an already running scheduler and can easily have this added
+		// to avoid duplicating the scheduler. This should always ping if the bots up too so why make another
+		statusLogger.debug { "Pinging!" }
+		statusClient.post(statusEnv)
+		// End status ping
 		val reminders = ReminderCollection().getAllReminders()
 		val dueReminders =
 			reminders.filter { it.remindTime.toEpochMilliseconds() - Clock.System.now().toEpochMilliseconds() <= 0 }

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/extensions/utility/commands/StatusPing.kt b/src/main/kotlin/org/hyacinthbots/lilybot/extensions/utility/commands/StatusPing.kt
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/utils/_Constants.kt b/src/main/kotlin/org/hyacinthbots/lilybot/utils/_Constants.kt
@@ -22,4 +22,7 @@ val SENTRY_DSN = envOrNull("SENTRY_DSN")
 /** The environment the bot is being run in. production or development. */
 val ENVIRONMENT = env("ENVIRONMENT")
 
+/** URL to ping to indicate uptime.*/
+val statusEnv = env("STATUS_URL")
+
 const val HYACINTH_GITHUB: String = "https://github.com/HyacinthBots"