erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Fixed SonarCloud code smells

Browse source
This commit is contained in:
Erik C. Thauvin 2023-10-26 21:13:46 -07:00
parent adaff5ec38
commit d700aa06df
6 changed files with 47 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.idea/misc.xml generated
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">

22
src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
View file

@ -42,7 +42,6 @@ import org.slf4j.Logger
import java.io.*
import java.net.HttpURLConnection
import java.net.URL
import java.net.URLEncoder
import java.nio.file.Files
import java.nio.file.Paths
import java.time.LocalDateTime
@ -125,14 +124,19 @@ object Utils {
*/
@JvmStatic
fun String?.colorize(color: String): String {
return if (isNullOrEmpty()) {
""
} else if (color == DEFAULT_COLOR) {
this
} else if (Colors.BOLD == color || Colors.REVERSE == color) {
color + this + color
} else {
color + this + Colors.NORMAL
return when {
isNullOrEmpty() -> {
""
}
color == DEFAULT_COLOR -> {
this
}
Colors.BOLD == color || Colors.REVERSE == color -> {
color + this + color
}
else -> {
color + this + Colors.NORMAL
}
}
}

2
src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
View file

@ -129,7 +129,7 @@ class Ignore : AbstractCommand() {
}
}
if (ignored.size > 0) {
if (ignored.isNotEmpty()) {
event.sendMessage("The following nicks are ignored:")
event.sendList(ignored.sorted(), 8, isIndent = true)
} else {

27
src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
View file

@ -85,18 +85,23 @@ class Tell(private val serialObject: String) : AbstractCommand() {
override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
if (isEnabled()) {
if (args.isBlank()) {
helpResponse(channel, args, event)
} else if (args.startsWith(View.VIEW_CMD)) {
if (event.isChannelOp(channel) && "${View.VIEW_CMD} $TELL_ALL_KEYWORD" == args) {
viewAll(event)
} else {
viewMessages(event)
when {
args.isBlank() -> {
helpResponse(channel, args, event)
}
args.startsWith(View.VIEW_CMD) -> {
if (event.isChannelOp(channel) && "${View.VIEW_CMD} $TELL_ALL_KEYWORD" == args) {
viewAll(event)
} else {
viewMessages(event)
}
}
args.startsWith("$TELL_DEL_KEYWORD ") -> {
deleteMessage(channel, args, event)
}
else -> {
newMessage(channel, args, event)
}
} else if (args.startsWith("$TELL_DEL_KEYWORD ")) {
deleteMessage(channel, args, event)
} else {
newMessage(channel, args, event)
}
if (clean()) {
save()

2
src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsManager.kt
View file

@ -141,7 +141,7 @@ class FeedsManager private constructor() {
.append("\"><b>")
.append(channel)
.append("</b></a>")
if (comments.size > 0) {
if (comments.isNotEmpty()) {
buff.append(" <br/><br/>")
for (j in comments.indices) {
if (j > 0) {

27
src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
View file

@ -74,19 +74,24 @@ class CurrencyConverter : AbstractModule() {
override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
reload(properties[API_KEY_PROP])
if (SYMBOLS.isEmpty()) {
event.respond(EMPTY_SYMBOLS_TABLE)
} else if (args.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ (to|in) [a-zA-Z]{3}+".toRegex())) {
val msg = convertCurrency(properties[API_KEY_PROP], args)
event.respond(msg.msg)
if (msg.isError) {
when {
SYMBOLS.isEmpty() -> {
event.respond(EMPTY_SYMBOLS_TABLE)
}
args.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ (to|in) [a-zA-Z]{3}+".toRegex()) -> {
val msg = convertCurrency(properties[API_KEY_PROP], args)
event.respond(msg.msg)
if (msg.isError) {
helpResponse(event)
}
}
args.contains(CODES_KEYWORD) -> {
event.sendMessage("The supported currency codes are:")
event.sendList(SYMBOLS.keys.toList(), 11, isIndent = true)
}
else -> {
helpResponse(event)
}
} else if (args.contains(CODES_KEYWORD)) {
event.sendMessage("The supported currency codes are:")
event.sendList(SYMBOLS.keys.toList(), 11, isIndent = true)
} else {
helpResponse(event)
}
}