Compare commits

...

3 commits

3 changed files with 19 additions and 7 deletions

View file

@ -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.3"
?: "0.3.4"
val kordver = "1.5.10-SNAPSHOT"
val coroutinesver = "1.7.3"

View file

@ -94,10 +94,10 @@ object FeedUpdater : ICronjob {
if (rssData.description == null) "No description" else Remark(EmbedUtil.getHTMLtoMarkdownOptions()).convertFragment(
rssData.description!!
),
rssData.link ?: "https://moonleay.net/",
rssData.link ?: "https://moonleay.net/404",
rssData.image ?: "",
if (rssData.link != null) EmbedUtil.getSiteLogo(rssData.link!!) else "https://static.moonleay.net/img/rssbot/no-image.png",
"Manual Feed",
data.feedName,
rssData.pubDate ?: "unknown"
)
)

View file

@ -178,15 +178,27 @@ object MessageUtil {
): EmbedBuilder {
val ebb = EmbedBuilder()
val now: LocalDateTime = LocalDateTime.now()
if (title.length > 25)
ebb.title = title.substring(0, 25) + "..."
var desc = if (description != "No description") description else ""
val articleLink = "\n[[open full article]($url)]"
if (title.length > 255){
ebb.title = title.substring(0, 252) + "..."
if (title != desc)
desc = "..." + title.substring(252, title.length) + "\n\n" + desc
}
else
ebb.title = title
var athr = author
if (author.length > 255) {
athr = author.substring(0, 252) + "..."
}
ebb.author {
this.name = author
this.name = athr
this.icon = logo
}
ebb.description = "${if (description != "No description") description else ""}\n[[open full article]($url)]"
if (desc.length > 4096 - 2 - articleLink.length){
desc = desc.substring(0, 4096 - 2 - articleLink.length) + "..."
}
ebb.description = "${desc}${articleLink}"
ebb.color = color.color.color
ebb.footer {
this.text = "> rssbot, ($feedName) \n/ pub $published \n/ rel ${dtf.format(now)}"