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

Added separator parameter to sendList() function.

Browse source
This commit is contained in:
Erik C. Thauvin 2021-08-01 23:23:14 -07:00
parent 2784af626b
commit d11f32189e
8 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
View file

@ -256,10 +256,10 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
isPrivate
)
send(sender, "The commands are:", isPrivate)
sendList(sender, addons.names, 8, isPrivate, isBold = true, isIndent = true)
sendList(sender, addons.names, 8, isPrivate = isPrivate, isBold = true, isIndent = true)
if (isOp) {
send(sender, "The op commands are:", isPrivate)
sendList(sender, addons.ops, 8, isPrivate, isBold = true, isIndent = true)
sendList(sender, addons.ops, 8, isPrivate = isPrivate, isBold = true, isIndent = true)
}
}
@ -435,6 +435,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
nick: String,
list: List<String>,
maxPerLine: Int,
separator: String = " ",
isPrivate: Boolean,
isBold: Boolean = false,
isIndent: Boolean = false
@ -444,7 +445,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
send(
nick,
helpFormat(
list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(" ", truncated = ""),
list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(separator, truncated = ""),
isBold,
isIndent
),

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

@ -64,7 +64,7 @@ class AddLog(bot: Mobibot) : AbstractCommand(bot) {
}
}
@Suppress("MagicNumber")
bot.sendList(sender, history, 4, isPrivate, isIndent = true)
bot.sendList(sender, history, 4, isPrivate = isPrivate, isIndent = true)
}
}
}

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

@ -140,7 +140,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
if (ignored.size > 0) {
bot.send(sender, "The following nicks are ignored:", isPrivate)
@Suppress("MagicNumber")
bot.sendList(sender, ignored.sorted(), 8, isPrivate, isIndent = true)
bot.sendList(sender, ignored.sorted(), 8, isPrivate = isPrivate, isIndent = true)
} else {
bot.send(sender, "No one is currently ${bold("ignored")}.", isPrivate)
}

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

@ -59,7 +59,7 @@ class Info(bot: Mobibot?) : AbstractCommand(bot!!) {
isPrivate: Boolean
) {
with(bot) {
sendList(sender, allVersions, 1, isPrivate)
sendList(sender, allVersions, 1, isPrivate = isPrivate)
val info = StringBuilder()
info.append("Uptime: ")
.append(uptime(ManagementFactory.getRuntimeMXBean().uptime))

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

@ -56,7 +56,7 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
} else {
send(sender, "The enabled modules are: ", isPrivate)
@Suppress("MagicNumber")
sendList(sender, modulesNames, 7, isPrivate, isIndent = true)
sendList(sender, modulesNames, 7, isPrivate = isPrivate, isIndent = true)
}
} else {
helpDefault(sender, isOp, isPrivate)

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

@ -61,7 +61,7 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
}
@Suppress("MagicNumber")
sendList(sender, nicks.sorted(), 8, isPrivate, isIndent = true)
sendList(sender, nicks.sorted(), 8, isPrivate = isPrivate, isIndent = true)
}
}
}

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

@ -57,7 +57,7 @@ class Versions(bot: Mobibot) : AbstractCommand(bot) {
isPrivate: Boolean
) {
if (isOp) {
bot.sendList(sender, allVersions, 1, isPrivate)
bot.sendList(sender, allVersions, 1, isPrivate = isPrivate)
} else {
bot.helpDefault(sender, false, isPrivate)
}

16
src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
View file

@ -50,19 +50,19 @@ class PinboardUtilsTest : LocalProperties() {
val ircServer = "irc.test.com"
val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
PinboardUtils.addPin(pinboard, ircServer, entry)
assertTrue(validatePin(apiToken, url = entry.link, entry.title, entry.nick, entry.channel), "addPin")
assertTrue(PinboardUtils.addPin(pinboard, ircServer, entry), "addPin")
assertTrue(validatePin(apiToken, url = entry.link, entry.title, entry.nick, entry.channel), "validate add")
entry.link = "https://www.foo.com/"
PinboardUtils.updatePin(pinboard, ircServer, url, entry)
assertTrue(validatePin(apiToken, url = entry.link, ircServer), "updatePin")
assertTrue(PinboardUtils.updatePin(pinboard, ircServer, url, entry), "updatePin")
assertTrue(validatePin(apiToken, url = entry.link, ircServer), "validate update")
entry.title = "Foo Title"
PinboardUtils.updatePin(pinboard, ircServer, entry.link, entry)
assertTrue(validatePin(apiToken, url = entry.link, entry.title), "update title")
assertTrue(PinboardUtils.updatePin(pinboard, ircServer, entry.link, entry), "update title")
assertTrue(validatePin(apiToken, url = entry.link, entry.title), "validate title")
PinboardUtils.deletePin(pinboard, entry)
assertFalse(validatePin(apiToken, url = entry.link), "deletePin")
assertTrue(PinboardUtils.deletePin(pinboard, entry), "daletePin")
assertFalse(validatePin(apiToken, url = entry.link), "validate delete")
}
@Test