From cc397f4b073c99ffd49dd52a365c6c2297e1942a Mon Sep 17 00:00:00 2001 From: moonleay Date: Sun, 15 Oct 2023 22:24:35 +0200 Subject: [PATCH 1/2] feat: added Logger output Signed-off-by: moonleay --- src/main/kotlin/net/moonleay/rssbot/Bot.kt | 1 - src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt | 4 +++- src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/net/moonleay/rssbot/Bot.kt b/src/main/kotlin/net/moonleay/rssbot/Bot.kt index 3800f31..20dab12 100644 --- a/src/main/kotlin/net/moonleay/rssbot/Bot.kt +++ b/src/main/kotlin/net/moonleay/rssbot/Bot.kt @@ -89,7 +89,6 @@ object Bot { FeedUpdater.update(true) } - //Start the bot bot.start() } diff --git a/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt b/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt index 810175c..2b36353 100644 --- a/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt +++ b/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt @@ -80,8 +80,10 @@ object FeedUpdater : ICronjob { data.id ) ) || TimeUtil.getUnixTimeFromStamp(rssData.pubDate!!) < data.subscriptionTimestamp - ) + ) { + Logger.out("Skipping ${rssData.guid} because it already exists or is too old") continue + } val channel = Bot.bot.kordRef.getChannel(Snowflake(data.channelId))!!.asChannelOf() channel.createMessage { this.embeds.add( diff --git a/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt b/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt index 416d3a6..644d0c0 100644 --- a/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt +++ b/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt @@ -25,6 +25,8 @@ import java.time.format.DateTimeFormatter object TimeUtil { fun getUnixTimeFromStamp(input: String): Long { // Pattern: Sun, 15 Oct 2023 11:04:57 GMT val formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z") - return ZonedDateTime.parse(input, formatter).toEpochSecond() * 1000 + val result = ZonedDateTime.parse(input, formatter).toEpochSecond() * 1000 + Logger.out("Converted $input to $result") + return result } } From c3c6e9c9ee26a937c8edc1c65eea805eeeaddc44 Mon Sep 17 00:00:00 2001 From: moonleay Date: Sun, 15 Oct 2023 22:25:06 +0200 Subject: [PATCH 2/2] chore: bump version Signed-off-by: moonleay --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 86d6a5b..c3accb8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val ownerID = 372703841151614976L group = "net.moonleay.rssbot" version = System.getenv("CI_COMMIT_TAG")?.let { "$it-${System.getenv("CI_COMMIT_SHORT_SHA")}-prod" } ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } - ?: "0.3.0" + ?: "0.3.1" val kordver = "1.5.10-SNAPSHOT" val coroutinesver = "1.7.3"