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

Changed with(x) to x.apply

Browse source
This commit is contained in:
Erik C. Thauvin 2020-12-08 12:29:47 -08:00
parent aaecc8a9b4
commit 19894dce1f
22 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/detekt/baseline.xml
View file

@ -56,7 +56,7 @@
<ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
<ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
<ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
<ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter$override fun helpResponse(sender: String, isPrivate: Boolean) : Boolean</ID>
<ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter$override fun helpResponse(sender: String, isPrivate: Boolean): Boolean</ID>
<ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
<ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: MutableList&lt;EntryLink&gt;): String</ID>
<ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>

4
src/main/java/net/thauvin/erik/mobibot/Addons.kt
View file

@ -49,7 +49,7 @@ class Addons {
* Add a module with properties.
*/
fun add(module: AbstractModule, props: Properties) {
with(module) {
module.apply {
if (hasProperties()) {
propertyKeys.forEach {
setProperty(it, props.getProperty(it, ""))
@ -68,7 +68,7 @@ class Addons {
* Add a command with properties.
*/
fun add(command: AbstractCommand, props: Properties) {
with(command) {
command.apply {
if (properties.isNotEmpty()) {
properties.keys.forEach {
setProperty(it, props.getProperty(it, ""))

2
src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
View file

@ -54,7 +54,7 @@ class FeedReader(
* Fetches the Feed's items.
*/
override fun run() {
with(bot) {
bot.apply {
try {
val input = SyndFeedInput()
XmlReader(URL(url)).use { reader ->

2
src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
View file

@ -80,7 +80,7 @@ object PinboardUtils {
@JvmStatic
fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
val update = GlobalScope.async {
with(entry) {
entry.apply {
if (oldUrl != link) {
poster.deletePin(oldUrl)
poster.addPin(

3
src/main/java/net/thauvin/erik/mobibot/Utils.kt
View file

@ -38,7 +38,6 @@ import java.io.BufferedReader
import java.io.File
import java.io.IOException
import java.io.InputStreamReader
import java.lang.NumberFormatException
import java.net.URL
import java.net.URLEncoder
import java.nio.charset.StandardCharsets
@ -245,7 +244,7 @@ object Utils {
val minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
TimeUnit.MILLISECONDS.toHours(uptime)
)
with(info) {
info.apply {
if (years > 0) {
append(years).append(plural(years, " year ", " years "))
}

2
src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
View file

@ -61,7 +61,7 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
isOp: Boolean,
isPrivate: Boolean
) {
with(properties[FEED_PROP]) {
properties[FEED_PROP].apply {
if (!isNullOrBlank()) {
Thread(FeedReader(bot, sender, this)).start()
} else {

2
src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
View file

@ -51,7 +51,7 @@ class Cycle(bot: Mobibot) : AbstractCommand(bot) {
isOp: Boolean,
isPrivate: Boolean
) {
with(bot) {
bot.apply {
if (isOp) {
send("$sender has just asked me to leave. I'll be back!")
sleep(wait)

2
src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
View file

@ -46,7 +46,7 @@ class Debug(bot: Mobibot) : AbstractCommand(bot) {
override fun commandResponse(sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean) {
if (isOp) {
with(bot) {
bot.apply {
if (logger.isDebugEnabled) {
Configurator.setLevel(logger.name, loggerLevel)
} else {

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

@ -52,7 +52,7 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
isOp: Boolean,
isPrivate: Boolean
) {
with(bot) {
bot.apply {
if (isOp) {
if (modulesNames.isEmpty()) {
send(sender, "There are no enabled modules.", isPrivate)

2
src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
View file

@ -33,9 +33,9 @@ package net.thauvin.erik.mobibot.commands.tell
import net.thauvin.erik.mobibot.Mobibot
import net.thauvin.erik.mobibot.Utils.bold
import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
import net.thauvin.erik.mobibot.Utils.getIntProperty
import net.thauvin.erik.mobibot.Utils.helpFormat
import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
import net.thauvin.erik.mobibot.Utils.plural
import net.thauvin.erik.mobibot.Utils.reverseColor
import net.thauvin.erik.mobibot.Utils.utcDateTime

4
src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
View file

@ -103,7 +103,7 @@ object EntriesMgr {
val items = feed.entries
var entry: EntryLink
for (i in items.indices.reversed()) {
with(items[i]) {
items[i].apply {
entry = EntryLink(
link,
title,
@ -156,7 +156,7 @@ object EntriesMgr {
var buff: StringBuilder
var comment: EntryComment
for (i in entries.size - 1 downTo 0) {
with(entries[i]) {
entries[i].apply {
buff = StringBuilder()
.append("Posted by <b>")
.append(nick)

2
src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
View file

@ -61,7 +61,7 @@ object EntriesUtils {
buff.append("[+").append(entry.comments.size).append(']')
}
buff.append(' ')
with(entry) {
entry.apply {
if (Constants.NO_TITLE == title) {
buff.append(title)
} else {

2
src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
View file

@ -74,7 +74,7 @@ abstract class AbstractModule(val bot: Mobibot) {
/**
* Responds with the module's help.
*/
open fun helpResponse(sender: String, isPrivate: Boolean) : Boolean {
open fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
for (h in help) {
bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
}

2
src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
View file

@ -93,7 +93,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
}
}
override fun helpResponse(sender: String, isPrivate: Boolean) : Boolean {
override fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
bot.apply {
if (EXCHANGE_RATES.isEmpty()) {
try {

2
src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
View file

@ -49,7 +49,7 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
val playerRoll = roll()
val total = roll.first + roll.second
val playerTotal = playerRoll.first + playerRoll.second
with(bot) {
bot.apply {
send(
channel,
"$sender rolled two dice: ${Utils.bold(playerRoll.first)} and ${Utils.bold(playerRoll.second)}"

2
src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
View file

@ -50,7 +50,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
* Searches Google.
*/
override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
with(bot) {
bot.apply {
if (args.isNotBlank()) {
try {
val results = searchGoogle(

4
src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
View file

@ -50,7 +50,7 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
isPrivate: Boolean
) {
if (args.matches("(\\S.)+(\\S)+".toRegex())) {
with(bot) {
bot.apply {
try {
lookup(args).split(',').forEach {
send(it.trim())
@ -142,7 +142,7 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
fun whois(query: String, host: String): List<String> {
val whoisClient = WhoisClient()
val lines: List<String>
with(whoisClient) {
whoisClient.apply {
try {
defaultTimeout = Constants.CONNECT_TIMEOUT
connect(host)

6
src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
View file

@ -42,13 +42,13 @@ import kotlin.random.Random
*/
class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
init {
with(commands) {
commands.apply {
add(Hands.ROCK.name.toLowerCase())
add(Hands.PAPER.name.toLowerCase())
add(Hands.SCISSORS.name.toLowerCase())
}
with(help) {
help.apply {
add("To play Rock Paper Scissors:")
add(
Utils.helpFormat(
@ -96,7 +96,7 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
override fun commandResponse(sender: String, cmd: String, args: String, isPrivate: Boolean) {
val hand = Hands.valueOf(cmd.toUpperCase())
val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
with(bot) {
bot.apply {
when {
hand == botHand -> {
send("${Utils.green(hand.name)} vs. ${Utils.green(botHand.name)}")

4
src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
View file

@ -50,7 +50,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
* Returns the specified stock quote from Alpha Avantage.
*/
override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
with(bot) {
bot.apply {
if (args.isNotBlank()) {
try {
val messages = getQuote(args, properties[ALPHAVANTAGE_API_KEY_PROP])
@ -128,7 +128,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
val messages = mutableListOf<Message>()
var response: String
try {
with(messages) {
messages.apply {
// Search for symbol/keywords
response = Utils.urlReader(
URL(

6
src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
View file

@ -86,7 +86,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
* Send a notification to the registered Twitter handle.
*/
fun notification(msg: String) {
with(bot) {
bot.apply {
if (isEnabled && !handle.isNullOrBlank()) {
Thread {
try {
@ -120,7 +120,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
* Post an entry to twitter.
*/
fun postEntry(index: Int) {
with(bot) {
bot.apply {
if (isAutoPost && hasEntry(index) && LinksMgr.entries.size >= index) {
val entry = LinksMgr.entries[index]
val msg = "${entry.title} ${entry.link} via ${entry.nick} on $channel"
@ -157,7 +157,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
* Posts to twitter.
*/
override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
with(bot) {
bot.apply {
try {
send(
sender,

4
src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
View file

@ -124,7 +124,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
messages.add(
PublicMessage("City: ${cwd.cityName} [${country.toUpperCase()}]")
)
with(cwd.mainData) {
cwd.mainData.apply {
if (this != null) {
if (hasTemp()) {
messages.add(PublicMessage("Temperature: ${getTemps(temp)}"))
@ -135,7 +135,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
}
}
if (cwd.hasWindData()) {
with(cwd.windData) {
cwd.windData.apply {
if (this != null && hasSpeed() && speed != null) {
messages.add(NoticeMessage("Wind: ${wind(speed!!)}"))
}

2
src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
View file

@ -188,7 +188,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
args: String,
isPrivate: Boolean
) {
with(bot) {
bot.apply {
if (args.isEmpty()) {
send(sender, "The supported countries/zones are: ", isPrivate)
sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false)