Cookieso/lilJudd
1
0
Fork 0
forked from DiscordBots/lilJudd
Code Pull requests Activity

fix!: Changed all colors to EmbedColor

Browse source 
Signed-off-by: moonleay <contact@moonleay.net>
This commit is contained in:
moonleay 2023-09-14 12:36:19 +02:00
parent 8d14597a38
commit caa5d49bad
8 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/net/moonleay/lilJudd/Bot.kt
View file

@ -19,7 +19,6 @@
package net.moonleay.lilJudd package net.moonleay.lilJudd
import com.kotlindiscord.kord.extensions.ExtensibleBot import com.kotlindiscord.kord.extensions.ExtensibleBot
import dev.kord.common.Color
import dev.kord.common.entity.PresenceStatus import dev.kord.common.entity.PresenceStatus
import dev.kord.core.behavior.interaction.response.respond import dev.kord.core.behavior.interaction.response.respond
import dev.kord.core.event.gateway.ReadyEvent import dev.kord.core.event.gateway.ReadyEvent
@ -39,6 +38,7 @@ import net.moonleay.lilJudd.extensions.*
import net.moonleay.lilJudd.features.AvailabilityManager import net.moonleay.lilJudd.features.AvailabilityManager
import net.moonleay.lilJudd.features.MatchManager import net.moonleay.lilJudd.features.MatchManager
import net.moonleay.lilJudd.features.TimeManager import net.moonleay.lilJudd.features.TimeManager
import net.moonleay.lilJudd.util.EmbedColor
import net.moonleay.lilJudd.util.Logger import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.MessageUtil import net.moonleay.lilJudd.util.MessageUtil
import kotlin.system.exitProcess import kotlin.system.exitProcess
@ -146,9 +146,10 @@ object Bot {
response.respond { response.respond {
this.embeds = mutableListOf( this.embeds = mutableListOf(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"Error", "404: Not Found",
"Could not find button with id \"${inter.componentId}\".\nPlease report this.", "Could not find button with id \"${inter.componentId}\"." +
"\nPlease report this.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
) )
) )

6
src/main/kotlin/net/moonleay/lilJudd/extensions/FeatureManageExtension.kt
View file

@ -25,11 +25,11 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.types.respond import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.hasPermission import com.kotlindiscord.kord.extensions.utils.hasPermission
import dev.kord.common.Color
import dev.kord.common.entity.Permission import dev.kord.common.entity.Permission
import net.moonleay.lilJudd.extensions.component.EnableOrDisable import net.moonleay.lilJudd.extensions.component.EnableOrDisable
import net.moonleay.lilJudd.features.component.FeatureEnum import net.moonleay.lilJudd.features.component.FeatureEnum
import net.moonleay.lilJudd.features.component.FeatureManager import net.moonleay.lilJudd.features.component.FeatureManager
import net.moonleay.lilJudd.util.EmbedColor
import net.moonleay.lilJudd.util.Logger import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.MessageUtil import net.moonleay.lilJudd.util.MessageUtil
@ -51,7 +51,7 @@ class FeatureManageExtension : Extension() {
this.respond { this.respond {
embeds.add( embeds.add(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"403: Forbidden", "403: Forbidden",
"You cannot edit features, as you don't have the Administrator permission.", "You cannot edit features, as you don't have the Administrator permission.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
@ -70,7 +70,7 @@ class FeatureManageExtension : Extension() {
this.respond { this.respond {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"404: Not Found", "404: Not Found",
"The feature you are trying to edit does not exist.", "The feature you are trying to edit does not exist.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator

6
src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt
View file

@ -25,7 +25,6 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.string
import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.types.respond import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.common.Color
import dev.kord.core.behavior.channel.createMessage import dev.kord.core.behavior.channel.createMessage
import dev.kord.core.behavior.createRole import dev.kord.core.behavior.createRole
import dev.kord.rest.builder.message.create.actionRow import dev.kord.rest.builder.message.create.actionRow
@ -33,6 +32,7 @@ import net.moonleay.lilJudd.data.tables.MatchPlanningData
import net.moonleay.lilJudd.extensions.component.MatchTypes import net.moonleay.lilJudd.extensions.component.MatchTypes
import net.moonleay.lilJudd.jobs.MatchJob import net.moonleay.lilJudd.jobs.MatchJob
import net.moonleay.lilJudd.jobs.component.JobManager import net.moonleay.lilJudd.jobs.component.JobManager
import net.moonleay.lilJudd.util.EmbedColor
import net.moonleay.lilJudd.util.EmbedUtil import net.moonleay.lilJudd.util.EmbedUtil
import net.moonleay.lilJudd.util.MessageUtil import net.moonleay.lilJudd.util.MessageUtil
import net.moonleay.lilJudd.util.TimeUtil import net.moonleay.lilJudd.util.TimeUtil
@ -60,7 +60,7 @@ class MatchExtension : Extension() {
val msg = this.respond { val msg = this.respond {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbedWithTable( MessageUtil.getEmbedWithTable(
Color(0X4C4645), EmbedColor.INFO,
args.matchType.readableName, args.matchType.readableName,
"***Vs. $opponent***\n" + "***Vs. $opponent***\n" +
"At ${args.timeStamp}\n" + "At ${args.timeStamp}\n" +
@ -90,7 +90,7 @@ class MatchExtension : Extension() {
this.channel.createMessage { this.channel.createMessage {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"500: Internal Error", "500: Internal Error",
"Could not find created role.\n" + "Could not find created role.\n" +
"It seems, that said role could not be created.", "It seems, that said role could not be created.",

10
src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt
View file

@ -22,16 +22,12 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.types.respond import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.hasPermission import com.kotlindiscord.kord.extensions.utils.hasPermission
import dev.kord.common.Color
import dev.kord.common.entity.Permission import dev.kord.common.entity.Permission
import dev.kord.core.behavior.channel.createMessage import dev.kord.core.behavior.channel.createMessage
import dev.kord.rest.builder.message.create.actionRow import dev.kord.rest.builder.message.create.actionRow
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import net.moonleay.lilJudd.data.tables.TimePlanningMessages import net.moonleay.lilJudd.data.tables.TimePlanningMessages
import net.moonleay.lilJudd.util.EmbedUtil import net.moonleay.lilJudd.util.*
import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.MessageUtil
import net.moonleay.lilJudd.util.TimeUtil
import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.insert
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
import java.time.ZoneId import java.time.ZoneId
@ -71,7 +67,7 @@ class SendPlannerExtension : Extension() {
c.createMessage { c.createMessage {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0X4C4645), EmbedColor.INFO,
"Time Planning Feature", "Time Planning Feature",
"Do you have time on the following Days?", "Do you have time on the following Days?",
"Automated Message" "Automated Message"
@ -83,7 +79,7 @@ class SendPlannerExtension : Extension() {
val msg = c.createMessage { val msg = c.createMessage {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbedWithTable( MessageUtil.getEmbedWithTable(
Color(0X4C4645), EmbedColor.INFO,
"", "",
"${then.dayOfWeek.name}, ${then.dayOfMonth}.${then.monthValue}.${then.year} /${it + 1}. weekday", "${then.dayOfWeek.name}, ${then.dayOfMonth}.${then.monthValue}.${then.year} /${it + 1}. weekday",
mapOf( mapOf(

29
src/main/kotlin/net/moonleay/lilJudd/extensions/UpdateRolesExtension.kt
View file

@ -23,16 +23,16 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.types.respond import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.hasPermission import com.kotlindiscord.kord.extensions.utils.hasPermission
import dev.kord.common.entity.Permission import dev.kord.common.entity.Permission
import dev.kord.gateway.PrivilegedIntent
import net.moonleay.lilJudd.features.AvailabilityManager import net.moonleay.lilJudd.features.AvailabilityManager
import net.moonleay.lilJudd.util.EmbedColor
import net.moonleay.lilJudd.util.Logger import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.MessageUtil
class UpdateRolesExtension : Extension() { class UpdateRolesExtension : Extension() {
override val name = "updateroles" override val name = "updateroles"
override val allowApplicationCommandInDMs: Boolean override val allowApplicationCommandInDMs: Boolean
get() = false get() = false
@OptIn(PrivilegedIntent::class)
override suspend fun setup() { override suspend fun setup() {
publicSlashCommand() { publicSlashCommand() {
name = "updateroles" name = "updateroles"
@ -41,17 +41,30 @@ class UpdateRolesExtension : Extension() {
if (!this.member!!.asMember(this.guild!!.id) if (!this.member!!.asMember(this.guild!!.id)
.hasPermission(Permission.Administrator) .hasPermission(Permission.Administrator)
) { ) {
val res = this.respond { this.respond {
this.content = "You need to be an administrator to use this command." this.embeds.add(
MessageUtil.getEmbed(
EmbedColor.ERROR,
"403: Forbidden",
"You need to be an administrator to use this command.",
user.asUser().username + "#" + user.asUser().discriminator
)
)
} }
res.delete()
return@action return@action
} }
val res = this.respond { this.respond {
this.content = "OK." this.embeds.add(
MessageUtil.getEmbed(
EmbedColor.SUCCESS,
"200: Success",
"Updating roles.\n" +
"This may take a while, please be patient.",
user.asUser().username + "#" + user.asUser().discriminator
)
)
} }
// -- below here is the code of the cronjob -- // -- below here is the code of the cronjob --
Logger.out("Starting to update roles...") Logger.out("Starting to update roles...")

4
src/main/kotlin/net/moonleay/lilJudd/extensions/VersionExtension.kt
View file

@ -20,8 +20,8 @@ package net.moonleay.lilJudd.extensions
import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import dev.kord.common.Color
import net.moonleay.botendo.build.BuildConstants import net.moonleay.botendo.build.BuildConstants
import net.moonleay.lilJudd.util.EmbedColor
import net.moonleay.lilJudd.util.MessageUtil import net.moonleay.lilJudd.util.MessageUtil
class VersionExtension : Extension() { class VersionExtension : Extension() {
@ -33,7 +33,7 @@ class VersionExtension : Extension() {
this.action { this.action {
MessageUtil.sendEmbedForPublicSlashCommand( MessageUtil.sendEmbedForPublicSlashCommand(
this, this,
Color(0x52E01A), EmbedColor.INFO,
"Lil' Judd", "Lil' Judd",
"Lil' Judd ***v." + BuildConstants.version + "***\n" + "Lil' Judd ***v." + BuildConstants.version + "***\n" +
"Kord-Extensions ***v." + BuildConstants.kordVersion + "***\n" + "Kord-Extensions ***v." + BuildConstants.kordVersion + "***\n" +

14
src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt
View file

@ -21,7 +21,6 @@ package net.moonleay.lilJudd.features
import com.kotlindiscord.kord.extensions.utils.isNullOrBot import com.kotlindiscord.kord.extensions.utils.isNullOrBot
import dev.inmo.krontab.buildSchedule import dev.inmo.krontab.buildSchedule
import dev.inmo.krontab.doInfinity import dev.inmo.krontab.doInfinity
import dev.kord.common.Color
import dev.kord.common.entity.Snowflake import dev.kord.common.entity.Snowflake
import dev.kord.core.behavior.UserBehavior import dev.kord.core.behavior.UserBehavior
import dev.kord.core.behavior.createRole import dev.kord.core.behavior.createRole
@ -38,10 +37,7 @@ import net.moonleay.lilJudd.data.tables.TimePlanningMessages
import net.moonleay.lilJudd.extensions.FeatureManageExtension import net.moonleay.lilJudd.extensions.FeatureManageExtension
import net.moonleay.lilJudd.features.component.FeatureEnum import net.moonleay.lilJudd.features.component.FeatureEnum
import net.moonleay.lilJudd.features.component.IFeature import net.moonleay.lilJudd.features.component.IFeature
import net.moonleay.lilJudd.util.EmbedUtil import net.moonleay.lilJudd.util.*
import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.MessageUtil
import net.moonleay.lilJudd.util.TimeUtil
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
@ -264,7 +260,7 @@ object AvailabilityManager : IFeature {
} }
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0x52E01A), EmbedColor.SUCCESS,
"200: Success", "200: Success",
"The feature was enabled in channel ${args.channel.data.name.value} with roles ${hasTimeRole.mention} & ${wantsNotifsRole.mention}.", "The feature was enabled in channel ${args.channel.data.name.value} with roles ${hasTimeRole.mention} & ${wantsNotifsRole.mention}.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
@ -273,7 +269,7 @@ object AvailabilityManager : IFeature {
// They exist, do not add them // They exist, do not add them
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"403: Forbidden", "403: Forbidden",
"The feature is already enabled in this channel.", "The feature is already enabled in this channel.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
@ -318,7 +314,7 @@ object AvailabilityManager : IFeature {
} }
} }
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0x52E019), EmbedColor.SUCCESS,
"200: Success", "200: Success",
"The feature was disabled.", "The feature was disabled.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
@ -326,7 +322,7 @@ object AvailabilityManager : IFeature {
} }
// not in db, do nothing // not in db, do nothing
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"403: Forbidden", "403: Forbidden",
"The feature is already disabled in this channel.", "The feature is already disabled in this channel.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator

20
src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt
View file

@ -20,7 +20,6 @@ package net.moonleay.lilJudd.features
import dev.inmo.krontab.buildSchedule import dev.inmo.krontab.buildSchedule
import dev.inmo.krontab.doInfinity import dev.inmo.krontab.doInfinity
import dev.kord.common.Color
import dev.kord.common.entity.Snowflake import dev.kord.common.entity.Snowflake
import dev.kord.core.behavior.UserBehavior import dev.kord.core.behavior.UserBehavior
import dev.kord.core.behavior.channel.createMessage import dev.kord.core.behavior.channel.createMessage
@ -37,10 +36,7 @@ import net.moonleay.lilJudd.data.tables.TimePlanningMessages
import net.moonleay.lilJudd.extensions.FeatureManageExtension import net.moonleay.lilJudd.extensions.FeatureManageExtension
import net.moonleay.lilJudd.features.component.FeatureEnum import net.moonleay.lilJudd.features.component.FeatureEnum
import net.moonleay.lilJudd.features.component.IFeature import net.moonleay.lilJudd.features.component.IFeature
import net.moonleay.lilJudd.util.EmbedUtil import net.moonleay.lilJudd.util.*
import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.MessageUtil
import net.moonleay.lilJudd.util.TimeUtil
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
@ -101,7 +97,7 @@ object TimeManager : IFeature {
"The weekly planning starts now <@&${Snowflake(roleMap[ch]?.wantstobenotifid!!)}>" "The weekly planning starts now <@&${Snowflake(roleMap[ch]?.wantstobenotifid!!)}>"
this.embeds.add( this.embeds.add(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0X4C4645), EmbedColor.INFO,
"Time Planning Feature", "Time Planning Feature",
"Do you have time on the following Days?", "Do you have time on the following Days?",
"Automated Message" "Automated Message"
@ -112,7 +108,7 @@ object TimeManager : IFeature {
c.createMessage { c.createMessage {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbed( MessageUtil.getEmbed(
Color(0X4C4645), EmbedColor.INFO,
"Time Planning Feature", "Time Planning Feature",
"Do you have time on the following Days?", "Do you have time on the following Days?",
"Automated Message" "Automated Message"
@ -126,7 +122,7 @@ object TimeManager : IFeature {
val msg = c.createMessage { val msg = c.createMessage {
this.embeds.add( this.embeds.add(
MessageUtil.getEmbedWithTable( MessageUtil.getEmbedWithTable(
Color(0X4C4645), EmbedColor.INFO,
"", "",
"${then.dayOfWeek.name}, ${then.dayOfMonth}.${then.monthValue}.${then.year} /${it + 1}. weekday", "${then.dayOfWeek.name}, ${then.dayOfMonth}.${then.monthValue}.${then.year} /${it + 1}. weekday",
mapOf( mapOf(
@ -184,14 +180,14 @@ object TimeManager : IFeature {
} get TimePlanningChannels.id } get TimePlanningChannels.id
} }
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0x52E01A), EmbedColor.SUCCESS,
"200: Success", "200: Success",
"The feature was enabled in channel ${args.channel.data.name.value}", "The feature was enabled in channel ${args.channel.data.name.value}",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
) )
} }
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"403: Forbidden", "403: Forbidden",
"The feature is already enabled in this channel.", "The feature is already enabled in this channel.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
@ -226,7 +222,7 @@ object TimeManager : IFeature {
} }
} }
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0x52E019), EmbedColor.SUCCESS,
"200: Success", "200: Success",
"The feature was disabled.", "The feature was disabled.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator
@ -234,7 +230,7 @@ object TimeManager : IFeature {
} }
// Do nothing; not in db // Do nothing; not in db
return MessageUtil.getEmbed( return MessageUtil.getEmbed(
Color(0xE0311A), EmbedColor.ERROR,
"403: Forbidden", "403: Forbidden",
"The feature is already disabled in this channel.", "The feature is already disabled in this channel.",
u.asUser().username + "#" + u.asUser().discriminator u.asUser().username + "#" + u.asUser().discriminator