From 40c53f431385b19c5a99652b69a63a8984346e2f Mon Sep 17 00:00:00 2001 From: moonleay Date: Mon, 16 Oct 2023 14:22:27 +0200 Subject: [PATCH] fix: updated imagelinks Signed-off-by: moonleay --- .../net/moonleay/rssbot/extensions/SendFeedExtension.kt | 7 +------ src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt | 2 +- src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/net/moonleay/rssbot/extensions/SendFeedExtension.kt b/src/main/kotlin/net/moonleay/rssbot/extensions/SendFeedExtension.kt index 11cf8d9..9226dab 100644 --- a/src/main/kotlin/net/moonleay/rssbot/extensions/SendFeedExtension.kt +++ b/src/main/kotlin/net/moonleay/rssbot/extensions/SendFeedExtension.kt @@ -23,14 +23,9 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.string import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand import com.kotlindiscord.kord.extensions.types.respond -import com.overzealous.remark.Options import com.overzealous.remark.Remark import com.prof18.rssparser.RssParser import com.prof18.rssparser.model.RssChannel -import com.prof18.rssparser.model.RssItem -import dev.kord.rest.builder.message.EmbedBuilder.Limits.title -import net.moonleay.rssbot.data.database.repository.RSSRepository -import net.moonleay.rssbot.data.database.repository.SubscriptionRepository import net.moonleay.rssbot.extensions.components.FeedColor import net.moonleay.rssbot.util.EmbedColor import net.moonleay.rssbot.util.EmbedUtil @@ -92,7 +87,7 @@ class SendFeedExtension : Extension() { if (it.description == null) "No description" else Remark(EmbedUtil.getHTMLtoMarkdownOptions()).convertFragment(it.description!!), it.link ?: "https://moonleay.net/", it.image ?: "", - if (it.link != null) EmbedUtil.getSiteLogo(it.link!!) else "https://static.moonleay.net/img/no-image.png", + if (it.link != null) EmbedUtil.getSiteLogo(it.link!!) else "https://static.moonleay.net/img/rssbot/no-image.png", "Manual Feed", it.pubDate?: "unknown" ) diff --git a/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt b/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt index 2b36353..0a9ea24 100644 --- a/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt +++ b/src/main/kotlin/net/moonleay/rssbot/jobs/FeedUpdater.kt @@ -96,7 +96,7 @@ object FeedUpdater : ICronjob { ), rssData.link ?: "https://moonleay.net/", rssData.image ?: "", - if (rssData.link != null) EmbedUtil.getSiteLogo(rssData.link!!) else "https://static.moonleay.net/img/no-image.png", + if (rssData.link != null) EmbedUtil.getSiteLogo(rssData.link!!) else "https://static.moonleay.net/img/rssbot/no-image.png", "Manual Feed", rssData.pubDate ?: "unknown" ) diff --git a/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt b/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt index 2909f30..12fedd7 100644 --- a/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt +++ b/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt @@ -190,7 +190,7 @@ object MessageUtil { ebb.color = color.color.color ebb.footer { this.text = "> rssbot, ($feedName) \n/ pub $published \n/ rel ${dtf.format(now)}" - this.icon = "https://static.moonleay.net/img/rss.png" + this.icon = "https://static.moonleay.net/img/rssbot/rss.png" } ebb.thumbnail { this.url = imageUrl